Skip to content
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

Try to fix the continue free bug #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Try to fix the continue free bug #3

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
27 changes: 26 additions & 1 deletion src/stm/journal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ use crate::stm::vspd::Scratchpad;

/// Determines that the changes are committed
pub const JOURNAL_COMMITTED: u64 = 0x0000_0001;
/// Determines that the changes are committed
pub const JOURNAL_CONTINUE_COMMIT: u64 = 0x0000_0002;

/// A Journal object to be used for writing logs onto
///
Expand Down Expand Up @@ -237,6 +239,11 @@ impl<A: MemPool> Journal<A> {
self.is_set(JOURNAL_COMMITTED)
}

/// Returns true if the journal needs to continue committing
pub fn is_continue_commit(&self) -> bool {
self.is_set(JOURNAL_CONTINUE_COMMIT)
}

/// Sets a flag
pub unsafe fn set(&mut self, flag: u64) {
self.flags |= flag;
Expand Down Expand Up @@ -438,6 +445,9 @@ impl<A: MemPool> Journal<A> {
page.commit_data();
curr = page.next;
}
self.set(JOURNAL_CONTINUE_COMMIT);
sfence();

let mut curr = self.pages;
while let Some(page) = curr.as_option() {
page.commit_dealloc(
Expand Down Expand Up @@ -492,7 +502,22 @@ impl<A: MemPool> Journal<A> {
}
let mut curr = self.pages;
let resume = self.resume();
if !self.is_set(JOURNAL_COMMITTED) || resume {
if self.is_continue_commit() {
while let Some(page) = curr.as_option() {
page.commit_dealloc(
#[cfg(feature = "check_double_free")]
check_double_free
);
curr = page.next;
}
sfence();
self.set(JOURNAL_COMMITTED);
self.clear(
#[cfg(feature = "check_double_free")]
&mut *Self::dealloc_history()
);
}
else if !self.is_set(JOURNAL_COMMITTED) || resume {
let rollback = !resume || !self.is_set(JOURNAL_COMMITTED);
#[cfg(any(feature = "use_pspd", feature = "use_vspd"))] {
if rollback {
Expand Down