/* thread.c - deal with thread subsystem */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- *
- * This work has beed deveolped for the OpenLDAP Foundation
- * in the hope that it may be useful to the Open Source community,
- * but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
#include <stdio.h>
+#include <ac/string.h>
#include "slap.h"
#include "back-monitor.h"
+#include <ldap_rq.h>
+
+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;
- Entry *e;
- static char buf[1024];
- struct berval bv;
+ 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 ) )
- {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_thread_init: unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
-#else
+ 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,
+ "monitor_subsys_thread_init: unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val,
0, 0 );
-#endif
return( -1 );
}
- /* initialize the thread number */
- snprintf( buf, sizeof( buf ), "max=%d", connection_pool_max );
+ mp = ( monitor_entry_t * )e_thread->e_private;
+ mp->mp_children = NULL;
+ ep = &mp->mp_children;
+ /*
+ * Max
+ */
+ 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",
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%d", connection_pool_max );
bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
+ 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=Max,%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
+
+ *ep = e;
+ ep = &mp->mp_next;
+
+ /*
+ * Backload
+ */
+ 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",
+ 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=Backload,%s\"\n",
+ 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 );
+ }
+
+ *ep = e;
+ ep = &mp->mp_next;
- attr_merge_one( e, monitor_ad_desc, &bv, NULL );
+ /*
+ * Tasklist
+ */
+ BER_BVSTR( &bv, "cn=Tasklist" );
+ 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 \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
+ BER_BVSTR( &bv, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
- monitor_cache_release( mi, e );
+ 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 \"%s\"\n",
+ e->e_name.bv_val, 0, 0 );
+ return( -1 );
+ }
+
+ *ep = e;
+ ep = &mp->mp_next;
+
+ monitor_cache_release( mi, e_thread );
return( 0 );
}
-int
+static int
monitor_subsys_thread_update(
- struct monitorinfo *mi,
- Entry *e
-)
+ Operation *op,
+ SlapReply *rs,
+ Entry *e )
{
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
Attribute *a;
- struct berval *b = NULL;
- char buf[1024];
+ char buf[ BACKMONITOR_BUFSIZE ];
+ enum {
+ MT_UNKNOWN,
+ MT_BACKLOAD,
+ MT_RUNQUEUE,
+ MT_TASKLIST,
+ MT_MAX /* unused */
+ };
+ static slap_verbmasks mt[] = {
+ { BER_BVC( "cn=backload" ), MT_BACKLOAD },
+ { BER_BVC( "cn=runqueue" ), MT_RUNQUEUE },
+ { BER_BVC( "cn=tasklist" ), MT_TASKLIST },
+ { BER_BVC( "cn=max" ), MT_UNKNOWN },
+ { BER_BVNULL, MT_UNKNOWN }
+ };
+ struct berval rdn, bv;
+ ber_len_t len;
+ int which, i;
+ struct re_s *re;
- snprintf( buf, sizeof( buf ), "backload=%d",
- ldap_pvt_thread_pool_backload( &connection_pool ) );
+ assert( mi != NULL );
+
+ dnRdn( &e->e_nname, &rdn );
+
+ which = bverb_to_mask( &rdn, mt );
+ if ( BER_BVISNULL( &mt[ which ].word )
+ || mt[ which ].mask == MT_UNKNOWN )
+ {
+ return SLAP_CB_CONTINUE;
+ }
- if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) {
+ a = attr_find( e->e_attrs, mi->mi_ad_monitoredInfo );
+ if ( a == NULL ) {
+ return rs->sr_err = LDAP_OTHER;
+ }
- for ( b = a->a_vals; b[0].bv_val != NULL; b++ ) {
- if ( strncmp( b[0].bv_val, "backload=",
- sizeof( "backload=" ) - 1 ) == 0 ) {
- free( b[0].bv_val );
- ber_str2bv( buf, 0, 1, &b[0] );
- break;
+ switch ( mt[ which ].mask ) {
+ case MT_BACKLOAD:
+ 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 MT_RUNQUEUE:
+ for ( i = 0; !BER_BVISNULL( &a->a_vals[ i ] ); i++ ) {
+ ch_free( a->a_vals[ i ].bv_val );
+ BER_BVZERO( &a->a_vals[ i ] );
+ }
+ if ( a->a_nvals != a->a_vals ) {
+ ber_bvarray_free( a->a_nvals );
+ }
+ a->a_nvals = NULL;
+ bv.bv_val = buf;
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ i = 0;
+ LDAP_STAILQ_FOREACH( re, &slapd_rq.run_list, rnext ) {
+ bv.bv_len = snprintf( buf, sizeof( buf ), "{%d}%s(%s)",
+ i, re->tname, re->tspec );
+ if ( bv.bv_len < sizeof( buf ) ) {
+ value_add_one( &a->a_vals, &bv );
}
+ i++;
}
- }
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
- if ( b == NULL || b[0].bv_val == NULL ) {
- struct berval bv;
+ /* don't leave 'round attributes with no values */
+ if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
+ BER_BVSTR( &bv, "{0}()" );
+ value_add_one( &a->a_vals, &bv );
+ }
+ a->a_nvals = a->a_vals;
+ break;
+ case MT_TASKLIST:
+ for ( i = 0; !BER_BVISNULL( &a->a_vals[ i ] ); i++ ) {
+ ch_free( a->a_vals[ i ].bv_val );
+ BER_BVZERO( &a->a_vals[ i ] );
+ }
+ if ( a->a_nvals != a->a_vals ) {
+ ber_bvarray_free( a->a_nvals );
+ }
+ a->a_nvals = NULL;
bv.bv_val = buf;
- bv.bv_len = strlen( buf );
- attr_merge_one( e, monitor_ad_desc, &bv, NULL );
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ i = 0;
+ LDAP_STAILQ_FOREACH( re, &slapd_rq.task_list, tnext ) {
+ bv.bv_len = snprintf( buf, sizeof( buf ), "{%d}%s(%s)",
+ i, re->tname, re->tspec );
+ if ( bv.bv_len < sizeof( buf ) ) {
+ value_add_one( &a->a_vals, &bv );
+ }
+ i++;
+ }
+ 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, "{0}()" );
+ value_add_one( &a->a_vals, &bv );
+ }
+ a->a_nvals = a->a_vals;
+ break;
}
- return( 0 );
+ /* FIXME: touch modifyTimestamp? */
+
+ return SLAP_CB_CONTINUE;
}
projects / openldap / blobdiff