nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows compilation of condition code

Browse Source
This commit is contained in:
Nick Mathewson 2013-09-25 23:31:40 -04:00
parent d850ec8574
commit 9fdc0d0594
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/compat.c
View File

@ -27,7 +27,6 @@
#include "compat.h"
#ifdef _WIN32
#include <process.h>
#include <windows.h>
#include <sys/locking.h>
#endif

11
src/common/compat_winthreads.c
View File

@ -9,6 +9,10 @@
#include "util.h"
#include "container.h"
#include "torlog.h"
#include <process.h>
/* This value is more or less total cargo-cult */
#define SPIN_COUNT 2000
/** Minimalist interface to run a void function in the background. On
* Unix calls fork, on win32 calls beginthread. Returns -1 on failure.
@ -108,7 +112,6 @@ tor_cond_signal_impl(tor_cond_t *cond, int broadcast)
cond->generation++;
SetEvent(cond->event);
LeaveCriticalSection(&cond->lock);
return 0;
}
void
tor_cond_signal_one(tor_cond_t *cond)
@ -122,15 +125,15 @@ tor_cond_signal_all(tor_cond_t *cond)
}
int
tor_cond_wait(tor_cond_t *cond, tor_mutex_t *lock, const struct timeval *tv)
tor_cond_wait(tor_cond_t *cond, tor_mutex_t *lock_, const struct timeval *tv)
{
CRITICAL_SECTION *lock = &lock->mutex;
CRITICAL_SECTION *lock = &lock_->mutex;
int generation_at_start;
int waiting = 1;
int result = -1;
DWORD ms = INFINITE, ms_orig = INFINITE, startTime, endTime;
if (tv)
ms_orig = ms = evutil_tv_to_msec_(tv);
ms_orig = ms = tv->tv_sec*1000 + (tv->tv_usec+999)/1000;
EnterCriticalSection(&cond->lock);
++cond->n_waiting;