diff options
| author | Werner Koch <[email protected]> | 2014-04-15 14:40:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-04-30 19:14:28 +0000 |
| commit | aeb81727c77dfea3bf5d2d689ffbdc897f2938a7 (patch) | |
| tree | 5072facee1f58704b4a9d38c94ba08f8a926e6ce /common/estream.c | |
| parent | estream: Replace locking macros by functions. (diff) | |
| download | gnupg-aeb81727c77dfea3bf5d2d689ffbdc897f2938a7.tar.gz gnupg-aeb81727c77dfea3bf5d2d689ffbdc897f2938a7.zip | |
estream: Add debug code to the lock functions.
* common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
Diffstat (limited to 'common/estream.c')
| -rw-r--r-- | common/estream.c | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/common/estream.c b/common/estream.c index eb6857209..33195b739 100644 --- a/common/estream.c +++ b/common/estream.c @@ -343,12 +343,26 @@ map_w32_to_errno (DWORD w32_err) /* * Lock wrappers */ +#if 0 +# define dbg_lock_0(f) fprintf (stderr, "estream: " f); +# define dbg_lock_1(f, a) fprintf (stderr, "estream: " f, (a)); +# define dbg_lock_2(f, a, b) fprintf (stderr, "estream: " f, (a), (b)); +#else +# define dbg_lock_0(f) +# define dbg_lock_1(f, a) +# define dbg_lock_2(f, a, b) +#endif static int init_stream_lock (estream_t ES__RESTRICT stream) { #ifdef HAVE_NPTH - return npth_mutex_init (&stream->intern->lock, NULL); + int rc; + + dbg_lock_1 ("enter init_stream_lock for %p\n", stream); + rc = npth_mutex_init (&stream->intern->lock, NULL); + dbg_lock_2 ("leave init_stream_lock for %p: rc=%d\n", stream, rc); + return rc; #else (void)stream; return 0; @@ -360,7 +374,9 @@ static void lock_stream (estream_t ES__RESTRICT stream) { #ifdef HAVE_NPTH + dbg_lock_1 ("enter lock_stream for %p\n", stream); npth_mutex_lock (&stream->intern->lock); + dbg_lock_1 ("leave lock_stream for %p\n", stream); #else (void)stream; #endif @@ -371,7 +387,12 @@ static int trylock_stream (estream_t ES__RESTRICT stream) { #ifdef HAVE_NPTH - return npth_mutex_trylock (&stream->intern->lock)? 0 : -1; + int rc; + + dbg_lock_1 ("enter trylock_stream for %p\n", stream); + rc = npth_mutex_trylock (&stream->intern->lock)? 0 : -1; + dbg_lock_2 ("leave trylock_stream for %p: rc=%d\n", stream, rc); + return rc; #else (void)stream; return 0; @@ -383,7 +404,9 @@ static void unlock_stream (estream_t ES__RESTRICT stream) { #ifdef HAVE_NPTH + dbg_lock_1 ("enter unlock_stream for %p\n", stream); npth_mutex_unlock (&stream->intern->lock); + dbg_lock_1 ("leave unlock_stream for %p\n", stream); #else (void)stream; #endif @@ -394,7 +417,12 @@ static int init_list_lock (void) { #ifdef HAVE_NPTH - return npth_mutex_init (&estream_list_lock, NULL); + int rc; + + dbg_lock_0 ("enter init_list_lock\n"); + rc = npth_mutex_init (&estream_list_lock, NULL); + dbg_lock_1 ("leave init_list_lock: rc=%d\n", rc); + return rc; #else return 0; #endif @@ -405,7 +433,9 @@ static void lock_list (void) { #ifdef HAVE_NPTH + dbg_lock_0 ("enter lock_list\n"); npth_mutex_lock (&estream_list_lock); + dbg_lock_0 ("leave lock_list\n"); #endif } @@ -414,11 +444,17 @@ static void unlock_list (void) { #ifdef HAVE_NPTH + dbg_lock_0 ("enter unlock_list\n"); npth_mutex_unlock (&estream_list_lock); + dbg_lock_0 ("leave unlock_list\n"); #endif } +#undef dbg_lock_0 +#undef dbg_lock_1 +#undef dbg_lock_2 + /* |