static const uptr kRegionSize = 1 << kRegionSizeLog;
static const uptr kNumPossibleRegions = kSpaceSize / kRegionSize;
- struct ALIGNED(kCacheLineSize) SizeClassInfo {
+ struct SizeClassInfo {
SpinMutex mutex;
IntrusiveList<TransferBatch> free_list;
u32 rand_state;
+ char padding[kCacheLineSize - 2 * sizeof(uptr) -
+ sizeof(IntrusiveList<TransferBatch>)];
};
- COMPILER_CHECK(sizeof(SizeClassInfo) % kCacheLineSize == 0);
+ COMPILER_CHECK(sizeof(SizeClassInfo) == kCacheLineSize);
uptr ComputeRegionId(uptr mem) {
const uptr res = mem >> kRegionSizeLog;
}
SizeClassInfo *GetSizeClassInfo(uptr class_id) {
- DCHECK_LT(class_id, kNumClasses);
+ CHECK_LT(class_id, kNumClasses);
return &size_class_info_array[class_id];
}
}
SetReleaseToOSIntervalMs(release_to_os_interval_ms);
MapWithCallbackOrDie(SpaceEnd(), AdditionalSize());
- // Check that the RegionInfo array is aligned on the CacheLine size.
- DCHECK_EQ(SpaceEnd() & (kCacheLineSize - 1), 0);
}
s32 ReleaseToOSIntervalMs() const {
static uptr AdditionalSize() {
return RoundUpTo(sizeof(RegionInfo) * kNumClassesRounded,
- GetPageSizeCached());
+ GetPageSizeCached());
}
typedef SizeClassMap SizeClassMapT;
u64 last_released_bytes;
};
- struct ALIGNED(kCacheLineSize) RegionInfo {
+ struct RegionInfo {
BlockingMutex mutex;
uptr num_freed_chunks; // Number of elements in the freearray.
uptr mapped_free_array; // Bytes mapped for freearray.
Stats stats;
ReleaseToOsInfo rtoi;
};
- COMPILER_CHECK(sizeof(RegionInfo) % kCacheLineSize == 0);
+ COMPILER_CHECK(sizeof(RegionInfo) >= kCacheLineSize);
RegionInfo *GetRegionInfo(uptr class_id) const {
- DCHECK_LT(class_id, kNumClasses);
- RegionInfo *regions = reinterpret_cast<RegionInfo *>(SpaceEnd());
+ CHECK_LT(class_id, kNumClasses);
+ RegionInfo *regions =
+ reinterpret_cast<RegionInfo *>(SpaceBeg() + kSpaceSize);
return ®ions[class_id];
}
const uptr kWordSizeInBits = 8 * kWordSize;
#if defined(__powerpc__) || defined(__powerpc64__)
- constexpr uptr kCacheLineSize = 128;
+ const uptr kCacheLineSize = 128;
#else
- constexpr uptr kCacheLineSize = 64;
+ const uptr kCacheLineSize = 64;
#endif
-// Check that the CacheLine size is a power-of-two.
-COMPILER_CHECK((kCacheLineSize & (kCacheLineSize - 1)) == 0);
const uptr kMaxPathLength = 4096;