Merge remote branch 'origin/mdb.master'

[openldap] / libraries / libldap_r / thr_debug.c

diff --git a/libraries/libldap_r/thr_debug.c b/libraries/libldap_r/thr_debug.c
index cf8fb748412e02f134b7b23a1ce1bb09769eec50..6d6307263cbf7b0d95c5d1e0fa9b532a01c77a63 100644 (file)
--- a/libraries/libldap_r/thr_debug.c
+++ b/libraries/libldap_r/thr_debug.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2007 The OpenLDAP Foundation.
+ * Copyright 2005-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@
  *
  * Run-time configuration:
  *
- *  Setup of memory debugging tools:
+ *  Memory debugging tools:
  *   Tools that report uninitialized memory accesses should disable
  *   such warnings about the function debug_already_initialized().
  *   Alternatively, include "noreinit" (below) in $LDAP_THREAD_DEBUG.
@@ -481,6 +481,7 @@ debug_noop( void )
  *
  * Returns true if the resource is initialized and not copied/realloced.
  */
+LDAP_GCCATTR((noinline))
 static int
 debug_already_initialized( const ldap_debug_usage_info_t *usage )
 {
@@ -555,18 +556,21 @@ add_thread_info(
        int detached )
 {
        ldap_debug_thread_t *t;
+
        if( thread_info_used >= thread_info_size ) {
                unsigned int more = thread_info_size + 8;
                unsigned int new_size = thread_info_size + more;
+
                t = calloc( more, sizeof(ldap_debug_thread_t) );
                assert( t != NULL );
                thread_info = realloc( thread_info, new_size * sizeof(*thread_info) );
                assert( thread_info != NULL );
-               while( thread_info_size < new_size ) {
+               do {
                        t->idx = thread_info_size;
                        thread_info[thread_info_size++] = t++;
-               }
+               } while( thread_info_size < new_size );
        }
+
        t = thread_info[thread_info_used];
        init_usage( &t->usage, msg );
        t->wrapped = *thread;
@@ -589,7 +593,7 @@ remove_thread_info( ldap_debug_thread_t *t, const char *msg )
                (thread_info[thread_info_used] = t   )->idx = thread_info_used;
 }
 
-ldap_debug_thread_t *
+static ldap_debug_thread_t *
 get_thread_info( ldap_pvt_thread_t thread, const char *msg )
 {
        unsigned int i;
@@ -779,6 +783,7 @@ ldap_pvt_thread_create(
        if( !options_done )
                get_options();
        ERROR_IF( !threading_enabled, "ldap_pvt_thread_create" );
+
        if( wrap_threads ) {
                ldap_debug_thread_call_t *call = malloc(
                        sizeof( ldap_debug_thread_call_t ) );
@@ -843,6 +848,7 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
                                remove_thread_info( t, "ldap_pvt_thread_join" ) );
                adjust_count( Idx_unjoined_thread, -1 );
        }
+
        return rc;
 }
 
@@ -1174,7 +1180,7 @@ ldap_pvt_thread_pool_submit(
 {
        int rc, has_pool;
        ERROR_IF( !threading_enabled, "ldap_pvt_thread_pool_submit" );
-       has_pool = (tpool != NULL && *tpool != NULL);
+       has_pool = (tpool && *tpool);
        rc = ldap_int_thread_pool_submit( tpool, start_routine, arg );
        if( has_pool )
                ERROR_IF( rc, "ldap_pvt_thread_pool_submit" );
@@ -1202,7 +1208,7 @@ ldap_pvt_thread_pool_destroy( ldap_pvt_thread_pool_t *tpool, int run_pending )
 {
        int rc, has_pool;
        ERROR_IF( !threading_enabled, "ldap_pvt_thread_pool_destroy" );
-       has_pool = (tpool != NULL && *tpool != NULL);
+       has_pool = (tpool && *tpool);
        rc = ldap_int_thread_pool_destroy( tpool, run_pending );
        if( has_pool ) {
                if( rc ) {
@@ -1246,11 +1252,14 @@ ldap_pvt_thread_pool_setkey(
        void *xctx,
        void *key,
        void *data,
-       ldap_pvt_thread_pool_keyfree_t *kfree )
+       ldap_pvt_thread_pool_keyfree_t *kfree,
+       void **olddatap,
+       ldap_pvt_thread_pool_keyfree_t **oldkfreep )
 {
        int rc;
        ERROR_IF( !threading_enabled, "ldap_pvt_thread_pool_setkey" );
-       rc = ldap_int_thread_pool_setkey( xctx, key, data, kfree );
+       rc = ldap_int_thread_pool_setkey(
+               xctx, key, data, kfree, olddatap, oldkfreep );
        ERROR_IF( rc, "ldap_pvt_thread_pool_setkey" );
        return rc;
 }