diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 16:22:54 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-16 16:26:24 +1000 |
| commit | 7693fa59c4470db729d85af99fb9cc3b264fa8c8 (patch) | |
| tree | ae2747db581d28abb65251754cf735074eebafc7 /src/third_party/wiredtiger/src/os_common | |
| parent | 2c15ad73fb47d7697e05fb2b7972021b87a56452 (diff) | |
| download | mongo-7693fa59c4470db729d85af99fb9cc3b264fa8c8.tar.gz | |
Import wiredtiger: 5bc03723a7e77c96b1d5e45a97173654872c727a from branch mongodb-3.4
ref: deeb0f589a..5bc03723a7
for: 3.3.13
WT-2859 Improve statistics macros to not collect stats when statistics=none is set
WT-2894 Create workload that shows negative scaling when overwhelmed
WT-2900 Add ARM8 build support to WiredTiger and fix ARM CRC assembler tags
WT-2902 Enhance eviction to work better with update heavy YCSB load
WT-2905 dead code: MongoDB Coverity #99881
WT-2908 Add dry-run support to python unit-test
WT-2910 test_inmem01 can abort due to stuck cache
WT-2911 add support for gcc6
WT-2912 make --enable-strict run on the zseries test box
WT-2913 stuck cache after latest merge
WT-2914 Fix link error on OS/X for checksum_init call
WT-2916 whitespace check not working
Diffstat (limited to 'src/third_party/wiredtiger/src/os_common')
| -rw-r--r-- | src/third_party/wiredtiger/src/os_common/os_alloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/os_common/os_alloc.c b/src/third_party/wiredtiger/src/os_common/os_alloc.c index cfc7b80450e..bfe5efafc8b 100644 --- a/src/third_party/wiredtiger/src/os_common/os_alloc.c +++ b/src/third_party/wiredtiger/src/os_common/os_alloc.c @@ -46,7 +46,7 @@ __wt_calloc(WT_SESSION_IMPL *session, size_t number, size_t size, void *retp) WT_ASSERT(session, number != 0 && size != 0); if (session != NULL) - WT_STAT_FAST_CONN_INCR(session, memory_allocation); + WT_STAT_CONN_INCR(session, memory_allocation); if ((p = calloc(number, size)) == NULL) WT_RET_MSG(session, __wt_errno(), @@ -79,7 +79,7 @@ __wt_malloc(WT_SESSION_IMPL *session, size_t bytes_to_allocate, void *retp) WT_ASSERT(session, bytes_to_allocate != 0); if (session != NULL) - WT_STAT_FAST_CONN_INCR(session, memory_allocation); + WT_STAT_CONN_INCR(session, memory_allocation); if ((p = malloc(bytes_to_allocate)) == NULL) WT_RET_MSG(session, __wt_errno(), @@ -121,9 +121,9 @@ __realloc_func(WT_SESSION_IMPL *session, if (session != NULL) { if (p == NULL) - WT_STAT_FAST_CONN_INCR(session, memory_allocation); + WT_STAT_CONN_INCR(session, memory_allocation); else - WT_STAT_FAST_CONN_INCR(session, memory_grow); + WT_STAT_CONN_INCR(session, memory_grow); } if ((p = realloc(p, bytes_to_allocate)) == NULL) @@ -216,7 +216,7 @@ __wt_realloc_aligned(WT_SESSION_IMPL *session, bytes_to_allocate = WT_ALIGN(bytes_to_allocate, S2C(session)->buffer_alignment); - WT_STAT_FAST_CONN_INCR(session, memory_allocation); + WT_STAT_CONN_INCR(session, memory_allocation); if ((ret = posix_memalign(&newp, S2C(session)->buffer_alignment, @@ -302,7 +302,7 @@ __wt_free_int(WT_SESSION_IMPL *session, const void *p_arg) * This function MUST handle a NULL WT_SESSION_IMPL handle. */ if (session != NULL) - WT_STAT_FAST_CONN_INCR(session, memory_free); + WT_STAT_CONN_INCR(session, memory_free); free(p); } |