X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-monitor%2Ftime.c;h=f3450d8315dc4ec4e28e90f829cb355101a0e300;hb=93fbb87545fd670f93a758f1baf1a67f3c4803ea;hp=abc29e366a4624101b3a67fac7de97ee81a08638;hpb=aea52e5bc94fca809e4f5b19da5f9783c533469f;p=openldap

diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index abc29e366a..f3450d8315 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 <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2007 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"
@@ -37,298 +25,245 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include <lutil.h>
 
 #include "slap.h"
+#include <lutil.h>
 #include "proto-slap.h"
 #include "back-monitor.h"
 
-#ifdef HACK_LOCAL_TIME
 static int
-local_time( const struct tm *ztm, long delta, char *buf, size_t len );
-#endif /* HACK_LOCAL_TIME */
+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];
-	struct tm		*tms;
-	char			tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-
-	/*
-	 * Note: ltmbuf, ltm are used only if HACK_LOCAL_TIME is defined
-	 */
+	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, CRIT,
-			"monitor_subsys_time_init: "
-			"unable to get entry '%s'\n",
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
-#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 );
-#ifdef HACK_LOCAL_TIME
-	tms = localtime( &starttime );
-	local_time( tms, -timezone, tmbuf, sizeof( tmbuf ) );
-#else /* !HACK_LOCAL_TIME */
-	tms = gmtime( &starttime );
-	lutil_gentime( tmbuf, sizeof(tmbuf), tms );
-#endif /* !HACK_LOCAL_TIME */
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-	snprintf( buf, sizeof( buf ),
-			"dn: cn=Start,%s\n"
-			SLAPD_MONITOR_OBJECTCLASSES
-			"cn: Start\n"
-			"createTimestamp: %s", 
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
-			tmbuf );
-
-	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, CRIT,
-			"monitor_subsys_time_init: "
-			"unable to create entry 'cn=Start,%s'\n",
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
-#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, CRIT,
-			"monitor_subsys_time_init: "
-			"unable to add entry 'cn=Start,%s'\n",
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
-#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"
-			"createTimestamp: %s\n"
-			"modifyTimestamp: %s",
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
-			tmbuf, tmbuf );
-
-	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, 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, 0, 0 );
-#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, CRIT,
-			"monitor_subsys_time_init: "
-			"unable to add entry 'cn=Current,%s'\n",
-			monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
-#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		stmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ],
-			ctmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-	struct tm	*stm, *ctm;
-	Attribute	*a;
-	ber_len_t	len;
-
-	static int	init_start = 0, init_current = 0;
-#define ENTRY_TIME	0
-#define ENTRY_START	1
-#define ENTRY_CURRENT	2
-	int		entry = ENTRY_TIME;
-
-	assert( mi );
-	assert( e );
-	
-	if ( strncmp( e->e_nname.bv_val, "cn=start", 
-				sizeof("cn=start")-1 ) == 0 ) {
-		entry = ENTRY_START;
-		if ( init_start == 1 ) {
-			return( 0 );
-		}
+	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 ) {
-		entry = ENTRY_CURRENT;
-	}
+	assert( mi != NULL );
+	assert( e != NULL );
+
+	dnRdn( &e->e_nname, &rdn );
 	
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-	if ( init_start == 0 ) {
-#ifdef HACK_LOCAL_TIME
-		stm = localtime( &starttime );
-		local_time( stm, -timezone, stmbuf, sizeof( stmbuf ) );
-#else /* !HACK_LOCAL_TIME */
-		stm = gmtime( &starttime );
-		lutil_gentime( stmbuf, sizeof( stmbuf ), stm );
-#endif /* !HACK_LOCAL_TIME */
-	}
+	if ( dn_match( &rdn, &bv_current ) ) {
+		struct tm	*tm;
+#ifdef HAVE_GMTIME_R
+		struct tm	tm_buf;
+#endif
+		char		tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+		Attribute	*a;
+		ber_len_t	len;
+		time_t		currtime;
 
-	if ( entry == ENTRY_CURRENT ) {
-		time_t currentTime = slap_get_time();
+		currtime = slap_get_time();
+
+#ifndef HAVE_GMTIME_R
+		ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
 #ifdef HACK_LOCAL_TIME
-		ctm = localtime( &currentTime );
-		local_time( ctm, -timezone, ctmbuf, sizeof( ctmbuf ) );
+# ifdef HAVE_LOCALTIME_R
+		tm = localtime_r( &currtime, &tm_buf );
+# else
+		tm = localtime( &currtime );
+# endif /* HAVE_LOCALTIME_R */
+		lutil_localtime( tmbuf, sizeof( tmbuf ), tm, -timezone );
 #else /* !HACK_LOCAL_TIME */
-		ctm = gmtime( &currentTime );
-		lutil_gentime( ctmbuf, sizeof( ctmbuf ), ctm );
+# ifdef HAVE_GMTIME_R
+		tm = gmtime_r( &currtime, &tm_buf );
+# else
+		tm = gmtime( &currtime );
+# endif /* HAVE_GMTIME_R */
+		lutil_gentime( tmbuf, sizeof( tmbuf ), tm );
 #endif /* !HACK_LOCAL_TIME */
-	}
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#ifndef HAVE_GMTIME_R
+		ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
+
+		len = strlen( tmbuf );
 
-	if ( ( entry == ENTRY_START && init_start == 0 ) 
-			|| ( entry == ENTRY_CURRENT && init_current == 0 ) ) {
-		a = attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp );
+		a = attr_find( e->e_attrs, mi->mi_ad_monitorTimestamp );
 		if ( a == NULL ) {
-			return( -1 );
+			return rs->sr_err = LDAP_OTHER;
 		}
 
-		len = strlen( stmbuf );
-		assert( len == a->a_vals[0].bv_len );
-		AC_MEMCPY( a->a_vals[0].bv_val, stmbuf, len );
+		assert( len == a->a_vals[ 0 ].bv_len );
+		AC_MEMCPY( a->a_vals[ 0 ].bv_val, tmbuf, len );
 
-		if ( entry == ENTRY_START ) {
-			init_start = 1;
-		} else if ( entry == ENTRY_CURRENT ) {
-			init_current = 1;
-		}
-	}
+		/* FIXME: touch modifyTimestamp? */
 
-	if ( entry == ENTRY_CURRENT ) {
-		a = attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp );
+	} else if ( dn_match( &rdn, &bv_uptime ) ) {
+		Attribute	*a;
+		double		diff;
+		char		buf[ BACKMONITOR_BUFSIZE ];
+		struct berval	bv;
+
+		a = attr_find( e->e_attrs, mi->mi_ad_monitoredInfo );
 		if ( a == NULL ) {
-			return( -1 );
+			return rs->sr_err = LDAP_OTHER;
 		}
 
-		len = strlen( ctmbuf );
-		assert( len == a->a_vals[0].bv_len );
-		AC_MEMCPY( a->a_vals[0].bv_val, ctmbuf, len );
-	}
-
-	return( 0 );
-}
-
-#ifdef HACK_LOCAL_TIME
-/*
- * assumes gmtime_mutex is locked
- */
-static int
-local_time( const struct tm *ltm, long delta, char *buf, size_t len )
-{
-	char *p;
-
-	if ( len < 20 ) {
-		return -1;
-	}
-	strftime( buf, len, "%Y%m%d%H%M%S", ltm );
+		diff = difftime( slap_get_time(), starttime );
+		bv.bv_len = snprintf( buf, sizeof( buf ), "%lu",
+			(unsigned long) diff );
+		bv.bv_val = buf;
 
-	p = buf + 14;
+		ber_bvreplace( &a->a_vals[ 0 ], &bv );
+		if ( a->a_nvals != a->a_vals ) {
+			ber_bvreplace( &a->a_nvals[ 0 ], &bv );
+		}
 
-	if ( delta < 0 ) {
-		p[ 0 ] = '-';
-		delta = -delta;
-	} else {
-		p[ 0 ] = '+';
+		/* FIXME: touch modifyTimestamp? */
 	}
-	p++;
 
-	snprintf( p, len - 15, "%02ld%02ld", delta / 3600, delta % 3600 );
-	
-	return 0;
+	return SLAP_CB_CONTINUE;
 }
-#endif /* HACK_LOCAL_TIME */