Commit 83fe60fa1bb7c8293585e6e8d6b12f3039910bbb
2015-03-03T14:10:50
libgit2_shutdown: clear err message on shutdown Clear the error message on git_libgit2_shutdown for all versions of the library (no threads and Win32 threads). Drop the giterr_clear in clar, as that shouldn't be necessary.
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
diff --git a/src/global.c b/src/global.c
index ee4c929..2f31c7d 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);
}
@@ -263,7 +278,7 @@ int init_error = 0;
static void cb__free_status(void *st)
{
- giterr_clear();
+ git__global_state_cleanup(st);
git__free(st);
}
@@ -300,23 +315,23 @@ 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 */
git__shutdown();
- giterr_clear();
-
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 +373,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();