Commit 8cef828d8d115c1f98678c13721fee59ca4540b7
2012-08-18T22:11:49
Make the memory-window conrol structures global Up to now, the idea was that the user would do all the operations for one repository in the same thread. Thus we could have the memory-mapped window information thread-local and avoid any locking. This is not practical in a few environments, such as Apple's GCD which allocates threads arbitrarily or the .NET CLR, where the OS-level thread can change at any moment. Make the control structure global and protect it with a mutex so we don't depend on the thread currently executing the code.
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 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
diff --git a/src/global.c b/src/global.c
index 368c6c6..691f0d4 100644
--- a/src/global.c
+++ b/src/global.c
@@ -9,6 +9,9 @@
#include "git2/threads.h"
#include "thread-utils.h"
+
+git_mutex git__mwindow_mutex;
+
/**
* Handle the global state with TLS
*
@@ -47,12 +50,14 @@ void git_threads_init(void)
_tls_index = TlsAlloc();
_tls_init = 1;
+ git_mutex_init(&git__mwindow_mutex);
}
void git_threads_shutdown(void)
{
TlsFree(_tls_index);
_tls_init = 0;
+ git_mutex_free(&git__mwindow_mutex);
}
git_global_st *git__global_state(void)
diff --git a/src/global.h b/src/global.h
index 6e7373f..0ad41ee 100644
--- a/src/global.h
+++ b/src/global.h
@@ -12,12 +12,12 @@
typedef struct {
git_error *last_error;
git_error error_t;
-
- git_mwindow_ctl mem_ctl;
} git_global_st;
git_global_st *git__global_state(void);
+extern git_mutex git__mwindow_mutex;
+
#define GIT_GLOBAL (git__global_state())
#endif
diff --git a/src/mwindow.c b/src/mwindow.c
index 1a5446b..4da5bad 100644
--- a/src/mwindow.c
+++ b/src/mwindow.c
@@ -32,14 +32,20 @@ static struct {
DEFAULT_MAPPED_LIMIT,
};
+/* Whenever you want to read or modify this, grab git__mwindow_mutex */
+static git_mwindow_ctl mem_ctl;
+
/*
* Free all the windows in a sequence, typically because we're done
* with the file
*/
void git_mwindow_free_all(git_mwindow_file *mwf)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
unsigned int i;
+
+ git_mutex_lock(&git__mwindow_mutex);
+
/*
* Remove these windows from the global list
*/
@@ -67,6 +73,8 @@ void git_mwindow_free_all(git_mwindow_file *mwf)
mwf->windows = w->next;
git__free(w);
}
+
+ git_mutex_unlock(&git__mwindow_mutex);
}
/*
@@ -82,7 +90,7 @@ int git_mwindow_contains(git_mwindow *win, git_off_t offset)
/*
* Find the least-recently-used window in a file
*/
-void git_mwindow_scan_lru(
+static void git_mwindow_scan_lru(
git_mwindow_file *mwf,
git_mwindow **lru_w,
git_mwindow **lru_l)
@@ -107,11 +115,12 @@ void git_mwindow_scan_lru(
/*
* Close the least recently used window. You should check to see if
- * the file descriptors need closing from time to time.
+ * the file descriptors need closing from time to time. Called under
+ * lock from new_window.
*/
static int git_mwindow_close_lru(git_mwindow_file *mwf)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
unsigned int i;
git_mwindow *lru_w = NULL, *lru_l = NULL, **list = &mwf->windows;
@@ -146,13 +155,14 @@ static int git_mwindow_close_lru(git_mwindow_file *mwf)
return 0;
}
+/* This gets called under lock from git_mwindow_open */
static git_mwindow *new_window(
git_mwindow_file *mwf,
git_file fd,
git_off_t size,
git_off_t offset)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
size_t walign = _mw_options.window_size / 2;
git_off_t len;
git_mwindow *w;
@@ -208,9 +218,10 @@ unsigned char *git_mwindow_open(
size_t extra,
unsigned int *left)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
git_mwindow *w = *cursor;
+ git_mutex_lock(&git__mwindow_mutex);
if (!w || !(git_mwindow_contains(w, offset) && git_mwindow_contains(w, offset + extra))) {
if (w) {
w->inuse_cnt--;
@@ -228,8 +239,10 @@ unsigned char *git_mwindow_open(
*/
if (!w) {
w = new_window(mwf, mwf->fd, mwf->size, offset);
- if (w == NULL)
+ if (w == NULL) {
+ git_mutex_unlock(&git__mwindow_mutex);
return NULL;
+ }
w->next = mwf->windows;
mwf->windows = w;
}
@@ -247,32 +260,43 @@ unsigned char *git_mwindow_open(
if (left)
*left = (unsigned int)(w->window_map.len - offset);
+ git_mutex_unlock(&git__mwindow_mutex);
return (unsigned char *) w->window_map.data + offset;
}
int git_mwindow_file_register(git_mwindow_file *mwf)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
+ int ret;
+ git_mutex_lock(&git__mwindow_mutex);
if (ctl->windowfiles.length == 0 &&
- git_vector_init(&ctl->windowfiles, 8, NULL) < 0)
+ git_vector_init(&ctl->windowfiles, 8, NULL) < 0) {
+ git_mutex_unlock(&git__mwindow_mutex);
return -1;
+ }
+
+ ret = git_vector_insert(&ctl->windowfiles, mwf);
+ git_mutex_unlock(&git__mwindow_mutex);
- return git_vector_insert(&ctl->windowfiles, mwf);
+ return ret;
}
int git_mwindow_file_deregister(git_mwindow_file *mwf)
{
- git_mwindow_ctl *ctl = &GIT_GLOBAL->mem_ctl;
+ git_mwindow_ctl *ctl = &mem_ctl;
git_mwindow_file *cur;
unsigned int i;
+ git_mutex_lock(&git__mwindow_mutex);
git_vector_foreach(&ctl->windowfiles, i, cur) {
if (cur == mwf) {
git_vector_remove(&ctl->windowfiles, i);
+ git_mutex_unlock(&git__mwindow_mutex);
return 0;
}
}
+ git_mutex_unlock(&git__mwindow_mutex);
giterr_set(GITERR_ODB, "Failed to find the memory window file to deregister");
return -1;
@@ -282,7 +306,9 @@ void git_mwindow_close(git_mwindow **window)
{
git_mwindow *w = *window;
if (w) {
+ git_mutex_lock(&git__mwindow_mutex);
w->inuse_cnt--;
+ git_mutex_unlock(&git__mwindow_mutex);
*window = NULL;
}
}
diff --git a/src/mwindow.h b/src/mwindow.h
index d4fd195..c5aeaf7 100644
--- a/src/mwindow.h
+++ b/src/mwindow.h
@@ -38,7 +38,6 @@ typedef struct git_mwindow_ctl {
int git_mwindow_contains(git_mwindow *win, git_off_t offset);
void git_mwindow_free_all(git_mwindow_file *mwf);
unsigned char *git_mwindow_open(git_mwindow_file *mwf, git_mwindow **cursor, git_off_t offset, size_t extra, unsigned int *left);
-void git_mwindow_scan_lru(git_mwindow_file *mwf, git_mwindow **lru_w, git_mwindow **lru_l);
int git_mwindow_file_register(git_mwindow_file *mwf);
int git_mwindow_file_deregister(git_mwindow_file *mwf);
void git_mwindow_close(git_mwindow **w_cursor);