assert( LDAP_VALID( ld ) );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_flush_cache\n" ));
+ LDAP_LOG ( CACHE, ENTRY, "ldap_flush_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_flush_cache\n", 0, 0, 0 );
#endif
#ifndef LDAP_NOCACHE
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
- "ldap_uncache_request %d ld_cache %lx\n",
- msgid, (long) ld->ld_cache ));
+
+ LDAP_LOG ( CACHE, ARGS, "ldap_uncache_request %d ld_cache %lx\n",
+ msgid, (long) ld->ld_cache, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_uncache_request %d ld_cache %lx\n",
msgid, (long) ld->ld_cache, 0 );
#ifndef LDAP_NOCACHE
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
- "ldap_uncache_entry %s ld_cache %lx\n",
- dn, (long) ld->ld_cache ));
+
+ LDAP_LOG ( CACHE, ARGS, "ldap_uncache_entry %s ld_cache %lx\n",
+ dn, (long) ld->ld_cache, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_uncache_entry %s ld_cache %lx\n",
dn, (long) ld->ld_cache, 0 );
LDAPMessage *m, *prev, *next;
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
+
+ LDAP_LOG ( CACHE, ARGS,
"uncache_entry_or_req dn %s msgid %ld ld_cache %lx\n",
- dn, (long) msgid, (long) ld->ld_cache ));
+ dn, (long) msgid, (long) ld->ld_cache );
#else
Debug( LDAP_DEBUG_TRACE,
"ldap_uncache_entry_or_req dn %s msgid %ld ld_cache %lx\n",
assert( LDAP_VALID( ld ) );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_add_request_to_cache\n" ));
+ LDAP_LOG ( CACHE, ENTRY, "ldap_add_request_to_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_add_request_to_cache\n", 0, 0, 0 );
#endif
assert( result != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ARGS,
+
+ LDAP_LOG ( CACHE, ARGS,
"ldap_add_result_to_cache: id %ld, type %ld\n",
- (long) result->lm_msgid, (long) result->lm_msgtype ));
+ (long) result->lm_msgid, (long) result->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_add_result_to_cache: id %ld, type %ld\n",
(long) result->lm_msgid, (long) result->lm_msgtype, 0 );
if ( ld->ld_cache == NULL ||
( ld->ld_cache->lc_enabled == 0 )) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "ldap_add_result_to_cache: cache disabled\n" ));
+ LDAP_LOG ( CACHE, DETAIL1,
+ "ldap_add_result_to_cache: cache disabled\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "artc: cache disabled\n", 0, 0, 0 );
#endif
* only cache search and compare operations
*/
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "ldap_add_result_to_cache: "
- "only caching search & compare operations\n" ));
+ LDAP_LOG ( CACHE, DETAIL1,
+ "ldap_add_result_to_cache: only caching search & "
+ "compare operations\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: only caching search & compare operations\n", 0, 0, 0 );
new->lm_chain = NULL;
m->lm_chain = new;
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
+ LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
- "result added to cache request chain\n" ));
+ "result added to cache request chain\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: result added to cache request chain\n",
if ( !keep ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
+ LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
- "not caching result with error\n" ));
+ "not caching result with error\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: not caching result with error %d\n",
ld->ld_cache->lc_memused += msg_size( req );
check_cache_memused( ld->ld_cache );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
+ LDAP_LOG ( CACHE, RESULTS,
"ldap_add_result_to_cache: "
- "cached result with error\n" ));
+ "cached result with error\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"artc: cached result with error %d\n",
}
} else {
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
- "ldap_add_result_to_cache: "
- "msgid not in request list\n" ));
+ LDAP_LOG ( CACHE, RESULTS,
+ "ldap_add_result_to_cache: msgid not in request list\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "artc: msgid not in request list\n",
0, 0, 0 );
assert( request != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_ENTRY, "ldap_check_cache\n" ));
+ LDAP_LOG ( CACHE, ENTRY, "ldap_check_cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_check_cache\n", 0, 0, 0 );
#endif
hash = cache_hash( &reqber );
for ( m = ld->ld_cache->lc_buckets[ hash ]; m != NULL; m = next ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
+ LDAP_LOG ( CACHE, DETAIL1,
"ldap_check_cache: examining id %ld, type %ld\n",
- (long) m->lm_msgid, (long) m->lm_msgtype ));
+ (long) m->lm_msgid, (long) m->lm_msgtype, 0 );
#else
Debug( LDAP_DEBUG_TRACE,"cc: examining id %ld,type %ld\n",
(long) m->lm_msgid, (long) m->lm_msgtype, 0 );
prev->lm_next = next;
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "ldap_check_cache: expired id %ld\n",
- (long) m->lm_msgid ));
+ LDAP_LOG ( CACHE, DETAIL1, "ldap_check_cache: expired id %ld\n",
+ (long) m->lm_msgid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: expired id %d\n",
m->lm_msgid, 0, 0 );
}
prev = new;
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "ldap_check_cache: added type %ld\n",
- (long) m->lm_msgtype ));
+ LDAP_LOG ( CACHE, DETAIL1, "ldap_check_cache: added type %ld\n",
+ (long) m->lm_msgtype, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: added type %ld\n",
(long) new->lm_msgtype, 0, 0 );
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
- "ldap_check_cache: result returned from cache\n" ));
+ LDAP_LOG ( CACHE, RESULTS,
+ "ldap_check_cache: result returned from cache\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cc: result returned from cache\n", 0, 0, 0 );
#endif
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_RESULTS,
- "cache_hash: len is %ld, returning %ld\n",
- len, len % LDAP_CACHE_BUCKETS ));
+ LDAP_LOG ( CACHE, RESULTS, "cache_hash: len is %ld, returning %ld\n",
+ len, len % LDAP_CACHE_BUCKETS, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "cache_hash: len is %ld, returning %ld\n",
len, len % LDAP_CACHE_BUCKETS, 0 );
LDAPMessage *m, *prev, *next;
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
+ LDAP_LOG ( CACHE, DETAIL1,
"check_cache_memused: %ld bytes in use (%ld max)\n",
- lc->lc_memused, lc->lc_maxmem ));
+ lc->lc_memused, lc->lc_maxmem, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "check_cache_memused: %ld bytes in use (%ld max)\n",
lc->lc_memused, lc->lc_maxmem, 0 );
}
lc->lc_memused -= msg_size( m );
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "check_cache_memused: removed %ld\n",
- m->lm_msgid ));
+ LDAP_LOG ( CACHE, DETAIL1,
+ "check_cache_memused: removed %ld\n", m->lm_msgid,0,0 );
#else
Debug( LDAP_DEBUG_TRACE,
"ccm: removed %d\n",
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1,
- "check_cache_memused: reduced usage to %ld bytes\n",
- lc->lc_memused ));
+ LDAP_LOG ( CACHE, DETAIL1,
+ "check_cache_memused: reduced usage to %ld bytes\n",
+ lc->lc_memused, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ccm: reduced usage to %ld bytes\n",
lc->lc_memused, 0, 0 );