Fix its6794 test

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 1d83ffd4b29b79533a5bd6d2942200afad9413aa..f68a6255ae245b923c4a697a80c27bb70b79b2bb 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,7 @@
 #endif
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
-static time_t last_time;
-static int last_incr;
+static struct timeval last_time;
 
 void slap_op_init(void)
 {
@@ -159,16 +158,31 @@ slap_op_free( Operation *op, void *ctx )
 void
 slap_op_time(time_t *t, int *nop)
 {
-       *t = slap_get_time();
+       struct timeval tv;
+#if SLAP_STATS_ETIME
+       gettimeofday( &tv, NULL );
+#else
+       tv.tv_sec = slap_get_time();
+       tv.tv_usec = 0;
+#endif
        ldap_pvt_thread_mutex_lock( &slap_op_mutex );
-       if ( *t == last_time ) {
-               *nop = ++last_incr;
-       } else {
-               last_time = *t;
-               last_incr = 0;
-               *nop = 0;
+       /* Usually tv.tv_sec cannot be < last_time.tv_sec
+        * but it might happen if we wrapped around tv_usec.
+        */
+       if ( tv.tv_sec <= last_time.tv_sec &&
+               tv.tv_usec <= last_time.tv_usec ) {
+               tv.tv_sec = last_time.tv_sec;
+               tv.tv_usec = last_time.tv_usec + 1;
+       }
+       if (tv.tv_usec >= 1000000) {
+               tv.tv_usec -= 1000000;
+               tv.tv_sec++;
+               last_time.tv_sec = tv.tv_sec;
        }
+       last_time.tv_usec = tv.tv_usec;
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
+       *t = tv.tv_sec;
+       *nop = tv.tv_usec;
 }
 
 Operation *