Minor tweaks

Author: mkeeter

downstairs/src/dynamometer.rs

@@ -83,7 +83,10 @@ pub async fn dynamometer(
                     .collect();
 
                 let io_operation_time = Instant::now();
-                region.region_write(&writes, JobId(1000), false).await?;
+                let pre = PrecomputedWrite::from_writes(&writes);
+                region
+                    .region_write_pre(&writes, &pre, JobId(1000), false)
+                    .await?;
 
                 total_io_time += io_operation_time.elapsed();
                 io_operations_sent += num_writes;

downstairs/src/lib.rs

@@ -327,7 +327,10 @@ pub async fn downstairs_import<P: AsRef<Path> + std::fmt::Debug>(
         }
 
         // We have no job ID, so it makes no sense for accounting.
-        region.region_write(&writes, JobId(0), false).await?;
+        let pre = PrecomputedWrite::from_writes(&writes);
+        region
+            .region_write_pre(&writes, &pre, JobId(0), false)
+            .await?;
 
         assert_eq!(nblocks, pos);
         assert_eq!(total, pos.bytes());
@@ -1164,9 +1167,13 @@ where
      *        │  │              │                  │
      *   ┌────▼──┴─┐ message   ┌┴──────┐  job     ┌┴────────┐
      *   │resp_loop├──────────►│pf_task├─────────►│ dw_task │
-     *   └─────────┘ channel   └──┬────┘ channel  └▲────────┘
+     *   └──┬───▲──┘ channel   └──┬────┘ channel  └▲────────┘
+     *      │   │                 │                │
+     * defer│   │oneshot          │                │
+     *     ┌▼───┴┐                │                │
+     *     │rayon│             add│work         new│work
+     *     └─────┘                │                │
      *                            │                │
-     *                         add│work         new│work
      *   per-connection           │                │
      *  ========================= │ ============== │ ===============
      *   shared state          ┌──▼────────────────┴────────────┐

downstairs/src/region.rs

@@ -764,6 +764,10 @@ impl Region {
         Ok(result)
     }
 
+    /// Perform a region write, without precomputed data
+    ///
+    /// This is only allowed in unit tests
+    #[cfg(test)]
     #[instrument]
     pub async fn region_write(
         &mut self,
@@ -821,7 +825,7 @@ impl Region {
             let extent = self.get_opened_extent_mut(*eid);
             let (writes, ctxs) = batched_writes.get(eid).unwrap();
             extent
-                .write(job_id, &writes, &ctxs, only_write_unwritten)
+                .write(job_id, writes, ctxs, only_write_unwritten)
                 .await?;
         }