Commit 107958d7173ab84566c9d89b1cafa08379c849fb
2015-03-04T14:53:02
Merge branch 'tls_data'
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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
diff --git a/src/global.c b/src/global.c
index fcbcbb1..1f3432d 100644
--- a/src/global.c
+++ b/src/global.c
@@ -36,16 +36,25 @@ void git__on_shutdown(git_global_shutdown_fn callback)
git__shutdown_callbacks[count - 1] = callback;
}
+static void git__global_state_cleanup(git_global_st *st)
+{
+ if (!st)
+ return;
+
+ git__free(st->error_t.message);
+ st->error_t.message = NULL;
+}
+
static void git__shutdown(void)
{
int pos;
+ /* Shutdown subsystems that have registered */
for (pos = git_atomic_get(&git__n_shutdown_callbacks); pos > 0; pos = git_atomic_dec(&git__n_shutdown_callbacks)) {
git_global_shutdown_fn cb = git__swap(git__shutdown_callbacks[pos - 1], NULL);
if (cb != NULL)
cb();
}
-
}
#if defined(GIT_THREADS) && defined(GIT_SSL)
@@ -214,8 +223,14 @@ int git_libgit2_init(void)
static void synchronized_threads_shutdown(void)
{
+ void *ptr;
+
/* Shut down any subsystems that have global state */
git__shutdown();
+
+ ptr = TlsGetValue(_tls_index);
+ git__global_state_cleanup(ptr);
+
TlsFree(_tls_index);
git_mutex_free(&git__mwindow_mutex);
}
@@ -255,6 +270,17 @@ git_global_st *git__global_state(void)
return ptr;
}
+BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
+{
+ if (reason == DLL_THREAD_DETACH) {
+ void *ptr = TlsGetValue(_tls_index);
+ git__global_state_cleanup(ptr);
+ git__free(ptr);
+ }
+
+ return TRUE;
+}
+
#elif defined(GIT_THREADS) && defined(_POSIX_THREADS)
static pthread_key_t _tls_key;
@@ -263,9 +289,7 @@ int init_error = 0;
static void cb__free_status(void *st)
{
- git_global_st *state = (git_global_st *) st;
- git__free(state->error_t.message);
-
+ git__global_state_cleanup(st);
git__free(st);
}
@@ -302,7 +326,7 @@ int git_libgit2_shutdown(void)
pthread_once_t new_once = PTHREAD_ONCE_INIT;
int ret;
- if ((ret = git_atomic_dec(&git__n_inits)) > 0)
+ if ((ret = git_atomic_dec(&git__n_inits)) != 0)
return ret;
/* Shut down any subsystems that have global state */
@@ -310,13 +334,15 @@ int git_libgit2_shutdown(void)
ptr = pthread_getspecific(_tls_key);
pthread_setspecific(_tls_key, NULL);
+
+ git__global_state_cleanup(ptr);
git__free(ptr);
pthread_key_delete(_tls_key);
git_mutex_free(&git__mwindow_mutex);
_once_init = new_once;
- return ret;
+ return 0;
}
git_global_st *git__global_state(void)
@@ -358,10 +384,13 @@ int git_libgit2_shutdown(void)
int ret;
/* Shut down any subsystems that have global state */
- if (ret = git_atomic_dec(&git__n_inits))
- git__shutdown();
+ if ((ret = git_atomic_dec(&git__n_inits)) != 0)
+ return ret;
- return ret;
+ git__shutdown();
+ git__global_state_cleanup(&__state);
+
+ return 0;
}
git_global_st *git__global_state(void)
diff --git a/tests/main.c b/tests/main.c
index cc13230..f67c8ff 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -20,7 +20,6 @@ int main(int argc, char *argv[])
clar_test_shutdown();
- giterr_clear();
cl_global_trace_disable();
git_libgit2_shutdown();