Skip to content

Commit bffe573

Browse files
rename store apis
1 parent 6e86196 commit bffe573

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

examples/game-of-life/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn read_framebuf(store: &Store, ptr: usize, len: usize) -> &[u32] {
2727
}
2828

2929
fn save_snapshot(store: &Store, path: &str) {
30-
let bytes = store.snapshot();
30+
let bytes = store.to_bytes();
3131
if let Err(e) = std::fs::write(path, &bytes) {
3232
eprintln!("failed to write snapshot: {e}");
3333
} else {
@@ -36,7 +36,7 @@ fn save_snapshot(store: &Store, path: &str) {
3636
}
3737

3838
fn fork_snapshot(store: &Store, parent_x: i32, parent_y: i32) {
39-
let bytes = store.snapshot();
39+
let bytes = store.to_bytes();
4040

4141
let id = std::time::SystemTime::now()
4242
.duration_since(std::time::UNIX_EPOCH)
@@ -225,7 +225,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
225225

226226
let (mut store, instance) = if let Some(path) = restore_path {
227227
let bytes = std::fs::read(path)?;
228-
let store = Store::from_snapshot(&bytes);
228+
let store = Store::from_bytes(&bytes);
229229
let instance = store.instance(0);
230230
(store, instance)
231231
} else {

gabagool-wasip1/src/ctx.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,11 +1494,11 @@ mod tests {
14941494
dispatched += 1;
14951495

14961496
if dispatched == 2 {
1497-
let store_snap = store.snapshot();
1497+
let store_snap = store.to_bytes();
14981498
let mut wasi_snap = Vec::new();
14991499
wasi.encode(&mut wasi_snap);
15001500

1501-
let mut restored = Store::from_snapshot(&store_snap);
1501+
let mut restored = Store::from_bytes(&store_snap);
15021502
let mut wasi2 = WasiCtx::decode(&mut &wasi_snap[..]);
15031503

15041504
let results = wasi2.dispatch(&mut restored, &func_name, &args);
@@ -1559,11 +1559,11 @@ mod tests {
15591559
dispatched += 1;
15601560

15611561
if dispatched == 5 {
1562-
let store_snap = store.snapshot();
1562+
let store_snap = store.to_bytes();
15631563
let mut wasi_snap = Vec::new();
15641564
wasi.encode(&mut wasi_snap);
15651565

1566-
let mut restored = Store::from_snapshot(&store_snap);
1566+
let mut restored = Store::from_bytes(&store_snap);
15671567
let mut wasi2 = WasiCtx::decode(&mut &wasi_snap[..]);
15681568

15691569
let results = wasi2.dispatch(&mut restored, &func_name, &args);

gabagool/src/debugger.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl Debugger {
103103
self.store.set_fuel(0);
104104
self.store.invoke(self.instance, func_name, args)?;
105105

106-
let snapshot = self.store.snapshot();
106+
let snapshot = self.store.to_bytes();
107107
self.history.push(Entry {
108108
timestamp: 0,
109109
value: snapshot,
@@ -230,7 +230,7 @@ impl Debugger {
230230
{
231231
self.history.push(Entry {
232232
timestamp: self.instruction_count,
233-
value: self.store.snapshot(),
233+
value: self.store.to_bytes(),
234234
})
235235
}
236236

@@ -258,7 +258,7 @@ impl Debugger {
258258
.find_nearest_before(self.instruction_count - 1)
259259
.expect("should always exist since we snapshot at instr count = 0!");
260260

261-
self.store = Store::from_snapshot(&nearest_snapshot.value);
261+
self.store = Store::from_bytes(&nearest_snapshot.value);
262262

263263
let steps_to_replay = self.instruction_count - 1 - nearest_snapshot.timestamp;
264264
self.store.set_fuel(steps_to_replay);

gabagool/src/store.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3577,7 +3577,7 @@ fn const_pop_i64(stack: &mut Vec<RawValue>) -> Result<i64> {
35773577
}
35783578

35793579
impl Store {
3580-
pub fn snapshot(&self) -> Vec<u8> {
3580+
pub fn to_bytes(&self) -> Vec<u8> {
35813581
let mut buf = Vec::new();
35823582

35833583
buf.extend_from_slice(SNAPSHOT_MAGIC);
@@ -3675,7 +3675,7 @@ impl Store {
36753675
buf
36763676
}
36773677

3678-
pub fn from_snapshot(bytes: &[u8]) -> Self {
3678+
pub fn from_bytes(bytes: &[u8]) -> Self {
36793679
let buf = &mut &bytes[..];
36803680

36813681
let magic: [u8; 4] = buf[..4].try_into().unwrap();

gabagool/tests/component_runtime_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ fn component_snapshot_add() {
194194

195195
assert!(matches!(state, ExecutionState::FuelExhausted));
196196

197-
let snapshot = store.snapshot();
198-
let mut restored = Store::from_snapshot(&snapshot);
197+
let snapshot = store.to_bytes();
198+
let mut restored = Store::from_bytes(&snapshot);
199199
restored.set_fuel(u64::MAX);
200200

201201
let result = restored

gabagool/tests/programs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ fn snapshot_roundtrip(wasm_path: &str, func: &str, args: Vec<RawValue>, fuel: u6
3333
assert!(matches!(state, gabagool::ExecutionState::FuelExhausted));
3434
assert!(store.is_paused());
3535

36-
let snapshot = store.snapshot();
37-
let mut restored = Store::from_snapshot(&snapshot);
36+
let snapshot = store.to_bytes();
37+
let mut restored = Store::from_bytes(&snapshot);
3838

3939
restored.set_fuel(u64::MAX);
4040
let result = restored.resume().unwrap().into_completed().unwrap();

0 commit comments

Comments
 (0)