From 253f8336a0fab3ceb7740b8480198269f5e1701e Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 7 Jul 2004 00:34:49 +0000 Subject: [PATCH] * k5-thread.h: Use K5_THREAD_H for multiple inclusion protection. (k5_debug_mutex_stats, k5_mutex_init_stats, k5_mutex_finish_init_stats, K5_MUTEX_STATS_INIT): Add some dummy support for recording statistics on how long mutexes are held, etc. Incomplete implementation started, but code not enabled. (k5_mutex_t): Add statistics field. (K5_MUTEX_PARTIAL_INITIALIZER, k5_mutex_init_1, k5_mutex_init): Initialize it. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16550 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 9 ++++++ src/include/k5-thread.h | 68 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index cbd6379b0..4bee9f7af 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,5 +1,14 @@ 2004-07-06 Ken Raeburn + * k5-thread.h: Use K5_THREAD_H for multiple inclusion protection. + (k5_debug_mutex_stats, k5_mutex_init_stats, + k5_mutex_finish_init_stats, K5_MUTEX_STATS_INIT): Add some dummy + support for recording statistics on how long mutexes are held, + etc. Incomplete implementation started, but code not enabled. + (k5_mutex_t): Add statistics field. + (K5_MUTEX_PARTIAL_INITIALIZER, k5_mutex_init_1, k5_mutex_init): + Initialize it. + * configure.in: Check for getpwuid_r. 2004-07-02 Ken Raeburn diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h index 3619472a9..07dae107d 100644 --- a/src/include/k5-thread.h +++ b/src/include/k5-thread.h @@ -27,7 +27,8 @@ * Preliminary thread support. */ -#ifndef k5_mutex_init /* handle multiple inclusion */ +#ifndef K5_THREAD_H +#define K5_THREAD_H #include "autoconf.h" @@ -142,6 +143,7 @@ #define DEBUG_THREADS #define DEBUG_THREADS_LOC +#undef DEBUG_THREADS_STATS #include @@ -174,6 +176,58 @@ typedef char k5_debug_loc; +/* Statistics gathering: + + Currently incomplete, don't try enabling it. + + Eventually: Report number of times locked, total and standard + deviation of the time the lock was held, total and std dev time + spent waiting for the lock. "Report" will probably mean "write a + line to a file if a magic environment variable is set." */ + +#ifdef DEBUG_THREADS_STATS + +#if HAVE_TIME_H && (!defined(HAVE_SYS_TIME_H) || defined(TIME_WITH_SYS_TIME)) +# include +#endif +#if HAVE_SYS_TIME_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#include +typedef uint64_t k5_debug_timediff_t; +typedef struct timeval k5_debug_time_t; +static inline k5_debug_timediff_t +timediff(k5_debug_time_t t2, k5_debug_time_t t1) +{ + return (t2.tv_sec - t1.tv_sec) * 1000000 + (t2.tv_usec - t1.tv_usec); +} +struct k5_timediff_stats { + k5_debug_timediff_t valmin, valmax, valsum, valsqsum; +}; +typedef struct { + int count; + k5_debug_time_t time_acquired, time_created; + struct k5_timediff_stats lockwait, lockheld; +} k5_debug_mutex_stats; +#define k5_mutex_init_stats(S) \ + (memset((S), 0, sizeof(struct k5_debug_mutex_stats)), 0) +#define k5_mutex_finish_init_stats(S) (0) +#define K5_MUTEX_STATS_INIT { 0, {0}, {0}, {0}, {0} } + +#else + +typedef char k5_debug_mutex_stats; +#define k5_mutex_init_stats(S) (*(S) = 's', 0) +#define k5_mutex_finish_init_stats(S) (0) +#define K5_MUTEX_STATS_INIT 's' + +#endif + + + /* Define the OS mutex bit. */ /* First, if we're not actually doing multiple threads, do we @@ -424,15 +478,18 @@ typedef struct { typedef struct { k5_debug_loc loc_last, loc_created; k5_os_mutex os; + k5_debug_mutex_stats stats; } k5_mutex_t; #define K5_MUTEX_PARTIAL_INITIALIZER \ { K5_DEBUG_LOC_INIT, K5_DEBUG_LOC_INIT, \ - K5_OS_MUTEX_PARTIAL_INITIALIZER } + K5_OS_MUTEX_PARTIAL_INITIALIZER, K5_MUTEX_STATS_INIT } static inline int k5_mutex_init_1(k5_mutex_t *m, k5_debug_loc l) { int err = k5_os_mutex_init(&m->os); if (err) return err; m->loc_created = m->loc_last = l; + err = k5_mutex_init_stats(&m->stats); + assert(err == 0); return 0; } #define k5_mutex_init(M) k5_mutex_init_1((M), K5_DEBUG_LOC) @@ -441,6 +498,8 @@ static inline int k5_mutex_finish_init_1(k5_mutex_t *m, k5_debug_loc l) int err = k5_os_mutex_finish_init(&m->os); if (err) return err; m->loc_created = m->loc_last = l; + err = k5_mutex_finish_init_stats(&m->stats); + assert(err == 0); return 0; } #define k5_mutex_finish_init(M) k5_mutex_finish_init_1((M), K5_DEBUG_LOC) @@ -477,7 +536,10 @@ static inline int k5_mutex_unlock_1(k5_mutex_t *m, k5_debug_loc l) /* Thread-specific data; implemented in a support file, because we'll - need to keep track of some global data for cleanup purposes. */ + need to keep track of some global data for cleanup purposes. + + Note that the callback function type is such that the C library + routine free() is a valid callback. */ typedef enum { K5_KEY_COM_ERR, K5_KEY_MAX -- 2.26.2