/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2015 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/unistd.h>
#include "slap.h"
-#include "ldap_log.h"
-
-/* BSD seems to guarantee that this will be a macro, so... */
-#ifndef timersub
-# define timersub(a,b,res) do { \
- (res)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
- (res)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
- if ((res)->tv_usec < 0) { \
- --(res)->tv_sec; \
- (res)->tv_usec += 1000000; \
- } \
- } while (0)
-#endif
+
+#if SLAP_STATS_ETIME
+#define ETIME_SETUP \
+ struct timeval now; \
+ char timestr[64]; \
+ (void) gettimeofday( &now, NULL ); \
+ now.tv_sec -= op->o_time; \
+ now.tv_usec -= op->o_tincr; \
+ if ( now.tv_usec < 0 ) { \
+ --now.tv_sec; now.tv_usec += 1000000; \
+ } \
+ sprintf(timestr, "qtime=%d.%06d etime=%d.%06d", \
+ (int)op->o_qtime.tv_sec, (int)op->o_qtime.tv_usec, \
+ (int)now.tv_sec, (int)now.tv_usec);
+#define ETIME_LOGFMT "%s "
+#define StatslogEtime(lvl,fmt,pfx,tag,err,etxt,xtra) \
+ Statslog6(lvl,fmt,pfx,tag,err,timestr,etxt,xtra)
+#else
+#define ETIME_SETUP
+#define ETIME_LOGFMT ""
+#define StatslogEtime Statslog
+#endif /* SLAP_STATS_ETIME */
const struct berval slap_dummy_bv = BER_BVNULL;
}
if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
-#ifdef HAVE_GETTIMEOFDAY
- struct timeval now;
- struct timeval duration;
- time_t msec;
-
- (void) gettimeofday( &now, NULL );
- timersub( &now, &op->o_hr_time, &duration );
- msec = duration.tv_usec / 1000 + duration.tv_sec * 1000;
-
- Statslog6( LDAP_DEBUG_STATS,
- "%s DISCONNECT tag=%lu err=%d duration=%d.%03dms text=%s\n",
- op->o_log_prefix, rs->sr_tag, rs->sr_err,
- msec,
- duration.tv_usec % 1000,
- rs->sr_text ? rs->sr_text : "" );
-#else
- Statslog( LDAP_DEBUG_STATS,
- "%s DISCONNECT tag=%lu err=%d text=%s\n",
+ ETIME_SETUP;
+ StatslogEtime( LDAP_DEBUG_STATS,
+ "%s DISCONNECT tag=%lu err=%d "ETIME_LOGFMT"text=%s\n",
op->o_log_prefix, rs->sr_tag, rs->sr_err,
rs->sr_text ? rs->sr_text : "", 0 );
-#endif
}
}
}
if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
-
-#ifdef HAVE_GETTIMEOFDAY
- struct timeval now;
- struct timeval duration;
- time_t msec;
-
- (void) gettimeofday( &now, NULL );
- timersub( &now, &op->o_hr_time, &duration );
- msec = duration.tv_usec / 1000 + duration.tv_sec * 1000;
-
- if ( op->o_tag == LDAP_REQ_SEARCH ) {
- Statslog7( LDAP_DEBUG_STATS,
- "%s SEARCH RESULT tag=%lu err=%d duration=%d.%03dms nentries=%d text=%s\n",
- op->o_log_prefix,
- rs->sr_tag,
- rs->sr_err,
- msec,
- duration.tv_usec % 1000,
- rs->sr_nentries,
- rs->sr_text ? rs->sr_text : "");
- } else {
- Statslog6( LDAP_DEBUG_STATS,
- "%s RESULT tag=%lu err=%d duration=%d.%03dms text=%s\n",
- op->o_log_prefix,
- rs->sr_tag,
- rs->sr_err,
- msec,
- duration.tv_usec % 1000,
- rs->sr_text ? rs->sr_text : "");
- }
-#else
+ ETIME_SETUP;
if ( op->o_tag == LDAP_REQ_SEARCH ) {
- Statslog( LDAP_DEBUG_STATS,
- "%s SEARCH RESULT tag=%lu err=%d nentries=%d text=%s\n",
+ StatslogEtime( LDAP_DEBUG_STATS,
+ "%s SEARCH RESULT tag=%lu err=%d "ETIME_LOGFMT"nentries=%d text=%s\n",
op->o_log_prefix, rs->sr_tag, rs->sr_err,
rs->sr_nentries, rs->sr_text ? rs->sr_text : "" );
} else {
- Statslog( LDAP_DEBUG_STATS,
- "%s RESULT tag=%lu err=%d text=%s\n",
+ StatslogEtime( LDAP_DEBUG_STATS,
+ "%s RESULT tag=%lu err=%d "ETIME_LOGFMT"text=%s\n",
op->o_log_prefix, rs->sr_tag, rs->sr_err,
rs->sr_text ? rs->sr_text : "", 0 );
}
-#endif
}
if( tmp != NULL ) ch_free(tmp);
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
-#ifdef HAVE_GETTIMEOFDAY
- struct timeval now;
- struct timeval duration;
- time_t msec;
-
- (void) gettimeofday( &now, NULL );
- timersub( &now, &op->o_hr_time, &duration );
- msec = duration.tv_usec / 1000 + duration.tv_sec * 1000;
-
- Statslog6( LDAP_DEBUG_STATS,
- "%s RESULT tag=%lu err=%d duration=%d.%03dms text=%s\n",
- op->o_log_prefix, rs->sr_tag, rs->sr_err,
- msec,
- duration.tv_usec % 1000,
- rs->sr_text ? rs->sr_text : "" );
-#else
- Statslog( LDAP_DEBUG_STATS,
- "%s RESULT tag=%lu err=%d text=%s\n",
+ ETIME_SETUP;
+ StatslogEtime( LDAP_DEBUG_STATS,
+ "%s RESULT tag=%lu err=%d "ETIME_LOGFMT"text=%s\n",
op->o_log_prefix, rs->sr_tag, rs->sr_err,
rs->sr_text ? rs->sr_text : "", 0 );
-#endif
}
}
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
-#ifdef HAVE_GETTIMEOFDAY
- struct timeval now;
- struct timeval duration;
- time_t msec;
-
- (void) gettimeofday( &now, NULL );
- timersub( &now, &op->o_hr_time, &duration );
- msec = duration.tv_usec / 1000 + duration.tv_sec * 1000;
-
- Statslog6( LDAP_DEBUG_STATS,
- "%s RESULT oid=%s err=%d duration=%d.%03dms text=%s\n",
- op->o_log_prefix,
- rs->sr_rspoid ? rs->sr_rspoid : "",
- rs->sr_err,
- msec,
- duration.tv_usec % 1000,
- rs->sr_text ? rs->sr_text : "" );
-#else
- Statslog( LDAP_DEBUG_STATS,
- "%s RESULT oid=%s err=%d text=%s\n",
+ ETIME_SETUP;
+ StatslogEtime( LDAP_DEBUG_STATS,
+ "%s RESULT oid=%s err=%d "ETIME_LOGFMT"text=%s\n",
op->o_log_prefix, rs->sr_rspoid ? rs->sr_rspoid : "",
rs->sr_err, rs->sr_text ? rs->sr_text : "", 0 );
-#endif
}
}
projects / openldap / blobdiff