diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-27 12:32:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-14 11:12:40 -0500 |
| commit | e47a90a976f883571bea6e58620aa13f058873e3 (patch) | |
| tree | de86a0e575b7b2b53b127548ca4ab990e2cc476a /src/common/compat_threads.h | |
| parent | d69717f61bd9ab4e0a6097f0201bd02fc96f88eb (diff) | |
| download | tor-e47a90a976f883571bea6e58620aa13f058873e3.tar.gz tor-e47a90a976f883571bea6e58620aa13f058873e3.zip | |
"Recursive" locks, not "reentrant" locks. Duh.
Diffstat (limited to 'src/common/compat_threads.h')
| -rw-r--r-- | src/common/compat_threads.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index 1b59391d3b..a5db72d45f 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -46,9 +46,9 @@ typedef struct tor_mutex_t { tor_mutex_t *tor_mutex_new(void); -tor_mutex_t *tor_mutex_new_nonreentrant(void); +tor_mutex_t *tor_mutex_new_nonrecursive(void); void tor_mutex_init(tor_mutex_t *m); -void tor_mutex_init_nonreentrant(tor_mutex_t *m); +void tor_mutex_init_nonrecursive(tor_mutex_t *m); void tor_mutex_acquire(tor_mutex_t *m); void tor_mutex_release(tor_mutex_t *m); void tor_mutex_free(tor_mutex_t *m); @@ -56,8 +56,8 @@ void tor_mutex_uninit(tor_mutex_t *m); unsigned long tor_get_thread_id(void); void tor_threads_init(void); -/** Conditions need nonreentrant mutexes with pthreads. */ -#define tor_mutex_init_for_cond(m) tor_mutex_init_nonreentrant(m) +/** Conditions need nonrecursive mutexes with pthreads. */ +#define tor_mutex_init_for_cond(m) tor_mutex_init_nonrecursive(m) void set_main_thread(void); int in_main_thread(void); |