X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fthread.c;h=c66df017d6eaaee33ecb3af3cafabff22f4a01ca;hb=44abcdfa2fd10362ea5bf46fdc6acd6875fcc0b8;hp=e9185b5a69c60cad4d2db2fd979ea346e4d0fb26;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap
diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index e9185b5a69..c66df017d6 100644
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
@@ -27,80 +27,76 @@
#include "slap.h"
#include "back-monitor.h"
+#include
+
+static int
+monitor_subsys_thread_update(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e );
+
/*
-* * initializes log subentry
-* */
+ * initializes log subentry
+ */
int
monitor_subsys_thread_init(
- BackendDB *be
+ BackendDB *be,
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
- struct monitorentrypriv *mp;
- Entry *e, **ep, *e_thread;
- static char buf[ BACKMONITOR_BUFSIZE ];
+ monitor_info_t *mi;
+ monitor_entry_t *mp;
+ Entry *e, **ep, *e_thread;
+ static char buf[ BACKMONITOR_BUFSIZE ];
+ struct berval bv;
- mi = ( struct monitorinfo * )be->be_private;
+ ms->mss_update = monitor_subsys_thread_update;
- if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e_thread ) )
- {
+ mi = ( monitor_info_t * )be->be_private;
+
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_thread ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: unable to get entry \"%s\"\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val,
+ ms->mss_ndn.bv_val,
0, 0 );
return( -1 );
}
- mp = ( struct monitorentrypriv * )e_thread->e_private;
+ mp = ( monitor_entry_t * )e_thread->e_private;
mp->mp_children = NULL;
ep = &mp->mp_children;
/*
* Max
*/
- snprintf( buf, sizeof( buf ),
- "dn: cn=Max,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Max\n"
- "%s: %d\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_ad_monitoredInfo->ad_cname.bv_val,
- SLAPD_GLOBAL(connection_pool_max),
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e = str2entry( buf );
+ BER_BVSTR( &bv, "cn=Max" );
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "
"unable to create entry \"cn=Max,%s\"\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%d", connection_pool_max );
+ bv.bv_val = buf;
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = NULL;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_THREAD];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_THREAD].mss_flags \
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
if ( monitor_cache_add( mi, e ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "
"unable to add entry \"cn=Max,%s\"\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
@@ -110,47 +106,69 @@ monitor_subsys_thread_init(
/*
* Backload
*/
- snprintf( buf, sizeof( buf ),
- "dn: cn=Backload,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Backload\n"
- "%s: 0\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_ad_monitoredInfo->ad_cname.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e = str2entry( buf );
+ BER_BVSTR( &bv, "cn=Backload" );
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "
"unable to create entry \"cn=Backload,%s\"\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
+ BER_BVSTR( &bv, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = NULL;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_THREAD];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_THREAD].mss_flags \
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
if ( monitor_cache_add( mi, e ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "
"unable to add entry \"cn=Backload,%s\"\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
+
+ *ep = e;
+ ep = &mp->mp_next;
+
+ /*
+ * Runqueue runners
+ */
+ BER_BVSTR( &bv, "cn=Runqueue" );
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
+ if ( e == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_thread_init: "
+ "unable to create entry \"cn=Runqueue,%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
+ BER_BVSTR( &bv, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
+ e->e_private = ( void * )mp;
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
+ | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+
+ if ( monitor_cache_add( mi, e ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_thread_init: "
+ "unable to add entry \"cn=Runqueue,%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
@@ -162,41 +180,76 @@ monitor_subsys_thread_init(
return( 0 );
}
-int
+static int
monitor_subsys_thread_update(
Operation *op,
- Entry *e
-)
+ SlapReply *rs,
+ Entry *e )
{
- struct monitorinfo *mi =
- (struct monitorinfo *)op->o_bd->be_private;
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
Attribute *a;
char buf[ BACKMONITOR_BUFSIZE ];
static struct berval backload_bv = BER_BVC( "cn=backload" );
- struct berval rdn;
+ static struct berval runqueue_bv = BER_BVC( "cn=runqueue" );
+ struct berval rdn, bv;
ber_len_t len;
+ int which = 0, i;
+ struct re_s *re;
assert( mi != NULL );
dnRdn( &e->e_nname, &rdn );
- if ( !dn_match( &rdn, &backload_bv ) ) {
- return 0;
+ if ( dn_match( &rdn, &backload_bv ) ) {
+ which = 1;
+
+ } else if ( dn_match( &rdn, &runqueue_bv ) ) {
+ which = 2;
+
+ } else {
+ return SLAP_CB_CONTINUE;
}
a = attr_find( e->e_attrs, mi->mi_ad_monitoredInfo );
if ( a == NULL ) {
- return -1;
+ return rs->sr_err = LDAP_OTHER;
}
- snprintf( buf, sizeof( buf ), "%d",
- ldap_pvt_thread_pool_backload( &SLAPD_GLOBAL(connection_pool) ) );
- len = strlen( buf );
- if ( len > a->a_vals[ 0 ].bv_len ) {
- a->a_vals[ 0 ].bv_val = ber_memrealloc( a->a_vals[ 0 ].bv_val, len + 1 );
+ switch ( which ) {
+ case 1:
+ snprintf( buf, sizeof( buf ), "%d",
+ ldap_pvt_thread_pool_backload( &connection_pool ) );
+ len = strlen( buf );
+ if ( len > a->a_vals[ 0 ].bv_len ) {
+ a->a_vals[ 0 ].bv_val = ber_memrealloc( a->a_vals[ 0 ].bv_val, len + 1 );
+ }
+ a->a_vals[ 0 ].bv_len = len;
+ AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 );
+ break;
+
+ case 2:
+ for ( i = 0; !BER_BVISNULL( &a->a_vals[ i ] ); i++ ) {
+ ch_free( a->a_vals[i].bv_val );
+ BER_BVZERO( &a->a_vals[ i ] );
+ }
+ bv.bv_val = buf;
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ LDAP_STAILQ_FOREACH( re, &slapd_rq.run_list, rnext ) {
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%s(%s)",
+ re->tname, re->tspec );
+ value_add_one( &a->a_vals, &bv );
+ }
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+
+ /* don't leave 'round attributes with no values */
+ if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
+ BER_BVSTR( &bv, "()" );
+ value_add_one( &a->a_vals, &bv );
+ }
+ break;
}
- a->a_vals[ 0 ].bv_len = len;
- AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 );
- return( 0 );
+ /* FIXME: touch modifyTimestamp? */
+
+ return SLAP_CB_CONTINUE;
}