Commit 22661448973e3c46f2a71a75364630a5111f7c14
2013-10-04T19:35:32
Don't use git_atomic as an integer
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/src/global.c b/src/global.c
index 33a760c..7d39c6f 100644
--- a/src/global.c
+++ b/src/global.c
@@ -18,7 +18,6 @@ git_mutex git__mwindow_mutex;
git_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB];
git_atomic git__n_shutdown_callbacks;
-git_atomic git__n_inits;
void git__on_shutdown(git_global_shutdown_fn callback)
{
@@ -75,6 +74,7 @@ static void git__shutdown(void)
static DWORD _tls_index;
static DWORD _mutex = 0;
+static DWORD _n_inits = 0;
static int synchronized_threads_init()
{
@@ -101,7 +101,7 @@ int git_threads_init(void)
while (InterlockedCompareExchange(&_mutex, 1, 0)) { Sleep(0); }
/* Only do work on a 0 -> 1 transition of the refcount */
- if (1 == ++git__n_inits.val)
+ if (1 == ++_n_inits)
error = synchronized_threads_init();
/* Exit the lock */
@@ -124,7 +124,7 @@ void git_threads_shutdown(void)
while (InterlockedCompareExchange(&_mutex, 1, 0)) { Sleep(0); }
/* Only do work on a 1 -> 0 transition of the refcount */
- if (0 == --git__n_inits.val)
+ if (0 == --_n_inits)
synchronized_threads_shutdown();
/* Exit the lock */
@@ -135,7 +135,7 @@ git_global_st *git__global_state(void)
{
void *ptr;
- assert(git__n_inits.val);
+ assert(_n_inits);
if ((ptr = TlsGetValue(_tls_index)) != NULL)
return ptr;
@@ -153,6 +153,7 @@ git_global_st *git__global_state(void)
static pthread_key_t _tls_key;
static pthread_once_t _once_init = PTHREAD_ONCE_INIT;
+static git_atomic git__n_inits;
int init_error = 0;
static void cb__free_status(void *st)