weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Use constexpr int instead of sizeof

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-30 15:36:46 -07:00
parent 0df09743da
commit 0cce9df8a8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ConflictSet.cpp
View File

@@ -4869,7 +4869,8 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
return; return;
} }
interleaved_insert::Result stackResults[100]; constexpr int kStackResultMax = 100;
interleaved_insert::Result stackResults[kStackResultMax];
constexpr int kConcurrent = 16; constexpr int kConcurrent = 16;
interleaved_insert::Job inProgress[kConcurrent]; interleaved_insert::Job inProgress[kConcurrent];
@@ -4879,8 +4880,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
context.root = root; context.root = root;
context.writes = writes; context.writes = writes;
context.results = stackResults; context.results = stackResults;
if (count > int(sizeof(stackResults) / sizeof(stackResults[0]))) if (count > kStackResultMax) [[unlikely]] {
[[unlikely]] {
context.results = (interleaved_insert::Result *)safe_malloc( context.results = (interleaved_insert::Result *)safe_malloc(
count * sizeof(interleaved_insert::Result)); count * sizeof(interleaved_insert::Result));
} }
@@ -4982,8 +4982,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
} }
} }
if (count > int(sizeof(stackResults) / sizeof(stackResults[0]))) if (count > kStackResultMax) [[unlikely]] {
[[unlikely]] {
safe_free(context.results, count * sizeof(interleaved_insert::Result)); safe_free(context.results, count * sizeof(interleaved_insert::Result));
} }
} }