← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apr-util/trusty-proposed

« back to all changes in this revision

Viewing changes to misc/apr_thread_pool.c

  • Committer: Package Import Robot
  • Author(s): Stefan Fritsch
  • Date: 2013-05-05 15:43:34 UTC
  • mfrom: (1.3.4)
  • Revision ID: package-import@ubuntu.com-20130505154334-ljd2tn8515nf96mo
Tags: 1.5.2-1
http://bugs.debian.org/699327
* New upstream release.
* Ship find_apu.m4 in libaprutil1-dev. Closes: #699327

Show diffs side-by-side

added added

removed removed

Lines of Context:
misc/apr_thread_pool.c
363
363
    rv = thread_pool_construct(tp, init_threads, max_threads);
364
364
    if (APR_SUCCESS != rv)
365
365
        return rv;
366
 
    apr_pool_cleanup_register(tp->pool, tp, thread_pool_cleanup,
367
 
                              apr_pool_cleanup_null);
 
366
    apr_pool_pre_cleanup_register(tp->pool, tp, thread_pool_cleanup);
368
367
 
369
368
    while (init_threads) {
370
369
        /* Grab the mutex as apr_thread_create() and thread_pool_func() will 
393
392
 
394
393
APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t * me)
395
394
{
396
 
    return apr_pool_cleanup_run(me->pool, me, thread_pool_cleanup);
 
395
    apr_pool_destroy(me->pool);
 
396
    return APR_SUCCESS;
397
397
}
398
398
 
399
399
/*