some minor cleanup, new command line option --interactive

Author: rstade

framework/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "e2d2"
-version = "1.0.7"
+version = "1.0.8"
 authors = ["Aurojit Panda <apanda@cs.berkeley.edu>", "Rainer Stademann"]
 build = "build.rs"
 
@@ -21,12 +21,12 @@ lazy_static = "*"
 net2 = "*"
 # NIX restricts us to just unix for now, we can fix this if someone cares at a later point.
 nix = ">=0.10.0"
-toml = "~0.4"
+toml = "0.6"
 # Hack for SHM
 uuid= { version = ">=0.7", features=["v4"] }
 tokio-core=">=0.1.8"
 futures=">=0.1.14"
-eui48 = { version= ">=0.4" }
+eui48 = { git= "https://github.com/readysettech/eui48.git", version= ">=1.1", features=["serde"] , default-features= false}
 separator =  ">= 0.3"
 serde_derive = "1.0"
 serde = "1.0"

framework/src/config/config_reader.rs

@@ -6,7 +6,6 @@ use eui48::MacAddress;
 use ipnet::Ipv4Net;
 use native::zcsi::{RteEthIpv4Flow, RteFdirConf, RteFdirMode, RteFdirPballocType};
 use std::clone::Clone;
-use std::collections::BTreeMap;
 use std::fs::File;
 use std::io::Read;
 use std::net::{AddrParseError, Ipv4Addr};
@@ -160,28 +159,28 @@ fn read_port(value: &Value) -> errors::Result<PortConfiguration> {
                 }
             }
 
-            fn read_ipv4(mask_def: &BTreeMap<String, Value>, key: String) -> Result<u32, AddrParseError> {
+            fn read_ipv4(mask_def: &toml::map::Map<String, Value>, key: String) -> Result<u32, AddrParseError> {
                 match mask_def.get(&key) {
                     Some(&Value::String(ref ipv4_string)) => Ok(u32::from(Ipv4Addr::from_str(ipv4_string)?)),
                     _ => Ok(0u32),
                 }
             }
 
-            fn read_hex_u32(mask_def: &BTreeMap<String, Value>, key: String) -> u32 {
+            fn read_hex_u32(mask_def: &toml::map::Map<String, Value>, key: String) -> u32 {
                 match mask_def.get(&key) {
                     Some(&Value::String(ref hex_string)) => u32::from_str_radix(hex_string, 16).unwrap_or(0u32),
                     _ => 0u32,
                 }
             }
 
-            fn read_hex_u16(mask_def: &BTreeMap<String, Value>, key: String) -> u16 {
+            fn read_hex_u16(mask_def: &toml::map::Map<String, Value>, key: String) -> u16 {
                 match mask_def.get(&key) {
                     Some(&Value::String(ref hex_string)) => u16::from_str_radix(hex_string, 16).unwrap_or(0u16),
                     _ => 0u16,
                 }
             }
 
-            fn read_hex_u8(mask_def: &BTreeMap<String, Value>, key: String) -> u8 {
+            fn read_hex_u8(mask_def: &toml::map::Map<String, Value>, key: String) -> u8 {
                 match mask_def.get(&key) {
                     Some(&Value::String(ref hex_string)) => u8::from_str_radix(hex_string, 16).unwrap_or(0u8),
                     _ => 0u8,

framework/src/config/flag_reader.rs

@@ -21,6 +21,7 @@ pub fn basic_opts() -> Options {
     opts.optopt("m", "master", "Master core", "master");
     opts.optopt("f", "configuration", "Configuration file", "path");
     opts.optmulti("", "vdev", "Virtual device to create", "vdev_name");
+    opts.optflag("i", "interactive", "run interactively");
     opts
 }
 

framework/src/config/mod.rs

@@ -1,8 +1,8 @@
 pub use self::config_reader::*;
 pub use self::flag_reader::*;
+use interface::{FlowSteeringMode, NetSpec};
 use native::zcsi::RteFdirConf;
 use std::fmt;
-use interface::{FlowSteeringMode, NetSpec};
 
 mod config_reader;
 mod flag_reader;
@@ -87,11 +87,11 @@ impl fmt::Display for NetbricksConfiguration {
         for port in &self.ports {
             write!(f, "\t{}\n", port)?
         }
-        write!(f, "Cores:\n")?;
+        write!(f, "Cores:")?;
         for core in &self.cores {
-            write!(f, "\t{}\n", core)?
+            write!(f, "\t{}", core)?
         }
-        write!(f, "")
+        write!(f, "\n")
     }
 }
 

framework/src/interface/port/phy_port.rs

@@ -136,7 +136,8 @@ impl Default for PmdPort {
         }
     }
 }
-
+pub type PciQueueType = CacheAligned<PortQueueTxBuffered>;
+pub type KniQueueType = CacheAligned<PortQueue>;
 /// A port queue represents a single queue for a physical port, and should be used to send and receive data.
 #[derive(Clone)]
 pub struct PortQueue {

framework/src/lib.rs

@@ -1,13 +1,5 @@
 #![recursion_limit = "1024"]
-#![feature(log_syntax)]
-#![feature(box_syntax)]
-#![feature(min_specialization)]
-#![feature(slice_concat_ext)]
 #![feature(ptr_internals)]
-// Used for cache alignment.
-#![feature(allocator_api)]
-#![allow(unused_features)]
-#![feature(integer_atomics)]
 #![allow(unused_doc_comments)]
 #![cfg_attr(feature = "dev", allow(unstable_features))]
 // Need this since PMD port construction triggers too many arguments.

framework/src/operators/composition_batch.rs

@@ -11,7 +11,9 @@ pub struct CompositionBatch {
 
 impl CompositionBatch {
     pub fn new<V: 'static + Batch>(parent: V) -> CompositionBatch {
-        CompositionBatch { parent: box parent }
+        CompositionBatch {
+            parent: Box::new(parent),
+        }
     }
 }
 

framework/src/operators/group_by.rs

@@ -40,7 +40,6 @@ where
         {
             let iter = PayloadEnumerator::new(&mut self.parent);
             while let Some(ParsedDescriptor { mut pdu, .. }) = iter.next(&mut self.parent) {
-                //let group = (self.group_fn)(&mut packet);
                 let group = (self.group_fn)(&mut pdu);
                 if !self.producers[group].enqueue_one(pdu) {
                     warn!("queue overflow in GroupByProducer for group {}", group);

framework/src/scheduler/context.rs

@@ -324,5 +324,6 @@ pub fn initialize_system(configuration: &NetbricksConfiguration) -> errors::Resu
         cores.extend(ctx.rx_queues.keys());
     };
     ctx.active_cores = cores.into_iter().collect();
+    ctx.active_cores.sort_by(|a, b| a.cmp(b));
     Ok(ctx)
 }

framework/src/scheduler/standalone_scheduler.rs

@@ -25,7 +25,7 @@ pub struct Runnable {
 impl Runnable {
     pub fn from_task<T: Executable + 'static>(uuid: Uuid, name: String, task: T) -> Runnable {
         Runnable {
-            task: box task,
+            task: Box::new(task),
             uuid,
             name,
             cycles: 0,