X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmonitor.c;h=659be6e99b5ecf12d36d8779e4379e233f426b23;hb=8743c05359d008eab5d65d5aacf1836bd583dafb;hp=035ef9769df9d3e3df13794128f8feb7f8476c97;hpb=4b65e74fa8ee7db3c42f4640700dd9464a26b0b3;p=openldap diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c index 035ef9769d..659be6e99b 100644 --- a/servers/slapd/monitor.c +++ b/servers/slapd/monitor.c @@ -18,23 +18,30 @@ #include #include -#include "ldapconfig.h" +#include "ldap_defaults.h" #include "slap.h" #if defined( SLAPD_MONITOR_DN ) void -monitor_info( Connection *conn, Operation *op ) +monitor_info( + Connection *conn, + Operation *op, + char ** attrs, + int attrsonly ) { Entry *e; - char buf[BUFSIZ], buf2[22]; + char buf[BUFSIZ]; struct berval val; struct berval *vals[2]; - int i, nconns, nwritewaiters, nreadwaiters; + int nconns, nwritewaiters, nreadwaiters; struct tm *ltm; char *p; + char buf2[22]; + char buf3[22]; Connection *c; - time_t currenttime; + int connindex; + time_t currenttime; vals[0] = &val; vals[1] = NULL; @@ -43,10 +50,25 @@ monitor_info( Connection *conn, Operation *op ) /* initialize reader/writer lock */ e->e_attrs = NULL; e->e_dn = ch_strdup( SLAPD_MONITOR_DN ); - e->e_ndn = dn_normalize_case( ch_strdup(SLAPD_MONITOR_DN) ); + e->e_ndn = ch_strdup(SLAPD_MONITOR_DN); + (void) dn_normalize_case( e->e_ndn ); e->e_private = NULL; - val.bv_val = Versionstr; + { + char *rdn = ch_strdup( SLAPD_MONITOR_DN ); + val.bv_val = strchr( rdn, '=' ); + + if( val.bv_val != NULL ) { + *val.bv_val = '\0'; + val.bv_len = strlen( ++val.bv_val ); + + attr_merge( e, rdn, vals ); + } + + free( rdn ); + } + + val.bv_val = (char *) Versionstr; if (( p = strchr( Versionstr, '\n' )) == NULL ) { val.bv_len = strlen( Versionstr ); } else { @@ -65,9 +87,11 @@ monitor_info( Connection *conn, Operation *op ) nwritewaiters = 0; nreadwaiters = 0; -#ifdef LDAP_COUNTERS /* loop through the connections */ - for ( c = connection_first() ; c != NULL; c = connection_next(c) ) { + for ( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex )) + { nconns++; if ( c->c_writewaiter ) { nwritewaiters++; @@ -80,19 +104,52 @@ monitor_info( Connection *conn, Operation *op ) #ifndef LDAP_LOCALTIME ltm = gmtime( &c->c_starttime ); strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); + + ltm = gmtime( &c->c_activitytime ); + strftime( buf3, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); #else ltm = localtime( &c->.c_starttime ); strftime( buf2, sizeof(buf2), "%y%m%d%H%M%SZ", ltm ); + + ltm = localtime( &c->c_activitytime ); + strftime( buf3, sizeof(buf2), "%y%m%d%H%M%SZ", ltm ); #endif + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - sprintf( buf, "%d : %s : %d : %d : %s : %s%s%s%s", i, - buf2, c[i].c_ops_received, c[i].c_ops_completed, - c[i].c_cdn ? c[i].c_cdn : "NULLDN", - c[i].c_gettingber ? "r" : "", - c[i].c_writewaiter ? "w" : "", - c[i].c_ops_executing ? "x" : "", - c[i].c_ops_pending ? "p" : "" + sprintf( buf, + "%ld : %ld " + ": %ld/%ld/%ld/%ld " + ": %ld/%ld/%ld " + ": %s%s%s%s%s%s " + ": %s : %s : %s " + ": %s : %s : %s : %s ", + + c->c_connid, + (long) c->c_protocol, + + c->c_n_ops_received, c->c_n_ops_executing, + c->c_n_ops_pending, c->c_n_ops_completed, + + /* add low-level counters here */ + c->c_n_get, c->c_n_read, c->c_n_write, + + c->c_currentber ? "r" : "", + c->c_writewaiter ? "w" : "", + c->c_ops != NULL ? "x" : "", + c->c_pending_ops != NULL ? "p" : "", + connection_state2str( c->c_conn_state ), + c->c_bind_in_progress ? "S" : "", + + c->c_cdn ? c->c_cdn : "", + + c->c_listener_url, + c->c_peer_domain, + c->c_peer_name, + c->c_sock_name, + + buf2, + buf3 ); val.bv_val = buf; @@ -100,54 +157,73 @@ monitor_info( Connection *conn, Operation *op ) attr_merge( e, "connection", vals ); } connection_done(c); -#endif sprintf( buf, "%d", nconns ); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "currentconnections", vals ); + attr_merge( e, "currentConnections", vals ); sprintf( buf, "%ld", connections_nextid() ); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "totalconnections", vals ); + attr_merge( e, "totalConnections", vals ); - sprintf( buf, "%d", dtblsize ); + sprintf( buf, "%ld", (long) dtblsize ); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "dtablesize", vals ); + attr_merge( e, "dTableSize", vals ); sprintf( buf, "%d", nwritewaiters ); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "writewaiters", vals ); + attr_merge( e, "writeWaiters", vals ); sprintf( buf, "%d", nreadwaiters ); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "readwaiters", vals ); + attr_merge( e, "readWaiters", vals ); -#ifdef LDAP_COUNTERS - sprintf( buf, "%ld", ops_initiated ); + ldap_pvt_thread_mutex_lock(&num_ops_mutex); + sprintf( buf, "%ld", num_ops_initiated ); + ldap_pvt_thread_mutex_unlock(&num_ops_mutex); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "opsinitiated", vals ); + attr_merge( e, "opsInitiated", vals ); - sprintf( buf, "%ld", ops_completed ); + ldap_pvt_thread_mutex_lock(&num_ops_mutex); + sprintf( buf, "%ld", num_ops_completed ); + ldap_pvt_thread_mutex_unlock(&num_ops_mutex); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "opscompleted", vals ); + attr_merge( e, "opsCompleted", vals ); + ldap_pvt_thread_mutex_lock(&num_sent_mutex); sprintf( buf, "%ld", num_entries_sent ); + ldap_pvt_thread_mutex_unlock(&num_sent_mutex); + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, "entriesSent", vals ); + + ldap_pvt_thread_mutex_lock(&num_sent_mutex); + sprintf( buf, "%ld", num_refs_sent ); + ldap_pvt_thread_mutex_unlock(&num_sent_mutex); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "entriessent", vals ); + attr_merge( e, "referencesSent", vals ); + ldap_pvt_thread_mutex_lock(&num_sent_mutex); + sprintf( buf, "%ld", num_pdu_sent ); + ldap_pvt_thread_mutex_unlock(&num_sent_mutex); + val.bv_val = buf; + val.bv_len = strlen( buf ); + attr_merge( e, "pduSent", vals ); + + ldap_pvt_thread_mutex_lock(&num_sent_mutex); sprintf( buf, "%ld", num_bytes_sent ); + ldap_pvt_thread_mutex_unlock(&num_sent_mutex); val.bv_val = buf; val.bv_len = strlen( buf ); - attr_merge( e, "bytessent", vals ); -#endif + attr_merge( e, "bytesSent", vals ); currenttime = slap_get_time(); @@ -188,8 +264,18 @@ monitor_info( Connection *conn, Operation *op ) attr_merge( e, "concurrency", vals ); #endif - send_search_entry( &backends[0], conn, op, e, NULL, 0 ); - send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 ); + val.bv_val = "top"; + val.bv_len = sizeof("top")-1; + attr_merge( e, "objectClass", vals ); + + val.bv_val = "extensibleObject"; + val.bv_len = sizeof("extensibleObject")-1; + attr_merge( e, "objectClass", vals ); + + send_search_entry( &backends[0], conn, op, e, + attrs, attrsonly, NULL ); + send_search_result( conn, op, LDAP_SUCCESS, + NULL, NULL, NULL, NULL, 1 ); entry_free( e ); }