Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion crates/tracedecay-cli/tests/core_cli_suite/monitor_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use tempfile::TempDir;
fn write(dir: &Path, project: &Path, prefix: &str, tool: &str, delta: u64, before: u64) {
tracedecay_session_memory::monitor_ring::write_entry_to(
dir, project, prefix, tool, delta, before,
);
)
.expect("write monitor fixture entry");
}

/// Helper: open reader at a specific mmap dir.
Expand Down
42 changes: 34 additions & 8 deletions crates/tracedecay-session-memory/src/monitor_ring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@ impl MonitorEntry {
/// `dir`.
///
/// `project_root` is used to derive the folder name. `prefix` identifies
/// the tool suite (e.g. "tracedecay"). Best-effort: silently returns on
/// any failure.
/// the tool suite (e.g. "tracedecay"). Writer failures are returned to
/// the caller so accounting can report a degraded live-monitor projection.
pub fn write_entry_to(
dir: &Path,
project_root: &Path,
prefix: &str,
tool_name: &str,
delta: u64,
before: u64,
) {
let _ = std::fs::create_dir_all(dir);
) -> std::io::Result<()> {
std::fs::create_dir_all(dir)?;
let mmap_path = dir.join(MMAP_FILENAME);
let project = project_root
.file_name()
.map_or_default(|n| n.to_string_lossy().to_string());
let _ = write_entry_inner(&mmap_path, prefix, &project, tool_name, delta, before);
write_entry_inner(&mmap_path, prefix, &project, tool_name, delta, before)
}

fn write_str(mmap: &mut memmap2::MmapMut, offset: usize, value: &str) {
Expand Down Expand Up @@ -326,7 +326,8 @@ mod tests {
fn write_values(dir: &Path, values: std::ops::RangeInclusive<u64>) {
let project = Path::new("/projects/alpha");
for value in values {
write_entry_to(dir, project, "tracedecay", "search", value, 0);
write_entry_to(dir, project, "tracedecay", "search", value, 0)
.expect("write monitor entry");
}
}

Expand Down Expand Up @@ -442,16 +443,41 @@ mod tests {
);
}

#[test]
fn writer_reports_unavailable_directory_and_ring_without_clobbering_them() {
let dir = tempfile::tempdir().expect("monitor fixture directory");
let project = Path::new("/projects/alpha");

// A non-directory owner path cannot be turned into a monitor cache.
let occupied_dir = dir.path().join("occupied");
std::fs::write(&occupied_dir, b"owner data").expect("create occupied path");
write_entry_to(&occupied_dir, project, "tracedecay", "search", 7, 10)
.expect_err("a file used as the monitor directory must be refused");
assert_eq!(
std::fs::read(&occupied_dir).expect("read original owner file"),
b"owner data"
);

// Opening a directory as the mmap is a separate post-mkdir failure.
let occupied_ring = dir.path().join(MMAP_FILENAME);
std::fs::create_dir(&occupied_ring).expect("create occupied mmap path");
write_entry_to(dir.path(), project, "tracedecay", "search", 7, 10)
.expect_err("an occupied mmap path must be refused");
assert!(occupied_ring.is_dir());
}

/// Writers no longer msync, so an already-open reader must still observe
/// every entry through its existing mapping, without a refresh.
#[test]
fn open_reader_observes_every_unflushed_entry() {
let dir = tempfile::tempdir().expect("monitor dir");
let project = tempfile::tempdir().expect("project dir");
write_entry_to(dir.path(), project.path(), "tracedecay", "first", 1, 2);
write_entry_to(dir.path(), project.path(), "tracedecay", "first", 1, 2)
.expect("write initial monitor entry");
let reader = MmapReader::open_at(dir.path()).expect("open monitor");
for call in 1..40_u64 {
write_entry_to(dir.path(), project.path(), "tracedecay", "poll", call, 2);
write_entry_to(dir.path(), project.path(), "tracedecay", "poll", call, 2)
.expect("write monitor poll entry");
}
assert_eq!(reader.write_idx(), 40);
let last = reader.entry(39).expect("last slot");
Expand Down
4 changes: 3 additions & 1 deletion crates/tracedecay/src/mcp/server/freshness_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ async fn savings_without_a_display_baseline_still_commit_to_the_project_store()
let (cg, _dir, _authority) = init_indexed_repo().await;
assert_eq!(cg.get_tokens_saved().await.unwrap(), 0);

super::ledger::commit_token_savings(&cg, None, super::ledger::LedgerSink::NotMounted, 13).await;
super::ledger::commit_token_savings(&cg, None, super::ledger::LedgerSink::NotMounted, 13, None)
.await;
assert_eq!(cg.get_tokens_saved().await.unwrap(), 13);
assert_eq!(cg.get_local_counter().await.unwrap(), 13);

Expand All @@ -96,6 +97,7 @@ async fn savings_without_a_display_baseline_still_commit_to_the_project_store()
Some(&display),
super::ledger::LedgerSink::NotMounted,
7,
None,
)
.await;
assert_eq!(display.load(Ordering::Relaxed), 20);
Expand Down
Loading
Loading