Skip to content

Commit 9e0a5bf

Browse files
committed
Migrate some more things
1 parent e5d3d89 commit 9e0a5bf

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static constexpr std::chrono::milliseconds kZeroMs{0};
150150
static constexpr std::chrono::milliseconds kMeshPeriodMs{100}; // 100 ms
151151

152152
// controls aspects of miniheaps
153-
static constexpr size_t kMaxMeshes = 256; // 1 per bit
153+
static constexpr size_t kMaxMeshes = kMaxShuffleVectorLength; // 1 per bit
154154
#ifdef __APPLE__
155155
static constexpr size_t kArenaSize = 32ULL * 1024ULL * 1024ULL * 1024ULL; // 16 GB
156156
#else

src/global_heap.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ shiftedSplitting(MWC &prng, MiniHeapListEntry *miniheaps, SplitArray &left, Spli
505505
return;
506506
}
507507

508-
constexpr size_t nBytes = 32;
508+
constexpr size_t nBytes = kMaxShuffleVectorLength / 8;
509509
const size_t limit = rightSize < t ? rightSize : t;
510510
d_assert(nBytes == left[0]->bitmap().byteCount());
511511

src/mac_wrapper.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ MESH_EXPORT void replace_malloc_destroy_zone(malloc_zone_t *) {
306306
MESH_EXPORT kern_return_t replace_malloc_get_all_zones(task_t, memory_reader_t, vm_address_t **addresses,
307307
unsigned *count) {
308308
*addresses = 0;
309+
// FIXME: this produces a warning by clang, so maybe this should have a *?
309310
count = 0;
310311
return KERN_SUCCESS;
311312
}

0 commit comments

Comments
 (0)