]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-monitor/thread.c
don't leak callbacks if stuff cannot be registered; provide a means to dispose of...
[openldap] / servers / slapd / back-monitor / thread.c
index 36d7d6132f3bad71c18a03877229e1834cbdfddb..3a476cc0d8d2b4d5780fb2971f1c1daa6a0a335c 100644 (file)
 /* 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>
+
+#ifndef NO_THREADS
+typedef enum {
+       MT_UNKNOWN,
+       MT_RUNQUEUE,
+       MT_TASKLIST,
+
+       MT_LAST
+} monitor_thread_t;
+
+static struct {
+       struct berval                   rdn;
+       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 },
+#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 },
+#endif
+       { BER_BVC( "cn=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_BVNULL }
+};
+
+static int 
+monitor_subsys_thread_update( 
+       Operation               *op,
+       SlapReply               *rs,
+       Entry                   *e );
+#endif /* ! NO_THREADS */
+
 /*
- * initializes log subentry
-*   */
+ * initializes log subentry
+ */
 int
 monitor_subsys_thread_init(
-       BackendDB       *be
-)
+       BackendDB               *be,
+       monitor_subsys_t        *ms )
 {
-       struct monitorinfo      *mi;
-       Entry                   *e;
-       struct berval           bv[2];
-       static char             buf[1024];
-
-       mi = ( struct monitorinfo * )be->be_private;
-
-       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
+#ifndef NO_THREADS
+       monitor_info_t  *mi;
+       monitor_entry_t *mp;
+       Entry           *e, **ep, *e_thread;
+       int             i;
+
+       ms->mss_update = monitor_subsys_thread_update;
+
+       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;
 
-       bv[1].bv_val = NULL;
-       bv[0].bv_val = buf;
-       bv[0].bv_len = strlen( bv[0].bv_val );
+       for ( i = 0; !BER_BVISNULL( &mt[ i ].rdn ); i++ ) {
+               static char     buf[ BACKMONITOR_BUFSIZE ];
+               int             count = -1;
+               char            *state = NULL;
+               struct berval   bv = BER_BVNULL;
+
+               /*
+                * Max
+                */
+               e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn,
+                       &mt[ i ].rdn,
+                       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",
+                               mt[ i ].rdn.bv_val,
+                               ms->mss_ndn.bv_val, 0 );
+                       return( -1 );
+               }
 
-       attr_mergeit( e, monitor_ad_desc, bv );
+               /* NOTE: reference to the normalized DN of the entry,
+                * under the assumption it's not modified */
+               dnRdn( &e->e_nname, &mt[ i ].nrdn );
 
-       monitor_cache_release( mi, e );
+               switch ( mt[ i ].param ) {
+               case LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN:
+                       break;
+
+               case LDAP_PVT_THREAD_POOL_PARAM_STATE:
+                       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:
+                       /* 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 );
+                       break;
+               }
+
+               if ( !BER_BVISNULL( &bv ) ) {
+                       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 \"%s,%s\"\n",
+                               mt[ i ].rdn.bv_val,
+                               ms->mss_ndn.bv_val, 0 );
+                       return( -1 );
+               }
+       
+               *ep = e;
+               ep = &mp->mp_next;
+       }
+
+       monitor_cache_release( mi, e_thread );
+
+#endif /* ! NO_THREADS */
        return( 0 );
 }
 
-int 
+#ifndef NO_THREADS
+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           bv[2], *b = NULL;
-       char                    buf[1024];
+       BerVarray               vals = NULL;
+       char                    buf[ BACKMONITOR_BUFSIZE ];
+       struct berval           rdn, bv;
+       int                     which, i;
+       struct re_s             *re;
+       int                     count = -1;
+       char                    *state = NULL;
+
+       assert( mi != NULL );
+
+       dnRdn( &e->e_nname, &rdn );
+
+       for ( i = 0; !BER_BVISNULL( &mt[ i ].nrdn ); i++ ) {
+               if ( dn_match( &mt[ i ].nrdn, &rdn ) ) {
+                       break;
+               }
+       }
+
+       which = i;
+       if ( BER_BVISNULL( &mt[ which ].nrdn ) ) {
+               return SLAP_CB_CONTINUE;
+       }
+
+       a = attr_find( e->e_attrs, mi->mi_ad_monitoredInfo );
+
+       switch ( mt[ which ].param ) {
+       case LDAP_PVT_THREAD_POOL_PARAM_UNKNOWN:
+               switch ( mt[ which ].mt ) {
+               case MT_RUNQUEUE:
+                       if ( a != NULL ) {
+                               if ( a->a_nvals != a->a_vals ) {
+                                       ber_bvarray_free( a->a_nvals );
+                               }
+                               ber_bvarray_free( a->a_vals );
+                               a->a_vals = NULL;
+                               a->a_nvals = NULL;
+                       }
 
-       bv[1].bv_val = NULL;
+                       i = 0;
+                       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 ), "{%d}%s(%s)",
+                                       i, re->tname, re->tspec );
+                               if ( bv.bv_len < sizeof( buf ) ) {
+                                       value_add_one( &vals, &bv );
+                               }
+                               i++;
+                       }
+                       ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+       
+                       if ( vals ) {
+                               attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
+                               ber_bvarray_free( vals );
+                       }
+                       break;
 
-       snprintf( buf, sizeof( buf ), "backload=%d", 
-                       ldap_pvt_thread_pool_backload( &connection_pool ) );
+               case MT_TASKLIST:
+                       if ( a != NULL ) {
+                               if ( a->a_nvals != a->a_vals ) {
+                                       ber_bvarray_free( a->a_nvals );
+                               }
+                               ber_bvarray_free( a->a_vals );
+                               a->a_vals = NULL;
+                               a->a_nvals = NULL;
+                       }
+       
+                       i = 0;
+                       bv.bv_val = buf;
+                       ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+                       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( &vals, &bv );
+                               }
+                               i++;
+                       }
+                       ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+       
+                       if ( vals ) {
+                               attr_merge_normalize( e, mi->mi_ad_monitoredInfo, vals, NULL );
+                               ber_bvarray_free( vals );
+                       }
+                       break;
 
-       if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) {
+               default:
+                       assert( 0 );
+               }
+               break;
 
-               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;
+       case LDAP_PVT_THREAD_POOL_PARAM_STATE:
+               if ( a == NULL ) {
+                       return rs->sr_err = LDAP_OTHER;
+               }
+               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;
+               }
+               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 );
                        }
                }
+               break;
        }
 
-       if ( b == NULL || b[0].bv_val == NULL ) {
-               bv[0].bv_val = buf;
-               bv[0].bv_len = strlen( buf );
-               attr_mergeit( e, monitor_ad_desc, bv );
-       }
+       /* FIXME: touch modifyTimestamp? */
 
-       return( 0 );
+       return SLAP_CB_CONTINUE;
 }
-
+#endif /* ! NO_THREADS */