ROX-36672: Add new instruction for endpoint workload

Cargo.toml

@@ -28,7 +28,7 @@ io-uring = "0.7.10"
 enum_dispatch = "0.3.13"
 pest = "2.8.1"
 pest_derive = "2.8.1"
-llvm-sys = "201.0.1"
+llvm-sys = "221.1.0"
 docopt = "1.1.1"
 signal-hook = "0.3.18"
 

Containerfile

@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:43 AS builder
+FROM registry.fedoraproject.org/fedora:44 AS builder
 
 ARG RUST_VERSION=stable
 

src/main.rs

@@ -85,15 +85,15 @@ fn run_script(script_path: String) -> Vec<(i32, u64)> {
                 unreachable!()
             };
 
-            let workers: u32 =
+            let workers: usize =
                 args.get("workers").cloned().unwrap().parse().unwrap();
 
             let duration: u64 =
                 args.get("duration").cloned().unwrap().parse().unwrap();
 
             (0..workers)
-                .filter_map(|_| {
-                    let worker = new_script_worker(node.clone());
+                .filter_map(|i| {
+                    let worker = new_script_worker(node.clone(), i);
 
                     match fork() {
                         Ok(Fork::Parent(child)) => {
@@ -290,7 +290,7 @@ mod tests {
         let ast: Vec<Node> = parse_instructions(input).unwrap();
         assert_eq!(ast.len(), 1);
 
-        new_script_worker(ast[0].clone()).run_payload().unwrap();
+        new_script_worker(ast[0].clone(), 0).run_payload().unwrap();
     }
 
     #[test]
@@ -305,7 +305,7 @@ mod tests {
         assert_eq!(nodes.len(), 1);
         let prepared_nodes = apply_rules(nodes);
 
-        new_script_worker(prepared_nodes[0].clone())
+        new_script_worker(prepared_nodes[0].clone(), 0)
             .run_payload()
             .unwrap();
     }
@@ -322,7 +322,7 @@ mod tests {
         assert_eq!(nodes.len(), 1);
         let prepared_nodes = apply_rules(nodes);
 
-        new_script_worker(prepared_nodes[0].clone())
+        new_script_worker(prepared_nodes[0].clone(), 0)
             .run_payload()
             .unwrap();
     }
@@ -339,7 +339,7 @@ mod tests {
         assert_eq!(nodes.len(), 1);
         let prepared_nodes = apply_rules(nodes);
 
-        new_script_worker(prepared_nodes[0].clone())
+        new_script_worker(prepared_nodes[0].clone(), 0)
             .run_payload()
             .unwrap();
     }
@@ -367,8 +367,8 @@ mod tests {
         let _ = apply(vec![&ast[0]]);
 
         // run workers
-        new_script_worker(ast[1].clone()).run_payload().unwrap();
-        new_script_worker(ast[2].clone()).run_payload().unwrap();
+        new_script_worker(ast[1].clone(), 0).run_payload().unwrap();
+        new_script_worker(ast[2].clone(), 0).run_payload().unwrap();
     }
 
     #[test]
@@ -412,4 +412,40 @@ mod tests {
         assert_eq!(args.get("workers").cloned().unwrap(), "2".to_string());
         assert_eq!(args.get("duration").cloned().unwrap(), "10".to_string());
     }
+
+    #[test]
+    fn test_listen_with_zipf() {
+        let input = r#"
+            main (workers = 2, duration = 10) {
+              listen(8081, zipf(10, 1.4));
+            }
+        "#;
+
+        let nodes: Vec<Node> = parse_instructions(input).unwrap();
+        assert_eq!(nodes.len(), 1);
+
+        let prepared_nodes = apply_rules(nodes);
+
+        new_script_worker(prepared_nodes[0].clone(), 0)
+            .run_payload()
+            .unwrap();
+    }
+
+    #[test]
+    fn test_sleep() {
+        let input = r#"
+            main (workers = 2, duration = 10) {
+              sleep(0.01);
+            }
+        "#;
+
+        let nodes: Vec<Node> = parse_instructions(input).unwrap();
+        assert_eq!(nodes.len(), 1);
+
+        let prepared_nodes = apply_rules(nodes);
+
+        new_script_worker(prepared_nodes[0].clone(), 0)
+            .run_payload()
+            .unwrap();
+    }
 }

src/script/ast.rs

@@ -1,12 +1,19 @@
 use std::collections::HashMap;
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum ConstType {
+    Text(String),
+    Int(u64),
+    Double(f64),
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum Arg {
     /// Null constant
     Null,
 
     /// Simple constant
-    Const { text: String },
+    Const { value: ConstType },
 
     /// Variable available at runtime
     Var { name: String },
@@ -28,6 +35,12 @@ pub enum Instruction {
 
     /// Send a message to a server at specified address
     Ping { server: Arg },
+
+    /// Listen on a specified number of endpoints from the lower boundary
+    Listen { lower: Arg, n: Arg },
+
+    /// Sleep for specified amount of time
+    Sleep { interval: Arg },
 }
 
 #[derive(Debug, Clone, PartialEq)]

src/script/grammar.peg

@@ -4,17 +4,19 @@ COMMENT = _{"//" ~ (!NEWLINE ~ ANY)*}
 ident_char = {ASCII_ALPHA | "_" | "$"}
 ident = @{ident_char ~ (ASCII_DIGIT | ident_char)*}
 
-constant = {
-    "\"" ~ value ~ "\""
-  | ASCII_DIGIT+
-}
+constant = { text | double | int }
+
+text = { "\"" ~ value ~ "\"" }
+int = { ASCII_DIGIT+ }
+double = { ASCII_DIGIT+ ~ "." ~ ASCII_DIGIT+ }
 
 randomPath = { "random_path" }
 randomString = { "random_string" }
 
 dynamicName = {
     randomPath
   | randomString
+  | zipf
 }
 
 dynamic = {dynamicName ~ args}
@@ -38,6 +40,8 @@ port = { "port" }
 open = { "open" }
 ping = { "ping" }
 debug = { "debug" }
+listen = { "listen" }
+sleep = { "sleep" }
 
 funcName = {
     task
@@ -46,6 +50,8 @@ funcName = {
   | open
   | ping
   | debug
+  | listen
+  | sleep
 }
 
 exp = { "exp" }