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

Remove a branch in happy path in addWrites

Browse Source
This commit is contained in:
Andrew Noyes
2024-08-01 10:28:50 -07:00
parent f21dde06d3
commit 4cdf6deb50
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ConflictSet.cpp
View File

@@ -3174,19 +3174,24 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
assert(writeVersion >= newestVersionFullPrecision); assert(writeVersion >= newestVersionFullPrecision);
if (writeVersion > newestVersionFullPrecision + kNominalVersionWindow) { if (oldestExtantVersion < writeVersion - kMaxCorrectVersionWindow)
destroyTree(root); [[unlikely]] {
init(writeVersion - kNominalVersionWindow); if (writeVersion > newestVersionFullPrecision + kNominalVersionWindow) {
} destroyTree(root);
init(writeVersion - kNominalVersionWindow);
}
newestVersionFullPrecision = writeVersion; newestVersionFullPrecision = writeVersion;
newest_version.set(newestVersionFullPrecision); newest_version.set(newestVersionFullPrecision);
setOldestVersion( setOldestVersion(newestVersionFullPrecision - kNominalVersionWindow);
std::max(oldestVersionFullPrecision, while (oldestExtantVersion <
newestVersionFullPrecision - kNominalVersionWindow)); newestVersionFullPrecision - kMaxCorrectVersionWindow) {
while (oldestExtantVersion < gcScanStep(1000);
newestVersionFullPrecision - kMaxCorrectVersionWindow) { }
gcScanStep(1000); } else {
newestVersionFullPrecision = writeVersion;
newest_version.set(newestVersionFullPrecision);
setOldestVersion(newestVersionFullPrecision - kNominalVersionWindow);
} }
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {