X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Ftime.c;h=a015cdfc9bd0328988adcdc515459c6b3b83b457;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=9f7dc7c325ced62d13aa2ed344957331616ccbb3;hpb=be8820d660c24532fc18e106b76572591c1485fa;p=openldap
diff --git a/servers/slapd/back-monitor/time.c b/servers/slapd/back-monitor/time.c
index 9f7dc7c325..a015cdfc9b 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-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
*/
-/*
- * 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"
@@ -43,11 +31,6 @@
#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
@@ -57,13 +40,7 @@ monitor_subsys_time_init(
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
- */
+ char buf[ BACKMONITOR_BUFSIZE ];
assert( be != NULL );
@@ -88,28 +65,21 @@ monitor_subsys_time_init(
e_tmp = NULL;
- /*
- * 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"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Start\n"
- "createTimestamp: %s",
+ "%s: %s\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- tmbuf );
+ 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 ) {
@@ -162,12 +132,16 @@ monitor_subsys_time_init(
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Current\n"
+ "%s: %s\n"
"createTimestamp: %s\n"
"modifyTimestamp: %s\n",
monitor_subsys[SLAPD_MONITOR_TIME].mss_dn.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- mi->oc_monitoredObject->soc_cname.bv_val,
- tmbuf, tmbuf );
+ 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 ) {
@@ -227,115 +201,56 @@ monitor_subsys_time_update(
)
{
struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
- 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 );
- }
+ 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 ) {
- entry = ENTRY_CURRENT;
- }
-
- 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 */
- }
+ currtime = slap_get_time();
- if ( entry == ENTRY_CURRENT ) {
- time_t currentTime = slap_get_time();
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
#ifdef HACK_LOCAL_TIME
- ctm = localtime( ¤tTime );
- 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( ¤tTime );
- 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 );
-
- if ( ( entry == ENTRY_START && init_start == 0 )
- || ( entry == ENTRY_CURRENT && init_current == 0 ) ) {
- a = attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp );
- if ( a == NULL ) {
- return( -1 );
- }
-
- len = strlen( stmbuf );
- assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, stmbuf, len );
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
- if ( entry == ENTRY_START ) {
- init_start = 1;
- } else if ( entry == ENTRY_CURRENT ) {
- init_current = 1;
- }
- }
+ len = strlen( tmbuf );
- if ( entry == ENTRY_CURRENT ) {
- a = attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp );
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorTimestamp );
if ( a == NULL ) {
return( -1 );
}
- len = strlen( ctmbuf );
assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, ctmbuf, len );
+ AC_MEMCPY( a->a_vals[0].bv_val, tmbuf, 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 );
-
- 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;
-}
-#endif /* HACK_LOCAL_TIME */
-