equal
deleted
inserted
replaced
26 + valloc = NODIRECT; |
26 + valloc = NODIRECT; |
27 +}; |
27 +}; |
28 diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp |
28 diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp |
29 --- a/storage/mozStorageService.cpp |
29 --- a/storage/mozStorageService.cpp |
30 +++ b/storage/mozStorageService.cpp |
30 +++ b/storage/mozStorageService.cpp |
31 @@ -514,9 +514,14 @@ |
31 @@ -528,9 +528,14 @@ |
32 int rc; |
32 int rc; |
33 |
33 |
34 #ifdef MOZ_STORAGE_MEMORY |
34 #ifdef MOZ_STORAGE_MEMORY |
35 - rc = ::sqlite3_config(SQLITE_CONFIG_MALLOC, &memMethods); |
35 - rc = ::sqlite3_config(SQLITE_CONFIG_MALLOC, &memMethods); |
36 - if (rc != SQLITE_OK) |
36 - if (rc != SQLITE_OK) |
43 + return convertResultCode(rc); |
43 + return convertResultCode(rc); |
44 + } |
44 + } |
45 + free(test_jemalloc); |
45 + free(test_jemalloc); |
46 #endif |
46 #endif |
47 |
47 |
48 // Explicitly initialize sqlite3. Although this is implicitly called by |
48 // TODO (bug 1191405): do not preallocate the connections caches until we |
49 diff --git a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
49 diff --git a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
50 --- a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
50 --- a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
51 +++ b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
51 +++ b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in |
52 @@ -184,6 +184,9 @@ static const bool config_cache_oblivious |
52 @@ -184,6 +184,9 @@ static const bool config_cache_oblivious |
53 #include "jemalloc/internal/jemalloc_internal_macros.h" |
53 #include "jemalloc/internal/jemalloc_internal_macros.h" |