X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmonitor.c;h=935ae28feeb683089363ed97ff53122d6e4943fc;hb=51190984eefbdbedd47185e41ece37f72773744d;hp=b2ea44db1d519e6db12be391a7cbc44e3de91434;hpb=7e4b3bc2e7177ea4ae818ce11ecf2c7d4e266c06;p=openldap diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c index b2ea44db1d..935ae28fee 100644 --- a/servers/slapd/monitor.c +++ b/servers/slapd/monitor.c @@ -1,3 +1,8 @@ +/* $OpenLDAP$ */ +/* + * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. @@ -18,13 +23,16 @@ #include #include -#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]; @@ -33,13 +41,10 @@ monitor_info( Connection *conn, Operation *op ) int nconns, nwritewaiters, nreadwaiters; struct tm *ltm; char *p; -#ifdef LDAP_COUNTERS - int i; - char buf2[22] - char buf3[22] + char buf2[22]; + char buf3[22]; Connection *c; int connindex; -#endif time_t currenttime; vals[0] = &val; @@ -49,9 +54,24 @@ 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( e->e_ndn ); e->e_private = NULL; + { + 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 ); @@ -71,7 +91,6 @@ monitor_info( Connection *conn, Operation *op ) nwritewaiters = 0; nreadwaiters = 0; -#ifdef LDAP_COUNTERS /* loop through the connections */ for ( c = connection_first( &connindex ); c != NULL; @@ -86,29 +105,47 @@ monitor_info( Connection *conn, Operation *op ) } ldap_pvt_thread_mutex_lock( &gmtime_mutex ); -#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 + ltm = gmtime( &c->c_activitytime ); + strftime( buf3, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm ); ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - sprintf( buf, "%d : %s : %d : %d : %s : %s%s%s%s : %s", i, - buf2, c[i].c_n_ops_received, c[i].c_n_ops_completed, - c[i].c_cdn ? c[i].c_cdn : "NULLDN", - c[i].c_currentber ? "r" : "", - c[i].c_writewaiter ? "w" : "", - c[i].c_ops != NULL ? "x" : "", - c[i].c_pending_ops != NULL ? "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 ); @@ -117,84 +154,85 @@ 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 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 ); 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 ); + 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, "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(); ldap_pvt_thread_mutex_lock( &gmtime_mutex ); -#ifndef LDAP_LOCALTIME ltm = gmtime( ¤ttime ); strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); -#else - ltm = localtime( ¤ttime ); - strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); -#endif val.bv_val = buf; val.bv_len = strlen( buf ); attr_merge( e, "currenttime", vals ); -#ifndef LDAP_LOCALTIME ltm = gmtime( &starttime ); strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); -#else - ltm = localtime( &starttime ); - strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); -#endif ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); val.bv_val = buf; @@ -213,8 +251,22 @@ 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 = "LDAPsubentry"; + val.bv_len = sizeof("LDAPsubentry")-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 ); }