aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2020-06-10 20:33:46 -0400
committerDeterminant <[email protected]>2020-06-10 20:33:46 -0400
commitee0767924a8cff8d9926c245f6edefeb36b573c2 (patch)
tree6ab1edf8b6f3c101167a353518626e691aff1e95
parente7e665da7f7d6a111446b34a673d443214b1aac1 (diff)
...
-rw-r--r--src/wal.rs7
-rw-r--r--tests/common/mod.rs48
2 files changed, 39 insertions, 16 deletions
diff --git a/src/wal.rs b/src/wal.rs
index 1cbe8c1..dd41045 100644
--- a/src/wal.rs
+++ b/src/wal.rs
@@ -22,12 +22,17 @@ pub type WALBytes = Box<[u8]>;
pub type WALFileId = u64;
pub type WALPos = u64;
-#[derive(Eq, PartialEq, Copy, Clone, Debug)]
+#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash)]
pub struct WALRingId {
start: WALPos,
end: WALPos
}
+impl WALRingId {
+ pub fn get_start(&self) -> WALPos { self.start }
+ pub fn get_end(&self) -> WALPos { self.end }
+}
+
impl Ord for WALRingId {
fn cmp(&self, other: &WALRingId) -> std::cmp::Ordering {
other.start.cmp(&self.start).then_with(|| other.end.cmp(&self.end))
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 209e8af..18918bf 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -232,10 +232,9 @@ fn test_paint_strokes() {
}
}
-type CanvasTrace = Vec<(u32, u32)>;
-
pub struct Canvas {
- queue: IndexMap<u32, VecDeque<u32>>,
+ waiting: HashMap<WALPos, usize>,
+ queue: IndexMap<u32, VecDeque<(u32, WALPos)>>,
canvas: Box<[u32]>
}
@@ -246,40 +245,59 @@ impl Canvas {
canvas.resize(size, 0);
let canvas = canvas.into_boxed_slice();
Canvas {
+ waiting: HashMap::new(),
queue: IndexMap::new(),
canvas
}
}
- fn get_queued(&mut self, pos: u32) -> &mut VecDeque<u32> {
+ fn get_waiting(&mut self, sid: WALPos) -> &mut usize {
+ match self.waiting.entry(sid) {
+ hash_map::Entry::Occupied(e) => e.into_mut(),
+ hash_map::Entry::Vacant(e) => e.insert(0)
+ }
+ }
+
+ fn get_queued(&mut self, pos: u32) -> &mut VecDeque<(u32, WALPos)> {
match self.queue.entry(pos) {
Entry::Occupied(e) => e.into_mut(),
Entry::Vacant(e) => e.insert(VecDeque::new())
}
}
- pub fn prepaint(&mut self, strokes: &PaintStrokes) {
+ pub fn prepaint(&mut self, strokes: &PaintStrokes, sid: &WALPos) {
+ let sid = *sid;
+ let mut nwait = 0;
for (s, e, c) in strokes.0.iter() {
for i in *s..*e {
- self.get_queued(i).push_back(*c)
+ nwait += 1;
+ self.get_queued(i).push_back((*c, sid))
}
}
+ *self.get_waiting(sid) += nwait
}
// TODO: allow customized scheduler
- pub fn rand_paint<R: rand::Rng>(&mut self, rng: &mut R) -> u32 {
+ /// Schedule to paint one position, randomly. It optionally returns a finished batch write
+ /// identified by its start position of WALRingId.
+ pub fn rand_paint<R: rand::Rng>(&mut self, rng: &mut R) -> (Option<WALPos>, u32) {
println!("{}", self.queue.len());
let idx = rng.gen_range(0, self.queue.len());
let (pos, _) = self.queue.get_index_mut(idx).unwrap();
let pos = *pos;
- self.paint(pos);
- pos
+ (self.paint(pos), pos)
}
- pub fn paint(&mut self, pos: u32) {
+ pub fn paint(&mut self, pos: u32) -> Option<WALPos> {
let q = self.queue.get_mut(&pos).unwrap();
- self.canvas[pos as usize] = q.pop_front().unwrap();
+ let (c, sid) = q.pop_front().unwrap();
if q.is_empty() { self.queue.remove(&pos); }
+ self.canvas[pos as usize] = c;
+ let cnt = self.waiting.get_mut(&sid).unwrap();
+ *cnt -= 1;
+ if *cnt == 0 {
+ Some(sid)
+ } else { None }
}
pub fn is_same(&self, other: &Canvas) -> bool {
@@ -298,10 +316,10 @@ fn test_canvas() {
s2.stroke(1, 2, 2);
assert!(canvas1.is_same(&canvas2));
assert!(!canvas2.is_same(&canvas3));
- canvas1.prepaint(&s1);
- canvas1.prepaint(&s2);
- canvas2.prepaint(&s1);
- canvas2.prepaint(&s2);
+ canvas1.prepaint(&s1, &0);
+ canvas1.prepaint(&s2, &0);
+ canvas2.prepaint(&s1, &0);
+ canvas2.prepaint(&s2, &0);
assert!(canvas1.is_same(&canvas2));
RNG.with(|rng| canvas1.rand_paint(&mut *rng.borrow_mut()));
assert!(!canvas1.is_same(&canvas2));