diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-07 14:47:55 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-07 14:47:55 -0700 |
| commit | 9e3af382fb93a2194f35986553d06931ba5adb90 (patch) | |
| tree | f9e1cdae90e6dfe34cae62a4ac924913278c79ed /src/core/ext/census/mlog.c | |
| parent | e5a1b2b087c560b7c8ca3bd21a86875d502b1095 (diff) | |
| parent | 8941f607d682d49f0b7c901bffd3e52941e4c5f9 (diff) | |
Merge github.com:grpc/grpc into stats_histo
Diffstat (limited to 'src/core/ext/census/mlog.c')
| -rw-r--r-- | src/core/ext/census/mlog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ext/census/mlog.c b/src/core/ext/census/mlog.c index 937ceb101b..4b8c8466b3 100644 --- a/src/core/ext/census/mlog.c +++ b/src/core/ext/census/mlog.c @@ -467,7 +467,8 @@ void census_log_initialize(size_t size_in_mb, int discard_old_records) { g_log.blocks = (cl_block*)gpr_malloc_aligned( g_log.num_blocks * sizeof(cl_block), GPR_CACHELINE_SIZE_LOG); memset(g_log.blocks, 0, g_log.num_blocks * sizeof(cl_block)); - g_log.buffer = gpr_malloc(g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); + g_log.buffer = + (char*)gpr_malloc(g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); memset(g_log.buffer, 0, g_log.num_blocks * CENSUS_LOG_MAX_RECORD_SIZE); cl_block_list_initialize(&g_log.free_block_list); cl_block_list_initialize(&g_log.dirty_block_list); |