/* 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-2004 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 <ac/string.h>
#include <ac/time.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 */
-
int
monitor_subsys_time_init(
BackendDB *be
Entry *e, *e_tmp, *e_time;
struct monitorentrypriv *mp;
- char buf[1024], ztmbuf[20];
- struct tm *ztm;
-#ifdef HACK_LOCAL_TIME
- struct tm *ltm;
- char ltmbuf[20];
-#endif
-
- /*
- * Note: ltmbuf, ltm are used only if HACK_LOCAL_TIME is defined
- */
+ char buf[ BACKMONITOR_BUFSIZE ];
assert( be != NULL );
if ( monitor_cache_get( mi,
&monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn, &e_time ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_time_init: "
"unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
e_tmp = NULL;
- /*
- * Start
- */
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ztm = gmtime( &starttime );
- strftime( ztmbuf, sizeof(ztmbuf), "%Y%m%d%H%M%SZ", ztm );
-#ifdef HACK_LOCAL_TIME
- ltm = localtime( &starttime );
- local_time( ltm, -timezone, ltmbuf, sizeof( ltmbuf ) );
-#endif /* HACK_LOCAL_TIME */
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
snprintf( buf, sizeof( buf ),
"dn: cn=Start,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
+ "objectClass: %s\n"
+ "structuralObjectClass: %s\n"
"cn: Start\n"
- "description: %s\n"
-#ifdef HACK_LOCAL_TIME
- "description;lang-x-local: %s"
-#endif /* HACK_LOCAL_TIME */
- , monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- ztmbuf
-#ifdef HACK_LOCAL_TIME
- , ltmbuf
-#endif /* HACK_LOCAL_TIME */
- );
+ "%s: %s\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ mi->mi_ad_monitorTimestamp->ad_cname.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ 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 ));
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ 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 ));
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
*/
snprintf( buf, sizeof( buf ),
"dn: cn=Current,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
+ "objectClass: %s\n"
+ "structuralObjectClass: %s\n"
"cn: Current\n"
- "description: %s\n"
-#ifdef HACK_LOCAL_TIME
- "description;lang-x-local: %s"
-#endif /* HACK_LOCAL_TIME */
- , monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- ztmbuf
-#ifdef HACK_LOCAL_TIME
- , ltmbuf
-#endif /* HACK_LOCAL_TIME */
- );
+ "%s: %s\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ mi->mi_oc_monitoredObject->soc_cname.bv_val,
+ mi->mi_ad_monitorTimestamp->ad_cname.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_time_init: "
"unable to create entry 'cn=Current,%s'\n",
- monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
#endif
return( -1 );
}
-
+
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
mp->mp_next = e_tmp;
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ 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 ));
+ monitor_subsys[SLAPD_MONITOR_TIME].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
int
monitor_subsys_time_update(
- struct monitorinfo *mi,
+ Operation *op,
Entry *e
)
{
- char ztmbuf[20];
- struct tm *ztm;
-#ifdef HACK_LOCAL_TIME
- char ltmbuf[20];
- struct tm *
-#endif /* HACK_LOCAL_TIME */
- time_t currenttime;
- Attribute *a;
-#ifdef HACK_LOCAL_TIME
- static AttributeDescription *ad_local = NULL;
- const char *text = NULL;
-#endif /* HACK_LOCAL_TIME */
- ber_len_t len;
-
- static int init_start = 0;
-
- /*
- * Note: ltmbuf, ltm, ad_local, text are used only if HACK_LOCAL_TIME
- * is defined
- */
+ struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
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;
+ if ( strncmp( e->e_nname.bv_val, "cn=current",
+ sizeof("cn=current") - 1 ) == 0 ) {
+ 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;
- } else if ( strncmp( e->e_nname.bv_val, "cn=CURRENT",
- sizeof("cn=CURRENT")-1 ) == 0 ) {
- currenttime = slap_get_time();
+ currtime = slap_get_time();
- } else {
- return( 0 );
- }
-
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ztm = gmtime( ¤ttime );
- strftime( ztmbuf, sizeof( ztmbuf ), "%Y%m%d%H%M%SZ", ztm );
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
#ifdef HACK_LOCAL_TIME
- ltm = localtime( ¤ttime );
- local_time( ltm, -timezone, ltmbuf, sizeof( ltmbuf ) );
-#endif /* HACK_LOCAL_TIME */
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
- a = attr_find( e->e_attrs, monitor_ad_desc );
- if ( a == NULL ) {
- return( -1 );
- }
+# 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 */
+# 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 */
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
- len = strlen( ztmbuf );
- assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, ztmbuf, len );
+ len = strlen( tmbuf );
-#ifdef HACK_LOCAL_TIME
- if ( ad_local == NULL ) {
- if ( slap_str2ad( "description;lang-x-local",
- &ad_local, &text ) != LDAP_SUCCESS ) {
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorTimestamp );
+ if ( a == NULL ) {
return( -1 );
}
- }
- 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 );
-#endif /* HACK_LOCAL_TIME */
- 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;
+ assert( len == a->a_vals[0].bv_len );
+ AC_MEMCPY( a->a_vals[0].bv_val, tmbuf, len );
}
- strftime( buf, len, "%Y%m%d%H%M%S", ltm );
- p = buf + 14;
-
- if ( delta < 0 ) {
- p[ 0 ] = '-';
- delta = -delta;
- } else {
- p[ 0 ] = '+';
- }
- p++;
-
- snprintf( p, len - 15, "%02ld%02ld", delta / 3600, delta % 3600 );
-
- return 0;
+ return( 0 );
}
-#endif /* HACK_LOCAL_TIME */
projects / openldap / blobdiff