Update filter registry code This updates the git filter registry to be a little cleaner and plugs some memory leaks.
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 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286
diff --git a/src/crlf.c b/src/crlf.c
index cc256fc..e974208 100644
--- a/src/crlf.c
+++ b/src/crlf.c
@@ -318,6 +318,11 @@ static void crlf_cleanup(
git__free(payload);
}
+static void crlf_shutdown(git_filter *self)
+{
+ git__free(self);
+}
+
git_filter *git_crlf_filter_new(void)
{
struct crlf_filter *f = git__calloc(1, sizeof(struct crlf_filter));
@@ -325,10 +330,10 @@ git_filter *git_crlf_filter_new(void)
f->f.version = GIT_FILTER_VERSION;
f->f.attributes = "crlf eol text";
f->f.initialize = NULL;
- f->f.shutdown = NULL;
- f->f.check = crlf_check;
- f->f.apply = crlf_apply;
- f->f.cleanup = crlf_cleanup;
+ f->f.shutdown = crlf_shutdown;
+ f->f.check = crlf_check;
+ f->f.apply = crlf_apply;
+ f->f.cleanup = crlf_cleanup;
return (git_filter *)f;
}
diff --git a/src/filter.c b/src/filter.c
index 0500146..73c2cea 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -10,6 +10,7 @@
#include "hash.h"
#include "filter.h"
#include "repository.h"
+#include "global.h"
#include "git2/sys/filter.h"
#include "git2/config.h"
#include "blob.h"
@@ -52,10 +53,64 @@ static int filter_def_priority_cmp(const void *a, const void *b)
return (pa < pb) ? -1 : (pa > pb) ? 1 : 0;
}
-static git_vector git__filter_registry = {
- 0, filter_def_priority_cmp, NULL, 0, 0
+struct filter_registry {
+ git_vector filters;
};
+static struct filter_registry *git__filter_registry = NULL;
+
+static void filter_registry_shutdown(void)
+{
+ struct filter_registry *reg = NULL;
+ size_t pos;
+ git_filter_def *fdef;
+
+ if ((reg = git__swap(git__filter_registry, NULL)) == NULL)
+ return;
+
+ git_vector_foreach(®->filters, pos, fdef) {
+ if (fdef->initialized && fdef->filter && fdef->filter->shutdown) {
+ fdef->filter->shutdown(fdef->filter);
+ fdef->initialized = false;
+ }
+
+ git__free(fdef->attrdata);
+ git__free(fdef);
+ }
+
+ git_vector_free(®->filters);
+ git__free(reg);
+}
+
+static int filter_registry_initialize(void)
+{
+ int error = 0;
+ struct filter_registry *reg;
+
+ if (git__filter_registry)
+ return 0;
+
+ reg = git__calloc(1, sizeof(struct filter_registry));
+ GITERR_CHECK_ALLOC(reg);
+
+ if ((error = git_vector_init(
+ ®->filters, 2, filter_def_priority_cmp)) < 0)
+ goto cleanup;
+
+ reg = git__compare_and_swap(&git__filter_registry, NULL, reg);
+ if (reg != NULL)
+ goto cleanup;
+
+ git__on_shutdown(filter_registry_shutdown);
+
+ return git_filter_register(GIT_FILTER_CRLF, git_crlf_filter_new(), 0);
+
+cleanup:
+ git_vector_free(®->filters);
+ git__free(reg);
+ return error;
+}
+
static int filter_def_scan_attrs(
git_buf *attrs, size_t *nattr, size_t *nmatch, const char *attr_str)
{
@@ -122,6 +177,29 @@ static void filter_def_set_attrs(git_filter_def *fdef)
}
}
+static int filter_def_name_key_check(const void *key, const void *fdef)
+{
+ const char *name =
+ fdef ? ((const git_filter_def *)fdef)->filter_name : NULL;
+ return name ? -1 : git__strcmp(key, name);
+}
+
+static int filter_registry_find(size_t *pos, const char *name)
+{
+ return git_vector_search2(
+ pos, &git__filter_registry->filters, filter_def_name_key_check, name);
+}
+
+static git_filter_def *filter_registry_lookup(size_t *pos, const char *name)
+{
+ git_filter_def *fdef = NULL;
+
+ if (!filter_registry_find(pos, name))
+ fdef = git_vector_get(&git__filter_registry->filters, *pos);
+
+ return fdef;
+}
+
int git_filter_register(
const char *name, git_filter *filter, int priority)
{
@@ -129,7 +207,10 @@ int git_filter_register(
size_t nattr = 0, nmatch = 0;
git_buf attrs = GIT_BUF_INIT;
- if (git_filter_lookup(name) != NULL) {
+ if (filter_registry_initialize() < 0)
+ return -1;
+
+ if (!filter_registry_find(NULL, name)) {
giterr_set(
GITERR_FILTER, "Attempt to reregister existing filter '%s'", name);
return -1;
@@ -151,48 +232,13 @@ int git_filter_register(
filter_def_set_attrs(fdef);
- if (git_vector_insert(&git__filter_registry, fdef) < 0) {
+ if (git_vector_insert(&git__filter_registry->filters, fdef) < 0) {
git__free(fdef->attrdata);
git__free(fdef);
return -1;
}
- git_vector_sort(&git__filter_registry);
- return 0;
-}
-
-static int filter_def_name_key_check(const void *key, const void *fdef)
-{
- const char *name =
- fdef ? ((const git_filter_def *)fdef)->filter_name : NULL;
- return name ? -1 : git__strcmp(key, name);
-}
-
-static git_filter_def *filter_find_by_name(size_t *pos, const char *name)
-{
- git_filter_def *fdef = NULL;
-
- if (!git_vector_search2(
- pos, &git__filter_registry, filter_def_name_key_check, name))
- fdef = git_vector_get(&git__filter_registry, *pos);
-
- return fdef;
-}
-
-static int filter_initialize(git_filter_def *fdef)
-{
- int error = 0;
-
- if (!fdef->initialized &&
- fdef->filter &&
- fdef->filter->initialize &&
- (error = fdef->filter->initialize(fdef->filter)) < 0)
- {
- git_filter_unregister(fdef->filter_name);
- return error;
- }
-
- fdef->initialized = true;
+ git_vector_sort(&git__filter_registry->filters);
return 0;
}
@@ -207,12 +253,12 @@ int git_filter_unregister(const char *name)
return -1;
}
- if ((fdef = filter_find_by_name(&pos, name)) == NULL) {
+ if ((fdef = filter_registry_lookup(&pos, name)) == NULL) {
giterr_set(GITERR_FILTER, "Cannot find filter '%s' to unregister", name);
return GIT_ENOTFOUND;
}
- (void)git_vector_remove(&git__filter_registry, pos);
+ (void)git_vector_remove(&git__filter_registry->filters, pos);
if (fdef->initialized && fdef->filter && fdef->filter->shutdown) {
fdef->filter->shutdown(fdef->filter);
@@ -225,12 +271,33 @@ int git_filter_unregister(const char *name)
return 0;
}
+static int filter_initialize(git_filter_def *fdef)
+{
+ int error = 0;
+
+ if (!fdef->initialized &&
+ fdef->filter &&
+ fdef->filter->initialize &&
+ (error = fdef->filter->initialize(fdef->filter)) < 0)
+ {
+ /* auto-unregister if initialize fails */
+ git_filter_unregister(fdef->filter_name);
+ return error;
+ }
+
+ fdef->initialized = true;
+ return 0;
+}
+
git_filter *git_filter_lookup(const char *name)
{
size_t pos;
- git_filter_def *fdef = filter_find_by_name(&pos, name);
+ git_filter_def *fdef;
+
+ if (filter_registry_initialize() < 0)
+ return NULL;
- if (!fdef)
+ if ((fdef = filter_registry_lookup(&pos, name)) == NULL)
return NULL;
if (!fdef->initialized && filter_initialize(fdef) < 0)
@@ -239,14 +306,6 @@ git_filter *git_filter_lookup(const char *name)
return fdef->filter;
}
-static int filter_load_defaults(void)
-{
- if (!git_vector_length(&git__filter_registry))
- return git_filter_register(GIT_FILTER_CRLF, git_crlf_filter_new(), 0);
-
- return 0;
-}
-
git_repository *git_filter_source_repo(const git_filter_source *src)
{
return src->repo;
@@ -345,14 +404,14 @@ int git_filter_list_load(
size_t idx;
git_filter_def *fdef;
- if (filter_load_defaults() < 0)
+ if (filter_registry_initialize() < 0)
return -1;
src.repo = repo;
src.path = path;
src.mode = mode;
- git_vector_foreach(&git__filter_registry, idx, fdef) {
+ git_vector_foreach(&git__filter_registry->filters, idx, fdef) {
const char **values = NULL;
void *payload = NULL;