diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2017-02-22 16:30:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 16:30:57 +0100 |
| commit | c03f00ea9c83ccb6ca44d0760bfec5f21cfc9282 (patch) | |
| tree | 7ee8216ca260c17c68775cfe6e7f17c9166400eb | |
| parent | 86201b92c336b3bbabe57a661cfe651ae9af4288 (diff) | |
| parent | ce6f61daf0e1985d615e640102b5496ff92e401c (diff) | |
| download | libgit2-c03f00ea9c83ccb6ca44d0760bfec5f21cfc9282.tar.gz | |
Merge pull request #4131 from pks-t/pks/attrcache-cleanups
Attrcache cleanups
| -rw-r--r-- | src/attrcache.c | 15 | ||||
| -rw-r--r-- | src/attrcache.h | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/attrcache.c b/src/attrcache.c index 6cac14bc3..4df14ee2c 100644 --- a/src/attrcache.c +++ b/src/attrcache.c @@ -103,8 +103,11 @@ static int attr_cache_upsert(git_attr_cache *cache, git_attr_file *file) GIT_REFCOUNT_OWN(file, entry); GIT_REFCOUNT_INC(file); - old = git__compare_and_swap( - &entry->file[file->source], entry->file[file->source], file); + /* + * Replace the existing value if another thread has + * created it in the meantime. + */ + old = git__swap(entry->file[file->source], file); if (old) { GIT_REFCOUNT_OWN(old, NULL); @@ -309,7 +312,7 @@ static void attr_cache__free(git_attr_cache *cache) if (!cache) return; - unlock = (git_mutex_lock(&cache->lock) == 0); + unlock = (attr_cache_lock(cache) == 0); if (cache->files != NULL) { git_attr_file_entry *entry; @@ -345,13 +348,13 @@ static void attr_cache__free(git_attr_cache *cache) cache->cfg_excl_file = NULL; if (unlock) - git_mutex_unlock(&cache->lock); + attr_cache_unlock(cache); git_mutex_free(&cache->lock); git__free(cache); } -int git_attr_cache__do_init(git_repository *repo) +int git_attr_cache__init(git_repository *repo) { int ret = 0; git_attr_cache *cache = git_repository_attr_cache(repo); @@ -429,7 +432,7 @@ int git_attr_cache__insert_macro(git_repository *repo, git_attr_rule *macro) if (macro->assigns.length == 0) return 0; - if (git_mutex_lock(&cache->lock) < 0) { + if (attr_cache_lock(cache) < 0) { giterr_set(GITERR_OS, "unable to get attr cache lock"); error = -1; } else { diff --git a/src/attrcache.h b/src/attrcache.h index 44e1ffdce..b91edd3e8 100644 --- a/src/attrcache.h +++ b/src/attrcache.h @@ -22,10 +22,7 @@ typedef struct { git_pool pool; } git_attr_cache; -extern int git_attr_cache__do_init(git_repository *repo); - -#define git_attr_cache__init(REPO) \ - (git_repository_attr_cache(REPO) ? 0 : git_attr_cache__do_init(REPO)) +extern int git_attr_cache__init(git_repository *repo); /* get file - loading and reload as needed */ extern int git_attr_cache__get( |