Skip to content

Upgrade batteries; fix build issues #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyastolfi merged 1 commit into from
Mar 9, 2026
Merged

Upgrade batteries; fix build issues #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def requirements(self):
VISIBLE = self.cor.VISIBLE
OVERRIDE = self.cor.OVERRIDE

self.requires("batteries/[>=0.63.0 <1]", **VISIBLE)
self.requires("batteries/[>=0.65.0 <1]", **VISIBLE)
self.requires("boost/[>=1.88.0 <2]", **VISIBLE)
self.requires("cli11/[>=2.5.0 <3]", **VISIBLE)
self.requires("glog/[>=0.7.1 <1]", **VISIBLE)
Expand Down
2 changes: 1 addition & 1 deletion src/llfs/page_allocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ bool PageAllocator::await_ref_count(PageId page_id, i32 ref_count)
if (prc.ref_count == ref_count) {
break;
}
batt::Task::sleep(boost::posix_time::milliseconds(1));
batt::Task::sleep(std::chrono::milliseconds(1));
++counter;

if ((counter & 4095) == 0) {
Expand Down
6 changes: 3 additions & 3 deletions src/llfs/volume.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,15 +634,15 @@ TEST_F(VolumeTest, TrimControl_VolumeReaderCloneLock)

for (int i = 0; i < 100; ++i) {
EXPECT_EQ(this->volume->trim_control().get_lower_bound(), reader->slot_range().lower_bound);
batt::Task::sleep(boost::posix_time::milliseconds(1));
batt::Task::sleep(std::chrono::milliseconds(1));
}

llfs::SlotReadLock cloned_lock = reader->clone_lock();
reader = batt::Status{batt::StatusCode::kUnknown};

for (int i = 0; i < 100; ++i) {
EXPECT_EQ(this->volume->trim_control().get_lower_bound(), cloned_lock.slot_range().lower_bound);
batt::Task::sleep(boost::posix_time::milliseconds(1));
batt::Task::sleep(std::chrono::milliseconds(1));
}

cloned_lock.clear();
Expand Down Expand Up @@ -696,7 +696,7 @@ TEST_F(VolumeTest, TrimControl_LastVolumeReaderCausesTrim)
while (!readers.empty()) {
for (int i = 0; i < 25; ++i) {
EXPECT_EQ(this->volume->trim_control().get_lower_bound(), 0u);
batt::Task::sleep(boost::posix_time::milliseconds(1));
batt::Task::sleep(std::chrono::milliseconds(1));
}
readers.pop_back();
}
Expand Down