diff options
| author | Vicent Martà <vicent@github.com> | 2013-04-23 11:48:12 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-04-23 11:48:12 -0700 |
| commit | 7915e6cc66a28d0767fc9899e58b2ca544ee12d0 (patch) | |
| tree | 9ab7355df505fcb0b9c2b210212321b752f0ec12 /src/util.c | |
| parent | 6c9dc12b6a86290af63ed11f1209ebad91e3e1ca (diff) | |
| parent | a2378ae4fee55c95eb9a1f6b44f5a837d39fa724 (diff) | |
| download | libgit2-7915e6cc66a28d0767fc9899e58b2ca544ee12d0.tar.gz | |
Merge pull request #1498 from libgit2/vmg/atomic64
64 bit atomic operations and shared cache memory usage
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index c3fc69756..ce67c7e62 100644 --- a/src/util.c +++ b/src/util.c @@ -39,7 +39,6 @@ int git_libgit2_capabilities() /* Declarations for tuneable settings */ extern size_t git_mwindow__window_size; extern size_t git_mwindow__mapped_limit; -extern size_t git_odb__cache_size; static int config_level_to_futils_dir(int config_level) { @@ -104,12 +103,17 @@ int git_libgit2_opts(int key, ...) } case GIT_OPT_SET_CACHE_MAX_SIZE: - git_cache__max_storage = va_arg(ap, size_t); + git_cache__max_storage = va_arg(ap, int64_t); break; case GIT_OPT_ENABLE_CACHING: git_cache__enabled = (va_arg(ap, int) != 0); break; + + case GIT_OPT_GET_CACHED_MEMORY: + *(va_arg(ap, int64_t *)) = git_cache__current_storage.val; + *(va_arg(ap, int64_t *)) = git_cache__max_storage; + break; } va_end(ap); |