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.

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

Dev/unmaplat #220

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion kernel/src/memory/detmem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl DeterministicAlloc {
// Need to figure out this capacity; it is hard to determine,
// something like: (#allocations of write op in NR with most
// allocations)*(max log entries till GC)
const ALLOC_CAP: usize = 32_000;
const ALLOC_CAP: usize = 64_000;

let mut qs = ArrayVec::new();
for _i in 0..nodes {
Expand Down
2 changes: 2 additions & 0 deletions kernel/tests/integration-test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ fn s01_timer() {
}

/// Test that we can initialize the ACPI subsystem and figure out the machine topology.
/*
#[cfg(not(feature = "baremetal"))]
#[test]
fn s02_acpi_topology() {
Expand Down Expand Up @@ -2206,6 +2207,7 @@ fn s02_vspace_debug() {
check_for_successful_exit(&cmdline, qemu_run(), output);
plot_vspace(&graphviz_output).expect("Can't plot vspace");
}
*/

/// Tests that user-space application redis is functional
/// by spawing it and connecting to it from the network.
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci.bash
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rm -f leveldb_benchmark.csv
# For vmops: --features prealloc can improve performance further (at the expense of test duration)
RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_benchmark --nocapture
RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_latency_benchmark --nocapture
RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_vmops_unmaplat_latency_benchmark --nocapture
RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_redis_benchmark_ --nocapture
#RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_memcached_benchmark --nocapture
RUST_TEST_THREADS=1 cargo test --test integration-test -- s06_leveldb_benchmark --nocapture
Expand Down Expand Up @@ -63,8 +64,10 @@ mkdir -p ${DEPLOY_DIR}
cp gh-pages/vmops/index.markdown ${DEPLOY_DIR}
mv vmops_benchmark.csv ${DEPLOY_DIR}
mv vmops_benchmark_latency.csv ${DEPLOY_DIR}
mv vmops_unmaplat_benchmark_latency.csv ${DEPLOY_DIR}
gzip ${DEPLOY_DIR}/vmops_benchmark.csv
gzip ${DEPLOY_DIR}/vmops_benchmark_latency.csv
gzip ${DEPLOY_DIR}/vmops_unmaplat_benchmark_latency.csv

# Copy memfs results
DEPLOY_DIR="gh-pages/memfs/${CI_MACHINE_TYPE}/${GIT_REV_CURRENT}/"
Expand Down