X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Ftime.c;h=b37a7dbda3045d8774bd596351ef9a4020b67dad;hb=7761c923bab53870802c287611b17bb906ce3a0b;hp=1c1bc4fad914b9e25aed31969cc8737e284100c5;hpb=702bdbf8f46811ae30f4eefbf05218adef35358a;p=openldap
diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index 1c1bc4fad9..b37a7dbda3 100644
--- a/servers/slapd/back-monitor/time.c
+++ b/servers/slapd/back-monitor/time.c
@@ -1,34 +1,22 @@
/* time.c - deal with time subsystem */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2011 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
+ * .
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
- *
- * 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"
@@ -37,263 +25,223 @@
#include
#include
+
#include "slap.h"
+#include
#include "proto-slap.h"
#include "back-monitor.h"
static int
-local_time( const struct tm *ztm, long delta, char *buf, size_t len );
+monitor_subsys_time_update(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e );
int
monitor_subsys_time_init(
- BackendDB *be
-)
+ BackendDB *be,
+ monitor_subsys_t *ms )
{
- struct monitorinfo *mi;
+ monitor_info_t *mi;
- Entry *e, *e_tmp, *e_time;
- struct monitorentrypriv *mp;
- char buf[1024], ztmbuf[20], ltmbuf[20];
- struct tm *ztm, *ltm;
+ Entry *e, **ep, *e_time;
+ monitor_entry_t *mp;
+ struct berval bv, value;
assert( be != NULL );
- mi = ( struct monitorinfo * )be->be_private;
+ ms->mss_update = monitor_subsys_time_update;
+
+ mi = ( monitor_info_t * )be->be_private;
if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn, &e_time ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_time_init: "
- "unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
-#else
+ &ms->mss_ndn, &e_time ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
- "unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
- e_tmp = NULL;
+ mp = ( monitor_entry_t * )e_time->e_private;
+ mp->mp_children = NULL;
+ ep = &mp->mp_children;
- /*
- * Start
- */
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ztm = gmtime( &starttime );
- strftime( ztmbuf, sizeof(ztmbuf), "%Y%m%d%H%M%SZ", ztm );
- ltm = localtime( &starttime );
- local_time( ltm, -timezone, ltmbuf, sizeof( ltmbuf ) );
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
- snprintf( buf, sizeof( buf ),
- "dn: cn=Start,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: Start\n"
- "description: %s\n"
- "description;lang-x-local: %s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- ztmbuf, ltmbuf );
-
- e = str2entry( buf );
+ BER_BVSTR( &bv, "cn=Start" );
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_time_init: "
- "unable to create entry 'cn=Start,%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
- "unable to create entry 'cn=Start,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to create entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
+ attr_merge_normalize_one( e, mi->mi_ad_monitorTimestamp,
+ &mi->mi_startTime, 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 = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_TIME];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_TIME].mss_flags \
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_time_init: "
- "unable to add entry 'cn=Start,%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
- "unable to add entry 'cn=Start,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to add entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
- e_tmp = e;
+ *ep = e;
+ ep = &mp->mp_next;
/*
* Current
*/
- snprintf( buf, sizeof( buf ),
- "dn: cn=Current,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: Current\n"
- "description: %s\n"
- "description;lang-x-local: %s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- ztmbuf, ltmbuf );
-
- e = str2entry( buf );
+ BER_BVSTR( &bv, "cn=Current" );
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
- "unable to create entry 'cn=Current,%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
-#else
+ "unable to create entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
+ attr_merge_normalize_one( e, mi->mi_ad_monitorTimestamp,
+ &mi->mi_startTime, 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_time_init: "
- "unable to create entry 'cn=Current,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to add entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ *ep = e;
+ ep = &mp->mp_next;
+
+ /*
+ * Uptime
+ */
+ BER_BVSTR( &bv, "cn=Uptime" );
+ 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_time_init: "
+ "unable to create entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
+ BER_BVSTR( &value, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
+ &value, NULL );
+
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_TIME];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_TIME].mss_flags \
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_time_init: "
- "unable to add entry 'cn=Current,%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
-#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
- "unable to add entry 'cn=Current,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to add entry \"%s,%s\"\n",
+ bv.bv_val, ms->mss_ndn.bv_val, 0 );
return( -1 );
}
- e_tmp = e;
-
- mp = ( struct monitorentrypriv * )e_time->e_private;
- mp->mp_children = e_tmp;
+ *ep = e;
+ ep = &mp->mp_next;
monitor_cache_release( mi, e_time );
return( 0 );
}
-int
+static int
monitor_subsys_time_update(
- struct monitorinfo *mi,
- Entry *e
-)
+ Operation *op,
+ SlapReply *rs,
+ Entry *e )
{
- char ztmbuf[20], ltmbuf[20];
- struct tm *ztm, *ltm;
- time_t currenttime;
- Attribute *a;
- static AttributeDescription *ad_local = NULL;
- const char *text = NULL;
- ber_len_t len;
-
- static int init_start = 0;
-
- assert( mi );
- assert( e );
-
- if ( init_start == 0 && strncmp( e->e_nname.bv_val, "cn=START",
- sizeof("cn=START")-1 ) == 0 ) {
- currenttime = starttime;
- init_start = 1;
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
+ static struct berval bv_current = BER_BVC( "cn=current" ),
+ bv_uptime = BER_BVC( "cn=uptime" );
+ struct berval rdn;
- } else if ( strncmp( e->e_nname.bv_val, "cn=CURRENT",
- sizeof("cn=CURRENT")-1 ) == 0 ) {
- currenttime = slap_get_time();
+ assert( mi != NULL );
+ assert( e != NULL );
- } else {
- return( 0 );
- }
+ dnRdn( &e->e_nname, &rdn );
+
+ if ( dn_match( &rdn, &bv_current ) ) {
+ struct tm tm;
+ char tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+ Attribute *a;
+ ber_len_t len;
+ time_t currtime;
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ztm = gmtime( ¤ttime );
- strftime( ztmbuf, sizeof( ztmbuf ), "%Y%m%d%H%M%SZ", ztm );
- ltm = localtime( ¤ttime );
- local_time( ltm, -timezone, ltmbuf, sizeof( ltmbuf ) );
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+ currtime = slap_get_time();
- a = attr_find( e->e_attrs, monitor_ad_desc );
- if ( a == NULL ) {
- return( -1 );
- }
+ ldap_pvt_gmtime( &currtime, &tm );
+ lutil_gentime( tmbuf, sizeof( tmbuf ), &tm );
- len = strlen( ztmbuf );
- assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, ztmbuf, len );
+ len = strlen( tmbuf );
- if ( ad_local == NULL ) {
- if ( slap_str2ad( "description;lang-x-local",
- &ad_local, &text ) != LDAP_SUCCESS ) {
- return( -1 );
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorTimestamp );
+ if ( a == NULL ) {
+ return rs->sr_err = LDAP_OTHER;
}
- }
- a = attr_find( e->e_attrs, ad_local );
- if ( a == NULL ) {
- return( -1 );
- }
- len = strlen( ltmbuf );
- assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, ltmbuf, len );
+ assert( len == a->a_vals[ 0 ].bv_len );
+ AC_MEMCPY( a->a_vals[ 0 ].bv_val, tmbuf, len );
- return( 0 );
-}
+ /* FIXME: touch modifyTimestamp? */
-/*
- * assumes gmtime_mutex is locked
- */
-static int
-local_time( const struct tm *ltm, long delta, char *buf, size_t len )
-{
- char *p;
+ } else if ( dn_match( &rdn, &bv_uptime ) ) {
+ Attribute *a;
+ double diff;
+ char buf[ BACKMONITOR_BUFSIZE ];
+ struct berval bv;
- if ( len < 20 ) {
- return -1;
- }
- strftime( buf, len, "%Y%m%d%H%M%S", ltm );
+ a = attr_find( e->e_attrs, mi->mi_ad_monitoredInfo );
+ if ( a == NULL ) {
+ return rs->sr_err = LDAP_OTHER;
+ }
- p = buf + 14;
+ diff = difftime( slap_get_time(), starttime );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%lu",
+ (unsigned long) diff );
+ bv.bv_val = buf;
- if ( delta < 0 ) {
- p[ 0 ] = '-';
- delta = -delta;
- } else {
- p[ 0 ] = '+';
+ ber_bvreplace( &a->a_vals[ 0 ], &bv );
+ if ( a->a_nvals != a->a_vals ) {
+ ber_bvreplace( &a->a_nvals[ 0 ], &bv );
+ }
+
+ /* FIXME: touch modifyTimestamp? */
}
- p++;
- snprintf( p, len - 15, "%02ld%02ld", delta / 3600, delta % 3600 );
-
- return 0;
+ return SLAP_CB_CONTINUE;
}