Merge pull request #121 from demikernel/enhancement-contrib-update

[contrib] Bump inetstack, runtime and scheduler

Author: ppenna

Cargo.toml

@@ -24,11 +24,11 @@ nix = "0.23.1"
 socket2 = { version = "0.4.1", features = ["all"] }
 cfg-if = "1.0.0"
 
-inetstack = { git = "https://github.com/demikernel/inetstack", rev = "fcb2f986c743cc826d004b7ce29ca0716bac7860" }
-catwalk = { git = "https://github.com/demikernel/catwalk", rev = "05201a072b4d6b3afd7c02de69045f423563228f" }
+inetstack = { git = "https://github.com/demikernel/inetstack", rev = "1e1504c5e6309e32d78e38c32c3c55ccb4ae1304" }
+scheduler = { git = "https://github.com/demikernel/scheduler", rev = "fa95977f399eebfcfcd63aae506d72c1cb1756ec" }
 dpdk-rs = { git = "https://github.com/demikernel/dpdk-rs", rev = "f6619d5313fc224e6bf8620df7485517efea0e39", optional = true }
 perftools = { git = "https://github.com/demikernel/perftools", rev = "02f07ad28218c182bbf82e5f8eaf22f7de3f34c6", optional = true }
-runtime = { git = "https://github.com/demikernel/runtime", rev = "96b0f942af74417a96063794884af6450a5b6675" }
+runtime = { git = "https://github.com/demikernel/runtime", rev = "14cf60cd89f491af4c539d20810f9b898828b631" }
 liburing = { git = "https://github.com/demikernel/liburing-rs", rev = "e80e6238f47498b7c4e37194e896a39713c61cd9", optional = true }
 
 [[test]]

src/catcollar/futures/mod.rs

@@ -26,14 +26,14 @@ use crate::{
     demikernel::dbuf::DataBuffer,
     Ipv4Endpoint,
 };
-use ::catwalk::{
-    FutureResult,
-    SchedulerFuture,
-};
 use ::runtime::{
     fail::Fail,
     QDesc,
 };
+use ::scheduler::{
+    FutureResult,
+    SchedulerFuture,
+};
 use ::std::{
     any::Any,
     future::Future,

src/catcollar/mod.rs

@@ -36,7 +36,6 @@ use self::{
 //==============================================================================
 
 use crate::Ipv4Endpoint;
-use ::catwalk::SchedulerHandle;
 use ::libc::c_int;
 use ::nix::{
     sys::socket::{
@@ -74,6 +73,7 @@ use ::runtime::{
     QToken,
     QType,
 };
+use ::scheduler::SchedulerHandle;
 use ::std::{
     any::Any,
     collections::HashMap,

src/catcollar/runtime/mod.rs

@@ -12,7 +12,6 @@ mod utils;
 
 use super::iouring::IoUring;
 use crate::demikernel::dbuf::DataBuffer;
-use ::catwalk::Scheduler;
 use ::nix::sys::socket::SockAddr;
 use ::runtime::{
     fail::Fail,
@@ -22,6 +21,7 @@ use ::runtime::{
     },
     Runtime,
 };
+use ::scheduler::Scheduler;
 use ::std::{
     cell::RefCell,
     collections::HashMap,

src/catcollar/runtime/scheduler.rs

@@ -6,17 +6,17 @@
 //==============================================================================
 
 use super::IoUringRuntime;
-use ::catwalk::{
-    SchedulerFuture,
-    SchedulerHandle,
-};
 use ::runtime::{
     task::SchedulerRuntime,
     timer::{
         TimerRc,
         WaitFuture,
     },
 };
+use ::scheduler::{
+    SchedulerFuture,
+    SchedulerHandle,
+};
 use ::std::time::Instant;
 
 //==============================================================================
@@ -50,12 +50,18 @@ impl SchedulerRuntime for IoUringRuntime {
 
     /// Spawns a new task.
     fn spawn<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     /// Schedules a task for execution.
     fn schedule<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     /// Gets the handle of a task.

src/catnap/futures/mod.rs

@@ -26,14 +26,14 @@ use crate::{
     demikernel::dbuf::DataBuffer,
     Ipv4Endpoint,
 };
-use ::catwalk::{
-    FutureResult,
-    SchedulerFuture,
-};
 use ::runtime::{
     fail::Fail,
     QDesc,
 };
+use ::scheduler::{
+    FutureResult,
+    SchedulerFuture,
+};
 use ::std::{
     any::Any,
     future::Future,

src/catnap/mod.rs

@@ -29,7 +29,6 @@ use crate::{
     demikernel::dbuf::DataBuffer,
     Ipv4Endpoint,
 };
-use ::catwalk::SchedulerHandle;
 use ::libc::{
     c_int,
     AF_INET,
@@ -77,6 +76,7 @@ use ::runtime::{
     QToken,
     QType,
 };
+use ::scheduler::SchedulerHandle;
 use ::std::{
     any::Any,
     collections::HashMap,

src/catnap/runtime.rs

@@ -7,11 +7,6 @@
 
 use crate::demikernel::dbuf::DataBuffer;
 use ::arrayvec::ArrayVec;
-use ::catwalk::{
-    Scheduler,
-    SchedulerFuture,
-    SchedulerHandle,
-};
 use ::libc::c_void;
 use ::rand::{
     distributions::Standard,
@@ -46,6 +41,11 @@ use ::runtime::{
     utils::UtilsRuntime,
     Runtime,
 };
+use ::scheduler::{
+    Scheduler,
+    SchedulerFuture,
+    SchedulerHandle,
+};
 use ::std::{
     mem,
     net::Ipv4Addr,
@@ -187,12 +187,18 @@ impl SchedulerRuntime for PosixRuntime {
 
     /// Spawns a new task.
     fn spawn<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     /// Schedules a task for execution.
     fn schedule<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     /// Gets the handle of a task.

src/catnip/runtime/mod.rs

@@ -22,7 +22,6 @@ use ::anyhow::{
     format_err,
     Error,
 };
-use ::catwalk::Scheduler;
 use ::dpdk_rs::{
     rte_delay_us_block,
     rte_eal_init,
@@ -76,6 +75,7 @@ use ::runtime::{
     timer::Timer,
     Runtime,
 };
+use ::scheduler::Scheduler;
 use ::std::{
     cell::RefCell,
     collections::HashMap,

src/catnip/runtime/scheduler.rs

@@ -6,10 +6,6 @@
 //==============================================================================
 
 use super::DPDKRuntime;
-use ::catwalk::{
-    SchedulerFuture,
-    SchedulerHandle,
-};
 use ::runtime::{
     task::SchedulerRuntime,
     timer::{
@@ -18,6 +14,10 @@ use ::runtime::{
         WaitFuture,
     },
 };
+use ::scheduler::{
+    SchedulerFuture,
+    SchedulerHandle,
+};
 use ::std::{
     rc::Rc,
     time::{
@@ -65,11 +65,17 @@ impl SchedulerRuntime for DPDKRuntime {
     }
 
     fn spawn<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     fn schedule<F: SchedulerFuture>(&self, future: F) -> SchedulerHandle {
-        self.scheduler.insert(future)
+        match self.scheduler.insert(future) {
+            Some(handle) => handle,
+            None => panic!("failed to insert future in the scheduler"),
+        }
     }
 
     fn get_handle(&self, key: u64) -> Option<SchedulerHandle> {