upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 23:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unify logging output

Browse source
This commit is contained in:
Ondřej Kuzník 2017-06-20 13:00:31 +01:00 committed by Ondřej Kuzník
parent 873d6fa3e1
commit 05f2ac2583
8 changed files with 104 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/lloadd/backend.c
View file

@ -138,7 +138,8 @@ backend_select( Operation *op )
( b->b_max_conn_pending == 0 || ( b->b_max_conn_pending == 0 ||
c->c_n_ops_executing < b->b_max_conn_pending ) ) { c->c_n_ops_executing < b->b_max_conn_pending ) ) {
Debug( LDAP_DEBUG_CONNS, "backend_select: " Debug( LDAP_DEBUG_CONNS, "backend_select: "
"selected connection %lu for client %lu msgid=%d\n", "selected connection connid=%lu for client "
"connid=%lu msgid=%d\n",
c->c_connid, op->o_client_connid, op->o_client_msgid ); c->c_connid, op->o_client_connid, op->o_client_msgid );
/* /*

8
servers/lloadd/bind.c
View file

@ -93,8 +93,8 @@ request_bind( Operation *op )
LDAP_TAG_CONTROLS, BER_BV_OPTIONAL( &op->o_ctrls ) ); LDAP_TAG_CONTROLS, BER_BV_OPTIONAL( &op->o_ctrls ) );
Debug( LDAP_DEBUG_TRACE, "request_bind: " Debug( LDAP_DEBUG_TRACE, "request_bind: "
"added bind from client connid=%lu to upstream connid=%lu as " "added bind from client connid=%lu to upstream connid=%lu "
"msgid=%d\n", "as msgid=%d\n",
op->o_client_connid, op->o_upstream_connid, op->o_upstream_msgid ); op->o_client_connid, op->o_upstream_connid, op->o_upstream_msgid );
if ( tavl_insert( &upstream->c_ops, op, operation_upstream_cmp, if ( tavl_insert( &upstream->c_ops, op, operation_upstream_cmp,
avl_dup_error ) ) { avl_dup_error ) ) {
@ -222,8 +222,8 @@ request_bind_as_vc( Operation *op )
CONNECTION_LOCK(upstream); CONNECTION_LOCK(upstream);
Debug( LDAP_DEBUG_TRACE, "request_bind_as_vc: " Debug( LDAP_DEBUG_TRACE, "request_bind_as_vc: "
"added bind from client connid=%lu to upstream connid=%lu as VC " "added bind from client connid=%lu to upstream connid=%lu "
"exop msgid=%d\n", "as VC exop msgid=%d\n",
op->o_client_connid, op->o_upstream_connid, op->o_upstream_msgid ); op->o_client_connid, op->o_upstream_connid, op->o_upstream_msgid );
if ( tavl_insert( &upstream->c_ops, op, operation_upstream_cmp, if ( tavl_insert( &upstream->c_ops, op, operation_upstream_cmp,
avl_dup_error ) ) { avl_dup_error ) ) {

20
servers/lloadd/client.c
View file

@ -41,12 +41,15 @@ client_read_cb( evutil_socket_t s, short what, void *arg )
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
if ( !c->c_live ) { if ( !c->c_live ) {
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"suspended read event on a dead connid=%lu\n",
c->c_connid );
CONNECTION_UNLOCK(c); CONNECTION_UNLOCK(c);
return; return;
} }
Debug( LDAP_DEBUG_CONNS, "client_read_cb: " Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"connection %lu ready to read\n", "connection connid=%lu ready to read\n",
c->c_connid ); c->c_connid );
ber = c->c_currentber; ber = c->c_currentber;
@ -75,10 +78,16 @@ client_read_cb( evutil_socket_t s, short what, void *arg )
ber_free( ber, 1 ); ber_free( ber, 1 );
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"suspended read event on dying connid=%lu\n",
c->c_connid );
CLIENT_DESTROY(c); CLIENT_DESTROY(c);
return; return;
} }
event_add( c->c_read_event, NULL ); event_add( c->c_read_event, NULL );
Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"re-enabled read event on connid=%lu\n",
c->c_connid );
CONNECTION_UNLOCK(c); CONNECTION_UNLOCK(c);
return; return;
} }
@ -96,7 +105,11 @@ client_read_cb( evutil_socket_t s, short what, void *arg )
} }
return; return;
} }
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"suspended read event on connid=%lu\n",
c->c_connid );
CONNECTION_UNLOCK(c); CONNECTION_UNLOCK(c);
return; return;
@ -155,6 +168,9 @@ handle_requests( void *ctx, void *arg )
} }
event_add( c->c_read_event, NULL ); event_add( c->c_read_event, NULL );
Debug( LDAP_DEBUG_CONNS, "handle_requests: "
"re-enabled read event on connid=%lu\n",
c->c_connid );
CLIENT_UNLOCK_OR_DESTROY(c); CLIENT_UNLOCK_OR_DESTROY(c);
return NULL; return NULL;
} }
@ -230,7 +246,7 @@ client_write_cb( evutil_socket_t s, short what, void *arg )
ldap_pvt_thread_mutex_lock( &c->c_io_mutex ); ldap_pvt_thread_mutex_lock( &c->c_io_mutex );
Debug( LDAP_DEBUG_CONNS, "client_write_cb: " Debug( LDAP_DEBUG_CONNS, "client_write_cb: "
"have something to write to client %lu\n", "have something to write to client connid=%lu\n",
c->c_connid ); c->c_connid );
/* We might have been beaten to flushing the data by another thread */ /* We might have been beaten to flushing the data by another thread */

16
servers/lloadd/config.c
View file

@ -396,7 +396,7 @@ config_generic( ConfigArgs *c )
snprintf( c->cr_msg, sizeof(c->cr_msg), snprintf( c->cr_msg, sizeof(c->cr_msg),
"threads=%d smaller than minimum value 2", "threads=%d smaller than minimum value 2",
c->value_int ); c->value_int );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg ); Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->cr_msg );
return 1; return 1;
} else if ( c->value_int > 2 * SLAP_MAX_WORKER_THREADS ) { } else if ( c->value_int > 2 * SLAP_MAX_WORKER_THREADS ) {
@ -405,7 +405,7 @@ config_generic( ConfigArgs *c )
"(2*%d=%d); YMMV", "(2*%d=%d); YMMV",
c->value_int, SLAP_MAX_WORKER_THREADS, c->value_int, SLAP_MAX_WORKER_THREADS,
2 * SLAP_MAX_WORKER_THREADS ); 2 * SLAP_MAX_WORKER_THREADS );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg ); Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->cr_msg );
} }
if ( slapMode & SLAP_SERVER_MODE ) if ( slapMode & SLAP_SERVER_MODE )
ldap_pvt_thread_pool_maxthreads( ldap_pvt_thread_pool_maxthreads(
@ -418,7 +418,7 @@ config_generic( ConfigArgs *c )
snprintf( c->cr_msg, sizeof(c->cr_msg), snprintf( c->cr_msg, sizeof(c->cr_msg),
"threadqueues=%d smaller than minimum value 1", "threadqueues=%d smaller than minimum value 1",
c->value_int ); c->value_int );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg ); Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->cr_msg );
return 1; return 1;
} }
if ( slapMode & SLAP_SERVER_MODE ) if ( slapMode & SLAP_SERVER_MODE )
@ -449,14 +449,14 @@ config_generic( ConfigArgs *c )
if ( c->value_int < 0 ) { if ( c->value_int < 0 ) {
snprintf( c->cr_msg, sizeof(c->cr_msg), snprintf( c->cr_msg, sizeof(c->cr_msg),
"max_pdus_per_cycle=%d invalid", c->value_int ); "max_pdus_per_cycle=%d invalid", c->value_int );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg ); Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->cr_msg );
return 1; return 1;
} }
slap_conn_max_pdus_per_cycle = c->value_int; slap_conn_max_pdus_per_cycle = c->value_int;
break; break;
default: default:
Debug( LDAP_DEBUG_ANY, "%s: unknown CFG_TYPE %d.\n", Debug( LDAP_DEBUG_ANY, "%s: unknown CFG_TYPE %d\n",
c->log, c->type ); c->log, c->type );
return 1; return 1;
} }
@ -1324,7 +1324,7 @@ config_check_vals( ConfigTable *Conf, ConfigArgs *c, int check_only )
c->argv[0], Conf->what ); c->argv[0], Conf->what );
ignored = ""; ignored = "";
Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, "%s: %s%s.\n", Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, "%s: %s%s\n",
c->log, c->cr_msg, ignored ); c->log, c->cr_msg, ignored );
return ARG_BAD_CONF; return ARG_BAD_CONF;
} }
@ -1647,7 +1647,7 @@ read_config_file(
} }
if ( c->argc < 1 ) { if ( c->argc < 1 ) {
Debug( LDAP_DEBUG_ANY, "%s: bad config line.\n", c->log ); Debug( LDAP_DEBUG_ANY, "%s: bad config line\n", c->log );
rc = 1; rc = 1;
goto done; goto done;
} }
@ -1674,7 +1674,7 @@ read_config_file(
} else { } else {
Debug( LDAP_DEBUG_ANY, "%s: unknown directive " Debug( LDAP_DEBUG_ANY, "%s: unknown directive "
"<%s> outside backend info and database definitions.\n", "<%s> outside backend info and database definitions\n",
c->log, *c->argv ); c->log, *c->argv );
rc = 1; rc = 1;
goto done; goto done;

4
servers/lloadd/connection.c
View file

@ -55,7 +55,7 @@ connection_destroy( Connection *c )
{ {
assert( c ); assert( c );
Debug( LDAP_DEBUG_CONNS, "connection_destroy: " Debug( LDAP_DEBUG_CONNS, "connection_destroy: "
"destroying connection %lu.\n", "destroying connection connid=%lu\n",
c->c_connid ); c->c_connid );
assert( c->c_live == 0 ); assert( c->c_live == 0 );
@ -94,7 +94,7 @@ connection_init( ber_socket_t s, const char *peername, int flags )
if ( s == AC_SOCKET_INVALID ) { if ( s == AC_SOCKET_INVALID ) {
Debug( LDAP_DEBUG_ANY, "connection_init: " Debug( LDAP_DEBUG_ANY, "connection_init: "
"init of socket fd=%ld invalid.\n", "init of socket fd=%ld invalid\n",
(long)s ); (long)s );
return NULL; return NULL;
} }

4
servers/lloadd/daemon.c
View file

@ -736,7 +736,7 @@ slapd_daemon_init( const char *urls )
if ( u == NULL || u[0] == NULL ) { if ( u == NULL || u[0] == NULL ) {
Debug( LDAP_DEBUG_ANY, "slapd_daemon_init: " Debug( LDAP_DEBUG_ANY, "slapd_daemon_init: "
"no urls (%s) provided.\n", "no urls (%s) provided\n",
urls ); urls );
if ( u ) ldap_charray_free( u ); if ( u ) ldap_charray_free( u );
return -1; return -1;
@ -1003,7 +1003,7 @@ slap_listener(
if ( !c ) { if ( !c ) {
Debug( LDAP_DEBUG_ANY, "slap_listener: " Debug( LDAP_DEBUG_ANY, "slap_listener: "
"client_init(%ld, %s, %s) failed.\n", "client_init(%ld, %s, %s) failed\n",
(long)s, peername, sl->sl_name.bv_val ); (long)s, peername, sl->sl_name.bv_val );
slapd_close( s ); slapd_close( s );
} }

39
servers/lloadd/operation.c
View file

@ -186,8 +186,9 @@ operation_destroy_from_client( Operation *op )
*/ */
if ( !detach_client && race_state == SLAP_OP_FREEING_UPSTREAM ) { if ( !detach_client && race_state == SLAP_OP_FREEING_UPSTREAM ) {
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: "
"op=%p lost race, increasing client refcnt c=%p\n", "op=%p lost race, increased client refcnt connid=%lu "
op, client ); "to refcnt=%d\n",
op, client->c_connid, client->c_refcnt );
CONNECTION_LOCK(client); CONNECTION_LOCK(client);
} else { } else {
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: "
@ -216,8 +217,8 @@ operation_destroy_from_client( Operation *op )
*/ */
upstream->c_refcnt--; upstream->c_refcnt--;
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_client: "
"op=%p other side lost race with us\n", "op=%p other side lost race with us, upstream connid=%lu\n",
op ); op, upstream->c_connid );
} }
ldap_pvt_thread_mutex_unlock( &op->o_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_mutex );
@ -330,8 +331,9 @@ operation_destroy_from_upstream( Operation *op )
*/ */
if ( !detach_upstream && race_state == SLAP_OP_FREEING_CLIENT ) { if ( !detach_upstream && race_state == SLAP_OP_FREEING_CLIENT ) {
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: "
"op=%p lost race, increasing upstream refcnt c=%p\n", "op=%p lost race, increased upstream refcnt connid=%lu "
op, upstream ); "to refcnt=%d\n",
op, upstream->c_connid, upstream->c_refcnt );
CONNECTION_LOCK(upstream); CONNECTION_LOCK(upstream);
} else { } else {
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: "
@ -360,8 +362,8 @@ operation_destroy_from_upstream( Operation *op )
*/ */
client->c_refcnt--; client->c_refcnt--;
Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: " Debug( LDAP_DEBUG_TRACE, "operation_destroy_from_upstream: "
"op=%p other side lost race with us\n", "op=%p other side lost race with us, client connid=%lu\n",
op ); op, client->c_connid );
} }
ldap_pvt_thread_mutex_unlock( &op->o_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_mutex );
@ -431,8 +433,8 @@ operation_init( Connection *c, BerElement *ber )
rc = tavl_insert( &c->c_ops, op, operation_client_cmp, avl_dup_error ); rc = tavl_insert( &c->c_ops, op, operation_client_cmp, avl_dup_error );
if ( rc ) { if ( rc ) {
Debug( LDAP_DEBUG_PACKETS, "operation_init: " Debug( LDAP_DEBUG_PACKETS, "operation_init: "
"several operations with same msgid=%d in-flight from client " "several operations with same msgid=%d in-flight "
"%lu\n", "from client connid=%lu\n",
op->o_client_msgid, op->o_client_connid ); op->o_client_msgid, op->o_client_connid );
goto fail; goto fail;
} }
@ -560,8 +562,16 @@ request_abandon( Connection *c, Operation *op )
request = tavl_find( c->c_ops, &needle, operation_client_cmp ); request = tavl_find( c->c_ops, &needle, operation_client_cmp );
if ( !request ) { if ( !request ) {
Debug( LDAP_DEBUG_TRACE, "request_abandon: "
"connid=%lu msgid=%d requests abandon of an operation "
"msgid=%d not being processed anymore\n",
c->c_connid, op->o_client_msgid, needle.o_client_msgid );
goto done; goto done;
} }
Debug( LDAP_DEBUG_TRACE, "request_abandon: "
"connid=%lu msgid=%d abandoning %s msgid=%d\n",
c->c_connid, op->o_client_msgid, slap_msgtype2str( request->o_tag ),
needle.o_client_msgid );
CONNECTION_UNLOCK_INCREF(c); CONNECTION_UNLOCK_INCREF(c);
operation_abandon( request ); operation_abandon( request );
@ -584,7 +594,7 @@ operation_send_reject(
int found; int found;
Debug( LDAP_DEBUG_TRACE, "operation_send_reject: " Debug( LDAP_DEBUG_TRACE, "operation_send_reject: "
"rejecting %s from client %lu with message: \"%s\"\n", "rejecting %s from client connid=%lu with message: \"%s\"\n",
slap_msgtype2str( op->o_tag ), op->o_client_connid, msg ); slap_msgtype2str( op->o_tag ), op->o_client_connid, msg );
ldap_pvt_thread_mutex_lock( &operation_mutex ); ldap_pvt_thread_mutex_lock( &operation_mutex );
@ -595,6 +605,9 @@ operation_send_reject(
* client is dead, it must have been the upstream */ * client is dead, it must have been the upstream */
assert( c ); assert( c );
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
Debug( LDAP_DEBUG_TRACE, "operation_send_reject: "
"not sending msgid=%d, client connid=%lu is dead\n",
op->o_client_msgid, op->o_client_connid );
ldap_pvt_thread_mutex_unlock( &operation_mutex ); ldap_pvt_thread_mutex_unlock( &operation_mutex );
operation_destroy_from_upstream( op ); operation_destroy_from_upstream( op );
UPSTREAM_UNLOCK_OR_DESTROY(c); UPSTREAM_UNLOCK_OR_DESTROY(c);
@ -605,6 +618,10 @@ operation_send_reject(
found = ( tavl_delete( &c->c_ops, op, operation_client_cmp ) == op ); found = ( tavl_delete( &c->c_ops, op, operation_client_cmp ) == op );
if ( !found && !send_anyway ) { if ( !found && !send_anyway ) {
Debug( LDAP_DEBUG_TRACE, "operation_send_reject: "
"msgid=%d not scheduled for client connid=%lu anymore, "
"not sending\n",
op->o_client_msgid, c->c_connid );
goto done; goto done;
} }

59
servers/lloadd/upstream.c
View file

@ -41,7 +41,7 @@ forward_response( Operation *op, BerElement *ber )
} }
Debug( LDAP_DEBUG_CONNS, "forward_response: " Debug( LDAP_DEBUG_CONNS, "forward_response: "
"%s to client %lu request #%d\n", "%s to client connid=%lu request msgid=%d\n",
slap_msgtype2str( response_tag ), op->o_client_connid, slap_msgtype2str( response_tag ), op->o_client_connid,
op->o_client_msgid ); op->o_client_msgid );
@ -72,8 +72,9 @@ forward_final_response( Operation *op, BerElement *ber )
int rc; int rc;
Debug( LDAP_DEBUG_CONNS, "forward_final_response: " Debug( LDAP_DEBUG_CONNS, "forward_final_response: "
"finishing up with request #%d for client %lu\n", "connid=%lu msgid=%d finishing up with a request for "
op->o_client_msgid, op->o_client_connid ); "client connid=%lu\n",
op->o_upstream_connid, op->o_upstream_msgid, op->o_client_connid );
rc = forward_response( op, ber ); rc = forward_response( op, ber );
CONNECTION_LOCK_DECREF(op->o_upstream); CONNECTION_LOCK_DECREF(op->o_upstream);
operation_destroy_from_upstream( op ); operation_destroy_from_upstream( op );
@ -106,7 +107,8 @@ handle_bind_response( Operation *op, BerElement *ber )
} }
Debug( LDAP_DEBUG_CONNS, "handle_bind_response: " Debug( LDAP_DEBUG_CONNS, "handle_bind_response: "
"received response for bind request by client %lu, result=%d\n", "received response for bind request by client connid=%lu, "
"result=%d\n",
op->o_client_connid, result ); op->o_client_connid, result );
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
@ -169,7 +171,8 @@ handle_vc_bind_response( Operation *op, BerElement *ber )
CONNECTION_LOCK(upstream); CONNECTION_LOCK(upstream);
b = (Backend *)upstream->c_private; b = (Backend *)upstream->c_private;
Debug( LDAP_DEBUG_ANY, "VC extended operation not supported on backend %s\n", Debug( LDAP_DEBUG_ANY, "handle_vc_bind_response: "
"VC extended operation not supported on backend %s\n",
b->b_uri.bv_val ); b->b_uri.bv_val );
CONNECTION_UNLOCK(upstream); CONNECTION_UNLOCK(upstream);
} }
@ -177,7 +180,8 @@ handle_vc_bind_response( Operation *op, BerElement *ber )
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
Debug( LDAP_DEBUG_CONNS, "handle_vc_bind_response: " Debug( LDAP_DEBUG_CONNS, "handle_vc_bind_response: "
"received response for bind request by client %lu, result=%d\n", "received response for bind request by client connid=%lu, "
"result=%d\n",
c->c_connid, result ); c->c_connid, result );
if ( tag == LDAP_TAG_EXOP_VERIFY_CREDENTIALS_COOKIE ) { if ( tag == LDAP_TAG_EXOP_VERIFY_CREDENTIALS_COOKIE ) {
@ -274,7 +278,7 @@ handle_unsolicited( Connection *c, BerElement *ber )
c->c_state = SLAP_C_CLOSING; c->c_state = SLAP_C_CLOSING;
Debug( LDAP_DEBUG_CONNS, "handle_unsolicited: " Debug( LDAP_DEBUG_CONNS, "handle_unsolicited: "
"teardown for upstream connection %lu\n", "teardown for upstream connection connid=%lu\n",
c->c_connid ); c->c_connid );
UPSTREAM_DESTROY(c); UPSTREAM_DESTROY(c);
@ -372,13 +376,14 @@ handle_one_response( Connection *c )
} }
if ( op ) { if ( op ) {
Debug( LDAP_DEBUG_TRACE, "handle_one_response: " Debug( LDAP_DEBUG_TRACE, "handle_one_response: "
"upstream=%lu, processing response for client connid=%lu, " "upstream connid=%lu, processing response for "
"msgid=%d\n", "client connid=%lu, msgid=%d\n",
c->c_connid, op->o_client_connid, op->o_client_msgid ); c->c_connid, op->o_client_connid, op->o_client_msgid );
} else { } else {
tag = ber_peek_tag( ber, &len ); tag = ber_peek_tag( ber, &len );
Debug( LDAP_DEBUG_TRACE, "handle_one_response: " Debug( LDAP_DEBUG_STATS2, "handle_one_response: "
"upstream=%lu, %s, msgid=%d not for a pending operation\n", "upstream connid=%lu, %s, msgid=%d not for a pending "
"operation\n",
c->c_connid, slap_msgtype2str( tag ), needle.o_upstream_msgid ); c->c_connid, slap_msgtype2str( tag ), needle.o_upstream_msgid );
} }
@ -415,9 +420,10 @@ handle_one_response( Connection *c )
fail: fail:
if ( rc ) { if ( rc ) {
Debug( LDAP_DEBUG_ANY, "handle_one_response: " Debug( LDAP_DEBUG_STATS, "handle_one_response: "
"error on processing a response on upstream connection %ld\n", "error on processing a response (%s) on upstream connection "
c->c_connid ); "connid=%ld, tag=%lx\n",
slap_msgtype2str( tag ), c->c_connid, tag );
UPSTREAM_DESTROY(c); UPSTREAM_DESTROY(c);
} }
/* We leave the connection locked */ /* We leave the connection locked */
@ -487,6 +493,9 @@ handle_responses( void *ctx, void *arg )
} }
event_add( c->c_read_event, NULL ); event_add( c->c_read_event, NULL );
Debug( LDAP_DEBUG_CONNS, "handle_responses: "
"re-enabled read event on connid=%lu\n",
c->c_connid );
UPSTREAM_UNLOCK_OR_DESTROY(c); UPSTREAM_UNLOCK_OR_DESTROY(c);
return NULL; return NULL;
} }
@ -509,11 +518,14 @@ upstream_read_cb( evutil_socket_t s, short what, void *arg )
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
if ( !c->c_live ) { if ( !c->c_live ) {
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: "
"suspended read event on a dead connid=%lu\n",
c->c_connid );
CONNECTION_UNLOCK(c); CONNECTION_UNLOCK(c);
return; return;
} }
Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: " Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: "
"connection %lu ready to read\n", "connection connid=%lu ready to read\n",
c->c_connid ); c->c_connid );
ber = c->c_currentber; ber = c->c_currentber;
@ -542,10 +554,16 @@ upstream_read_cb( evutil_socket_t s, short what, void *arg )
ber_free( ber, 1 ); ber_free( ber, 1 );
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: "
"suspended read event on dying connid=%lu\n",
c->c_connid );
UPSTREAM_DESTROY(c); UPSTREAM_DESTROY(c);
return; return;
} }
event_add( c->c_read_event, NULL ); event_add( c->c_read_event, NULL );
Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: "
"re-enabled read event on connid=%lu\n",
c->c_connid );
CONNECTION_UNLOCK(c); CONNECTION_UNLOCK(c);
return; return;
} }
@ -580,7 +598,7 @@ upstream_finish( Connection *c )
evutil_socket_t s = c->c_fd; evutil_socket_t s = c->c_fd;
Debug( LDAP_DEBUG_CONNS, "upstream_finish: " Debug( LDAP_DEBUG_CONNS, "upstream_finish: "
"connection %lu is ready for use\n", "connection connid=%lu is ready for use\n",
c->c_connid ); c->c_connid );
base = slap_get_base( s ); base = slap_get_base( s );
@ -615,7 +633,7 @@ upstream_bind_cb( evutil_socket_t s, short what, void *arg )
CONNECTION_LOCK(c); CONNECTION_LOCK(c);
Debug( LDAP_DEBUG_CONNS, "upstream_bind_cb: " Debug( LDAP_DEBUG_CONNS, "upstream_bind_cb: "
"connection %lu ready to read\n", "connection connid=%lu ready to read\n",
c->c_connid ); c->c_connid );
ber = c->c_currentber; ber = c->c_currentber;
@ -689,6 +707,9 @@ upstream_bind_cb( evutil_socket_t s, short what, void *arg )
fail: fail:
event_del( c->c_read_event ); event_del( c->c_read_event );
Debug( LDAP_DEBUG_CONNS, "upstream_bind_cb: "
"suspended read event on dying connid=%lu\n",
c->c_connid );
ber_free( ber, 1 ); ber_free( ber, 1 );
UPSTREAM_DESTROY(c); UPSTREAM_DESTROY(c);
} }
@ -710,7 +731,7 @@ upstream_write_cb( evutil_socket_t s, short what, void *arg )
ldap_pvt_thread_mutex_lock( &c->c_io_mutex ); ldap_pvt_thread_mutex_lock( &c->c_io_mutex );
Debug( LDAP_DEBUG_CONNS, "upstream_write_cb: " Debug( LDAP_DEBUG_CONNS, "upstream_write_cb: "
"have something to write to upstream %lu\n", "have something to write to upstream connid=%lu\n",
c->c_connid ); c->c_connid );
/* We might have been beaten to flushing the data by another thread */ /* We might have been beaten to flushing the data by another thread */
@ -893,7 +914,7 @@ upstream_destroy( Connection *c )
long freed, executing; long freed, executing;
Debug( LDAP_DEBUG_CONNS, "upstream_destroy: " Debug( LDAP_DEBUG_CONNS, "upstream_destroy: "
"freeing connection %lu\n", "freeing connection connid=%lu\n",
c->c_connid ); c->c_connid );
c->c_state = SLAP_C_INVALID; c->c_state = SLAP_C_INVALID;