diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index d54eec19eb..1cf3b38c52 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.17 2000/12/29 18:19:52 bwelling Exp $ */
+/* $Id: mutex.h,v 1.18 2001/01/04 22:37:37 neild Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
@@ -25,8 +25,6 @@
 
 #include <isc/result.h>		/* for ISC_R_ codes */
 
-typedef pthread_mutex_t	isc_mutex_t;
-
 /* XXX We could do fancier error handling... */
 
 /*
@@ -36,31 +34,67 @@ typedef pthread_mutex_t	isc_mutex_t;
  * waiting to obtain the lock.
  */
 #ifndef ISC_MUTEX_PROFILE
-#define ISC_MUTEX_PROFILE 0
+#define ISC_MUTEX_PROFILE 1
 #endif
 
+#if ISC_MUTEX_PROFILE
+typedef struct isc_mutex_stats isc_mutex_stats_t;
+
+typedef struct {
+	pthread_mutex_t		mutex;	/* The actual mutex. */
+	isc_mutex_stats_t *	stats;	/* Mutex statistics. */
+} isc_mutex_t;
+#else
+typedef pthread_mutex_t	isc_mutex_t;
+#endif
+
+
+#if ISC_MUTEX_PROFILE
+#define isc_mutex_init(mp) \
+	isc_mutex_init_profile((mp), __FILE__, __LINE__)
+#else
 #define isc_mutex_init(mp) \
 	((pthread_mutex_init((mp), NULL) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
+#endif
 
 #if ISC_MUTEX_PROFILE
 #define isc_mutex_lock(mp) \
-	isc_mutex_lockprofile((mp), __FILE__, __LINE__)
+	isc_mutex_lock_profile((mp), __FILE__, __LINE__)
 #else
 #define isc_mutex_lock(mp) \
 	((pthread_mutex_lock((mp)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
 #endif
 
+#if ISC_MUTEX_PROFILE
+#define isc_mutex_unlock(mp) \
+	isc_mutex_unlock_profile((mp), __FILE__, __LINE__)
+#else
 #define isc_mutex_unlock(mp) \
 	((pthread_mutex_unlock((mp)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
+#endif
+
+#if ISC_MUTEX_PROFILE
+#define isc_mutex_trylock(mp) \
+	((pthread_mutex_trylock((&(mp)->mutex)) == 0) ? \
+	 ISC_R_SUCCESS : ISC_R_LOCKBUSY)
+#else
 #define isc_mutex_trylock(mp) \
 	((pthread_mutex_trylock((mp)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_LOCKBUSY)
+#endif
+
+#if ISC_MUTEX_PROFILE
+#define isc_mutex_destroy(mp) \
+	((pthread_mutex_destroy((&(mp)->mutex)) == 0) ? \
+	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
+#else
 #define isc_mutex_destroy(mp) \
 	((pthread_mutex_destroy((mp)) == 0) ? \
 	 ISC_R_SUCCESS : ISC_R_UNEXPECTED)
+#endif
 
 #if ISC_MUTEX_PROFILE
 #define isc_mutex_stats(fp) isc_mutex_statsprofile(fp);
@@ -71,7 +105,11 @@ typedef pthread_mutex_t	isc_mutex_t;
 #if ISC_MUTEX_PROFILE
 
 isc_result_t
-isc_mutex_lockprofile(isc_mutex_t *mp, const char * _file, int _line);
+isc_mutex_init_profile(isc_mutex_t *mp, const char * _file, int _line);
+isc_result_t
+isc_mutex_lock_profile(isc_mutex_t *mp, const char * _file, int _line);
+isc_result_t
+isc_mutex_unlock_profile(isc_mutex_t *mp, const char * _file, int _line);
 
 void
 isc_mutex_statsprofile(FILE *fp);
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index 08d1e466bb..2b355ba217 100644
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.c,v 1.1 2000/12/29 01:29:56 bwelling Exp $ */
+/* $Id: mutex.c,v 1.2 2001/01/04 22:37:36 neild Exp $ */
 
 #include <config.h>
 
@@ -28,6 +28,199 @@
 
 #if ISC_MUTEX_PROFILE
 
+/* Operations on timespecs */
+#define timespecclear(tvp)      ((tvp)->tv_sec = (tvp)->tv_nsec = 0)
+#define timespecadd(vvp, uvp)                                           \
+        do {                                                            \
+                (vvp)->tv_sec += (uvp)->tv_sec;                         \
+                (vvp)->tv_nsec += (uvp)->tv_nsec;                       \
+                if ((vvp)->tv_nsec >= 1000000) {                     \
+                        (vvp)->tv_sec++;                                \
+                        (vvp)->tv_nsec -= 1000000;                   \
+                }                                                       \
+        } while (0)
+#define timespecsub(vvp, uvp)                                           \
+        do {                                                            \
+                (vvp)->tv_sec -= (uvp)->tv_sec;                         \
+                (vvp)->tv_nsec -= (uvp)->tv_nsec;                       \
+                if ((vvp)->tv_nsec < 0) {                               \
+                        (vvp)->tv_sec--;                                \
+                        (vvp)->tv_nsec += 1000000;                   \
+                }                                                       \
+        } while (0)
+
+#define timespec timeval
+#define tv_nsec tv_usec
+#define clock_gettime(a, b) gettimeofday((b), NULL)
+
+
+#define ISC_MUTEX_MAX_LOCKERS 32
+
+typedef struct {
+	const char *		file;
+	int			line;
+	unsigned		count;
+	struct timespec		locked_total;
+	struct timespec		wait_total;
+} isc_mutex_locker_t;
+
+struct isc_mutex_stats {
+	const char *		file;	/* File mutex was created in. */
+	int 			line;	/* Line mutex was created on. */
+	unsigned		count;
+	struct timespec		lock_t;
+	struct timespec		locked_total;
+	struct timespec		wait_total;
+	isc_mutex_locker_t *	cur_locker;
+	isc_mutex_locker_t	lockers[ISC_MUTEX_MAX_LOCKERS];
+};
+
+#define TABLESIZE (8 * 1024)
+static isc_mutex_stats_t stats[TABLESIZE];
+static isc_boolean_t stats_init = ISC_FALSE;
+static pthread_mutex_t statslock = PTHREAD_MUTEX_INITIALIZER;
+
+
+isc_result_t
+isc_mutex_init_profile(isc_mutex_t *mp, const char *file, int line) {
+	int i;
+
+	if (pthread_mutex_init(&mp->mutex, NULL) != 0)
+		return ISC_R_UNEXPECTED;
+
+	RUNTIME_CHECK(pthread_mutex_lock(&statslock) == 0);
+
+	if (stats_init == ISC_FALSE) {
+		for (i = 0; i < TABLESIZE; i++) {
+			stats[i].file = NULL;
+		}
+		stats_init = ISC_TRUE;
+	}
+
+	mp->stats = NULL;
+	for (i = 0; i < TABLESIZE; i++) {
+		if (stats[i].file == NULL) {
+			mp->stats = &stats[i];
+			break;
+		}
+	}
+	RUNTIME_CHECK(mp->stats != NULL);
+
+	RUNTIME_CHECK(pthread_mutex_unlock(&statslock) == 0);
+
+	mp->stats->file = file;
+	mp->stats->line = line;
+	mp->stats->count = 0;
+	timespecclear(&mp->stats->locked_total);
+	timespecclear(&mp->stats->wait_total);
+	for (i = 0; i < ISC_MUTEX_MAX_LOCKERS; i++) {
+		mp->stats->lockers[i].file = NULL;
+		mp->stats->lockers[i].line = 0;
+		mp->stats->lockers[i].count = 0;
+		timespecclear(&mp->stats->lockers[i].locked_total);
+		timespecclear(&mp->stats->lockers[i].wait_total);
+	}
+
+	return ISC_R_SUCCESS;
+}
+
+isc_result_t
+isc_mutex_lock_profile(isc_mutex_t *mp, const char *file, int line) {
+	struct timespec prelock_t;
+	struct timespec postlock_t;
+	isc_mutex_locker_t *locker = NULL;
+	int i;
+
+	for (i = 0; i < ISC_MUTEX_MAX_LOCKERS; i++) {
+		if (mp->stats->lockers[i].file == NULL) {
+			locker = &mp->stats->lockers[i];
+			locker->file = file;
+			locker->line = line;
+			break;
+		} else if (mp->stats->lockers[i].file == file &&
+			   mp->stats->lockers[i].line == line) {
+			locker = &mp->stats->lockers[i];
+			break;
+		}
+	}
+
+	clock_gettime(CLOCK_REALTIME, &prelock_t);
+
+	if (pthread_mutex_lock(&mp->mutex) != 0)
+		return (ISC_R_UNEXPECTED);
+
+	clock_gettime(CLOCK_REALTIME, &postlock_t);
+	mp->stats->lock_t = postlock_t;
+
+	timespecsub(&postlock_t, &prelock_t);
+
+	mp->stats->count++;
+	timespecadd(&mp->stats->wait_total, &postlock_t);
+
+	if (locker != NULL) {
+		locker->count++;
+		timespecadd(&locker->wait_total, &postlock_t);
+	}
+
+	mp->stats->cur_locker = locker;
+
+	return ISC_R_SUCCESS;
+}
+
+isc_result_t
+isc_mutex_unlock_profile(isc_mutex_t *mp, const char *file, int line) {
+	struct timespec unlock_t;
+
+	UNUSED(file);
+	UNUSED(line);
+
+	if (mp->stats->cur_locker != NULL) {
+		clock_gettime(CLOCK_REALTIME, &unlock_t);
+		timespecsub(&unlock_t, &mp->stats->lock_t);
+		timespecadd(&mp->stats->locked_total, &unlock_t);
+		timespecadd(&mp->stats->cur_locker->locked_total, &unlock_t);
+		mp->stats->cur_locker = NULL;
+	}
+
+	return ((pthread_mutex_unlock((&mp->mutex)) == 0) ? \
+		ISC_R_SUCCESS : ISC_R_UNEXPECTED);
+}
+
+
+void
+isc_mutex_statsprofile(FILE *fp) {
+	isc_mutex_locker_t *locker;
+	int i, j;
+	fprintf(fp, "Mutex stats (in us)\n");
+	for (i = 0; i < TABLESIZE; i++) {
+		if (stats[i].file == NULL)
+			continue;
+		fprintf(fp, "%-12s %4d: %10u  %lu.%06lu %lu.%06lu\n",
+			stats[i].file, stats[i].line, stats[i].count,
+			stats[i].locked_total.tv_sec,
+			stats[i].locked_total.tv_nsec,
+			stats[i].wait_total.tv_sec,
+			stats[i].wait_total.tv_nsec
+			);
+		for (j = 0; j < ISC_MUTEX_MAX_LOCKERS; j++) {
+			locker = &stats[i].lockers[j];
+			if (locker->file == NULL)
+				continue;
+			fprintf(fp, " %-11s %4d: %10u  %lu.%06lu %lu.%06lu\n",
+				locker->file, locker->line, locker->count,
+				locker->locked_total.tv_sec,
+				locker->locked_total.tv_nsec,
+				locker->wait_total.tv_sec,
+				locker->wait_total.tv_nsec
+				);
+		}
+	}
+}
+
+
+#if 0
+/*** Original profiling code ***/
+
 struct mutexstats {
 	const char *file;
 	int line;
@@ -93,5 +286,6 @@ isc_mutex_statsprofile(FILE *fp) {
 			stats[i].count, stats[i].us / stats[i].count);
 	}
 }
+#endif
 
 #endif /* ISC_MUTEX_PROFILE */