X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fthread.c;h=e432d20c04e1b1d890ba1d1e44515d56b37878cc;hb=48685b7962e9c365752a7eaeaeda9785cdee7946;hp=a7dbb5920a62344667c52d5a3d92879ab3a5ad39;hpb=67f3fd8078a19fbe621285ee0dbf94012e54408e;p=openldap
diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index a7dbb5920a..e432d20c04 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-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2012 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
@@ -29,12 +29,7 @@
#include
-static int
-monitor_subsys_thread_update(
- Operation *op,
- SlapReply *rs,
- Entry *e );
-
+#ifndef NO_THREADS
typedef enum {
MT_UNKNOWN,
MT_RUNQUEUE,
@@ -45,39 +40,73 @@ typedef enum {
static struct {
struct berval rdn;
+ struct berval desc;
struct berval nrdn;
ldap_pvt_thread_pool_param_t param;
monitor_thread_t mt;
} mt[] = {
- { BER_BVC( "cn=Max" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_MAX, MT_UNKNOWN },
- { BER_BVC( "cn=Max Pending" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_MAX_PENDING, MT_UNKNOWN },
- { BER_BVC( "cn=Open" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_OPEN, MT_UNKNOWN },
- { BER_BVC( "cn=Starting" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_STARTING, MT_UNKNOWN },
- { BER_BVC( "cn=Active" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_ACTIVE, MT_UNKNOWN },
- { BER_BVC( "cn=Pending" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_PENDING, MT_UNKNOWN },
- { BER_BVC( "cn=Backload" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD, MT_UNKNOWN },
+ { BER_BVC( "cn=Max" ),
+ BER_BVC("Maximum number of threads as configured"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_MAX, MT_UNKNOWN },
+ { BER_BVC( "cn=Max Pending" ),
+ BER_BVC("Maximum number of pending threads"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_MAX_PENDING, MT_UNKNOWN },
+ { BER_BVC( "cn=Open" ),
+ BER_BVC("Number of open threads"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_OPEN, MT_UNKNOWN },
+ { BER_BVC( "cn=Starting" ),
+ BER_BVC("Number of threads being started"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_STARTING, MT_UNKNOWN },
+ { BER_BVC( "cn=Active" ),
+ BER_BVC("Number of active threads"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_ACTIVE, MT_UNKNOWN },
+ { BER_BVC( "cn=Pending" ),
+ BER_BVC("Number of pending threads"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_PENDING, MT_UNKNOWN },
+ { BER_BVC( "cn=Backload" ),
+ BER_BVC("Number of active plus pending threads"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD, MT_UNKNOWN },
#if 0 /* not meaningful right now */
- { BER_BVC( "cn=Active Max" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_ACTIVE_MAX, MT_UNKNOWN },
- { BER_BVC( "cn=Pending Max" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_PENDING_MAX, MT_UNKNOWN },
- { BER_BVC( "cn=Backload Max" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD_MAX,MT_UNKNOWN },
+ { BER_BVC( "cn=Active Max" ),
+ BER_BVNULL,
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_ACTIVE_MAX, MT_UNKNOWN },
+ { BER_BVC( "cn=Pending Max" ),
+ BER_BVNULL,
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_PENDING_MAX, MT_UNKNOWN },
+ { BER_BVC( "cn=Backload Max" ),
+ BER_BVNULL,
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD_MAX,MT_UNKNOWN },
#endif
- { BER_BVC( "cn=State" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_STATE, MT_UNKNOWN },
+ { BER_BVC( "cn=State" ),
+ BER_BVC("Thread pool state"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_STATE, MT_UNKNOWN },
- { BER_BVC( "cn=Runqueue" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN, MT_RUNQUEUE },
- { BER_BVC( "cn=Tasklist" ), BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN, MT_TASKLIST },
+ { BER_BVC( "cn=Runqueue" ),
+ BER_BVC("Queue of running threads - besides those handling operations"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN, MT_RUNQUEUE },
+ { BER_BVC( "cn=Tasklist" ),
+ BER_BVC("List of running plus standby threads - besides those handling operations"),
+ BER_BVNULL, LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN, MT_TASKLIST },
{ BER_BVNULL }
};
+static int
+monitor_subsys_thread_update(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e );
+#endif /* ! NO_THREADS */
+
/*
* initializes log subentry
*/
int
monitor_subsys_thread_init(
BackendDB *be,
- monitor_subsys_t *ms
-)
+ monitor_subsys_t *ms )
{
+#ifndef NO_THREADS
monitor_info_t *mi;
monitor_entry_t *mp;
Entry *e, **ep, *e_thread;
@@ -90,7 +119,7 @@ monitor_subsys_thread_init(
if ( monitor_cache_get( mi, &ms->mss_ndn, &e_thread ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: unable to get entry \"%s\"\n",
- ms->mss_ndn.bv_val,
+ ms->mss_dn.bv_val,
0, 0 );
return( -1 );
}
@@ -110,7 +139,7 @@ monitor_subsys_thread_init(
*/
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn,
&mt[ i ].rdn,
- mi->mi_oc_monitoredObject, mi, NULL, NULL );
+ mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "
@@ -129,13 +158,19 @@ monitor_subsys_thread_init(
break;
case LDAP_PVT_THREAD_POOL_PARAM_STATE:
- ldap_pvt_thread_pool_query( &connection_pool,
- mt[ i ].param, (void *)&state );
- ber_str2bv( state, 0, 0, &bv );
+ if ( ldap_pvt_thread_pool_query( &connection_pool,
+ mt[ i ].param, (void *)&state ) == 0 )
+ {
+ ber_str2bv( state, 0, 0, &bv );
+
+ } else {
+ BER_BVSTR( &bv, "unknown" );
+ }
break;
default:
- ldap_pvt_thread_pool_query( &connection_pool,
+ /* NOTE: in case of error, it'll be set to -1 */
+ (void)ldap_pvt_thread_pool_query( &connection_pool,
mt[ i ].param, (void *)&count );
bv.bv_val = buf;
bv.bv_len = snprintf( buf, sizeof( buf ), "%d", count );
@@ -145,6 +180,12 @@ monitor_subsys_thread_init(
if ( !BER_BVISNULL( &bv ) ) {
attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
}
+
+ if ( !BER_BVISNULL( &mt[ i ].desc ) ) {
+ attr_merge_normalize_one( e,
+ slap_schema.si_ad_description,
+ &mt[ i ].desc, NULL );
+ }
mp = monitor_entrypriv_create();
if ( mp == NULL ) {
@@ -160,7 +201,7 @@ monitor_subsys_thread_init(
"monitor_subsys_thread_init: "
"unable to add entry \"%s,%s\"\n",
mt[ i ].rdn.bv_val,
- ms->mss_ndn.bv_val, 0 );
+ ms->mss_dn.bv_val, 0 );
return( -1 );
}
@@ -170,9 +211,11 @@ monitor_subsys_thread_init(
monitor_cache_release( mi, e_thread );
+#endif /* ! NO_THREADS */
return( 0 );
}
+#ifndef NO_THREADS
static int
monitor_subsys_thread_update(
Operation *op,
@@ -195,11 +238,11 @@ monitor_subsys_thread_update(
for ( i = 0; !BER_BVISNULL( &mt[ i ].nrdn ); i++ ) {
if ( dn_match( &mt[ i ].nrdn, &rdn ) ) {
- which = i;
break;
}
}
+ which = i;
if ( BER_BVISNULL( &mt[ which ].nrdn ) ) {
return SLAP_CB_CONTINUE;
}
@@ -217,6 +260,7 @@ monitor_subsys_thread_update(
ber_bvarray_free( a->a_vals );
a->a_vals = NULL;
a->a_nvals = NULL;
+ a->a_numvals = 0;
}
i = 0;
@@ -235,6 +279,9 @@ monitor_subsys_thread_update(
if ( vals ) {
attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
ber_bvarray_free( vals );
+
+ } else {
+ attr_delete( &e->e_attrs, mi->mi_ad_monitoredInfo );
}
break;
@@ -246,6 +293,7 @@ monitor_subsys_thread_update(
ber_bvarray_free( a->a_vals );
a->a_vals = NULL;
a->a_nvals = NULL;
+ a->a_numvals = 0;
}
i = 0;
@@ -264,6 +312,9 @@ monitor_subsys_thread_update(
if ( vals ) {
attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
ber_bvarray_free( vals );
+
+ } else {
+ attr_delete( &e->e_attrs, mi->mi_ad_monitoredInfo );
}
break;
@@ -276,25 +327,27 @@ monitor_subsys_thread_update(
if ( a == NULL ) {
return rs->sr_err = LDAP_OTHER;
}
- ldap_pvt_thread_pool_query( &connection_pool,
- mt[ i ].param, (void *)&state );
- ber_str2bv( state, 0, 0, &bv );
- ber_bvreplace( &a->a_vals[ 0 ], &bv );
+ if ( ldap_pvt_thread_pool_query( &connection_pool,
+ mt[ i ].param, (void *)&state ) == 0 )
+ {
+ ber_str2bv( state, 0, 0, &bv );
+ ber_bvreplace( &a->a_vals[ 0 ], &bv );
+ }
break;
default:
if ( a == NULL ) {
return rs->sr_err = LDAP_OTHER;
}
- ldap_pvt_thread_pool_query( &connection_pool,
- mt[ i ].param, (void *)&count );
- bv.bv_val = buf;
- bv.bv_len = snprintf( buf, sizeof( buf ), "%d", count );
- if ( bv.bv_len >= sizeof( buf ) ) {
- /* FIXME? */
- break;
+ if ( ldap_pvt_thread_pool_query( &connection_pool,
+ mt[ i ].param, (void *)&count ) == 0 )
+ {
+ bv.bv_val = buf;
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%d", count );
+ if ( bv.bv_len < sizeof( buf ) ) {
+ ber_bvreplace( &a->a_vals[ 0 ], &bv );
+ }
}
- ber_bvreplace( &a->a_vals[ 0 ], &bv );
break;
}
@@ -302,4 +355,4 @@ monitor_subsys_thread_update(
return SLAP_CB_CONTINUE;
}
-
+#endif /* ! NO_THREADS */