diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-05 19:40:19 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-05 19:40:19 +0000 |
| commit | ac69319d3f1554413eec68313bd83b153fd4ff7f (patch) | |
| tree | ff149dba65f2f046e9b0db0a53991ae7d92a0d0a /src/common/compat.c | |
| parent | 3958d7b16f0fd54bce0ba9a6992fe773633e7077 (diff) | |
| download | tor-ac69319d3f1554413eec68313bd83b153fd4ff7f.tar.gz tor-ac69319d3f1554413eec68313bd83b153fd4ff7f.zip | |
r17899@catbus: nickm | 2008-02-05 14:14:06 -0500
Fix a couple of XXX020 items. Also, disable all "condition" sychronization code, since Tor does not use it yet
svn:r13380
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index b343c4a3b7..10605dbe68 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1183,7 +1183,6 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) } return 0; } - memset(addr, 0, sizeof(tor_addr_t)); /* XXXX020 is this redundant? */ #ifdef MS_WINDOWS return (err == WSATRY_AGAIN) ? 1 : -1; #else @@ -1701,6 +1700,7 @@ struct tor_mutex_t { /* Conditions. */ #ifdef USE_PTHREADS +#if 0 /** Cross-platform condtion implementation. */ struct tor_cond_t { pthread_cond_t cond; @@ -1747,12 +1747,14 @@ tor_cond_signal_all(tor_cond_t *cond) { pthread_cond_broadcast(&cond->cond); } +#endif /** Set up common structures for use by threading. */ void tor_threads_init(void) { } #elif defined(USE_WIN32_THREADS) +#if 0 static DWORD cond_event_tls_index; struct tor_cond_t { CRITICAL_SECTION mutex; @@ -1771,7 +1773,7 @@ tor_cond_free(tor_cond_t *cond) { tor_assert(cond); DeleteCriticalSection(&cond->mutex); - /* XXXX020 notify? */ + /* XXXX notify? */ smartlist_free(cond->events); tor_free(cond); } @@ -1834,10 +1836,13 @@ tor_cond_signal_all(tor_cond_t *cond) smartlist_clear(cond->events); LeaveCriticalSection(&cond->mutex); } +#endif void tor_threads_init(void) { +#if 0 cond_event_tls_index = TlsAlloc(); +#endif } #endif |