flok 0.0.38 → 0.0.39

data/spec/etc/services_compiler_spec.rb

@@ -21,40 +21,48 @@ RSpec.describe "lib/services_compiler" do
     end
   end
 
-  it "Does fail to compile a controller with a non-existant type" do
-    expect { compile "service_bad_type" }.to raise_exception
-  end
+  #it "Does fail to compile a controller with a non-existant type" do
+    #expect { compile "service_bad_type" }.to raise_exception
+  #end
 
-  it "Can call compile method and get a copy of all the functions" do
-     ctx, _  = compile "service0", "config0"
+  #it "Can call compile method and get a copy of all the functions" do
+     #ctx, _  = compile "service0", "config0"
 
-    #on_wakeup
-    res = ctx.eval("test_on_wakeup")
-    expect(res).not_to eq(nil)
+    ##on_wakeup
+    #res = ctx.eval("test_on_wakeup")
+    #expect(res).not_to eq(nil)
 
-    #on_sleep
-    res = ctx.eval("test_on_sleep")
-    expect(res).not_to eq(nil)
+    ##on_sleep
+    #res = ctx.eval("test_on_sleep")
+    #expect(res).not_to eq(nil)
 
-    #on_connect
-    res = ctx.eval("test_on_connect");
-    expect(res).not_to eq(nil)
+    ##on_connect
+    #res = ctx.eval("test_on_connect");
+    #expect(res).not_to eq(nil)
 
-    #on_disconnect
-    res = ctx.eval("test_on_disconnect")
-    expect(res).not_to eq(nil)
+    ##on_disconnect
+    #res = ctx.eval("test_on_disconnect")
+    #expect(res).not_to eq(nil)
 
-    #on_event
-    res = ctx.eval("test_on_hello");
-    expect(res).not_to eq(nil)
+    ##on_event
+    #res = ctx.eval("test_on_hello");
+    #expect(res).not_to eq(nil)
 
-    #on_handle_timer_events
-    res = ctx.eval("test_handle_timer_events");
-    expect(res).not_to eq(nil)
-  end
+    ##on_handle_timer_events
+    #res = ctx.eval("test_handle_timer_events");
+    #expect(res).not_to eq(nil)
+  #end
+
+  #it "Can call compile method with options" do
+    #ctx, js = compile "service1", "config2"
+    #expect(js).to include("23rntoheuh3nthoeunthn23th");
+  #end
+
+  #If SEND works, then all kernel macros should work
+  it "Can compile with a SEND macro" do
+     ctx, src  = compile "service3", "config0"
 
-  it "Can call compile method with options" do
-    ctx, js = compile "service1", "config2"
-    expect(js).to include("23rntoheuh3nthoeunthn23th");
+     expect(src).not_to include("SEND")
+     expect(src).to include("_q.push")
   end
 end

data/spec/iface/driver/dispatch_spec.rb

@@ -0,0 +1,20 @@
+Dir.chdir File.join File.dirname(__FILE__), '../../../'
+require './spec/env/iface.rb'
+
+RSpec.describe "iface:driver:dispatch_spec" do
+  include_context "iface:driver"
+
+  it "Does automatically dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed with 'r' indicating incomplete-ness" do
+    @pipe.puts ['i', [0, 0, "ping_nothing"]].to_json
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds([], 6.seconds)
+  end
+
+  it "Does not dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed without 'r' indicating incomplete-ness" do
+    @pipe.puts [[0, 0, "ping_nothing"]].to_json
+    expect(@pipe).not_to readline_and_equal_json_x_within_y_seconds([], 6.seconds)
+  end
+
+  #While at first you might think we need to test that int_dispatch called intra-respond of our if_event needs to test whether or not we still send
+  #out blank [] to int_dispatch; this is not the case. In the real world, flok is supposed to also make any necessary if_disptach calls during all
+  #int_dispatch calls. We would always receive back if_dispatch; and thus it would follow the same rules as layed out here
+end

data/spec/iface/driver/persist_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe "iface:driver:persist" do
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "pong"], 5.seconds)
   end
 
-  it "Can set a persist, and then synchronously get" do
+  it "Can set a persist, and then get" do
     key = SecureRandom.hex
     value = SecureRandom.hex
 
@@ -32,26 +32,11 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [2, "int_per_get_res", "session", value]
+    res = [2, "int_per_get_res", "session", "my_ns", value]
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
   end
 
-
- it "Can set a persist, and then asynchronously get" do
-    key = SecureRandom.hex
-    value = SecureRandom.hex
-
-    #Disk is scheduling class 2
-    @pipe.puts [[2, 3, "if_per_set", "my_ns", key, value]].to_json
-    restart_driver_but_persist
-    @pipe.puts [[2, 3, "if_per_get", "session", "my_ns", key]].to_json
-
-    #Expect a response
-    res = [2, "int_per_get_res", "session", value]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
-  end
-
-it "Can set a persist, delete the key, and then synchronously get" do
+  it "Can set a persist, delete the key, and then get" do
     key = SecureRandom.hex
     value = SecureRandom.hex
 
@@ -62,11 +47,11 @@ it "Can set a persist, delete the key, and then synchronously get" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [2, "int_per_get_res", "session", nil]
+    res = [2, "int_per_get_res", "session", "my_ns", nil]
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
   end
 
- it "Can set two persists, delete one key, and then synchronously get" do
+ it "Can set two persists, delete one key, and then get" do
     key = SecureRandom.hex
     key2 = SecureRandom.hex
     value = SecureRandom.hex
@@ -81,15 +66,15 @@ it "Can set a persist, delete the key, and then synchronously get" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key2]].to_json
 
     #Results for first key
-    res = [2, "int_per_get_res", "session", nil]
+    res = [2, "int_per_get_res", "session", "my_ns", nil]
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
 
     #Expect a response
-    res = [2, "int_per_get_res", "session", value2]
+    res = [2, "int_per_get_res", "session", "my_ns", value2]
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
   end
 
-  it "Can set a persist, delete the key via ns, and then synchronously get" do
+  it "Can set a persist, delete the key via ns, and then get" do
     key = SecureRandom.hex
     value = SecureRandom.hex
 
@@ -100,7 +85,7 @@ it "Can set a persist, delete the key, and then synchronously get" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [2, "int_per_get_res", "session", nil]
+    res = [2, "int_per_get_res", "session", "my_ns", nil]
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
   end
 end

data/spec/iface/kern/ping_spec.rb

@@ -3,6 +3,7 @@ require './spec/env/iface.rb'
 require 'securerandom'
 
 RSpec.describe "iface:kern:ping_spec" do
+  MAX_Q = 5
   include_context "iface:kern"
 
  it "supports ping" do
@@ -70,8 +71,7 @@ RSpec.describe "iface:kern:ping_spec" do
       "net" => 1,
       "disk" => 2,
       "cpu" => 3,
-      "gpu" => 4,
-      "async" => 5
+      "gpu" => 4
   }
 
  queue_name_to_index.each do |name, index|
@@ -79,7 +79,7 @@ RSpec.describe "iface:kern:ping_spec" do
       #Don't redo last one because it's part of the first term (queue_name_b)
       unless index == queue_name_to_index.count-1
         queue_name_a = name
-        queue_name_b = @last_queue_name || "async"
+        queue_name_b = @last_queue_name || queue_name_to_index.keys.last
         index_a = index
         index_b = queue_name_to_index[queue_name_b]
         @pipe.puts [1, "ping3", queue_name_a, 1, "ping3", queue_name_a, 1, "ping3", queue_name_b].to_json
@@ -100,25 +100,4 @@ RSpec.describe "iface:kern:ping_spec" do
       expect(@pipe).to readline_and_equal_json_x_within_y_seconds([[index, 0, "pong3"]], 6.seconds)
     end
   end
-
-  #Now make sure the max_n queuing works correctly
-  queue_name_to_index.each do |name, index|
-    it "supports ping-over-commit" do
-      #Main queue always queues all
-      if name != "main"  and name != "async" #main and async don't have scheduling
-        @pipe.puts ([1, "ping4", name]*6).to_json
-        expect(@pipe).to readline_and_equal_json_x_within_y_seconds([[index, *[0, "pong4"]*5]], 6.seconds)
-        @pipe.puts ([1, "ping4", name]).to_json
-
-        #Semantics aren't exact, but it should be nothing happens after 2 seconds (no response)
-        expect(@pipe).not_to readline_and_equal_json_x_within_y_seconds([], 1.seconds)
-
-        @pipe.puts ([1, "ping4_int", name]).to_json
-        expect(@pipe).to readline_and_equal_json_x_within_y_seconds([[index, 0, "pong4"]], 6.seconds)
-      else
-        @pipe.puts ([1, "ping4", name]*6).to_json
-        expect(@pipe).to readline_and_equal_json_x_within_y_seconds([[index, *[0, "pong4"]*6]], 6.seconds)
-      end
-    end
-  end
 end

data/spec/kern/assets/vm/config4.rb

@@ -0,0 +1,12 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_spec0",
+      :namespace => "spec",
+      :options => {
+        "hello" => "world"
+      }
+    }
+  ]
+}

data/spec/kern/assets/vm/controller10.rb

@@ -0,0 +1,26 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var entry = {
+        hello: "world"
+      }
+
+      page = NewPage("test");
+      SetPageHead(page, "head");
+      SetPageNext(page, "next");
+      EntryInsert(page, 0, entry);
+
+      var info = {
+        ns: "spec",
+        page: page
+      };
+
+      Request("vm", "write", info);
+    }
+
+    on "read_res", %{
+    }
+  end
+end

data/spec/kern/assets/vm/controller11.rb

@@ -0,0 +1,33 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var entry = {
+        hello: "world"
+      }
+
+      page = NewPage("test");
+      SetPageHead(page, "head");
+      SetPageNext(page, "next");
+      EntryInsert(page, 0, entry);
+
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      var write_info = {
+        ns: "spec",
+        page: page
+      };
+
+      Request("vm", "watch", watch_info);
+      Request("vm", "write", write_info);
+    }
+
+    on "read_res", %{
+      read_res_params = params;
+    }
+  end
+end

data/spec/kern/assets/vm/controller12.rb

@@ -0,0 +1,45 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var entry = {
+        hello: "world"
+      }
+
+      page = NewPage("test");
+      SetPageHead(page, "head");
+      SetPageNext(page, "next");
+      EntryInsert(page, 0, entry);
+
+      page2 = CopyPage(page)
+      EntryInsert(page, 0, entry);
+
+
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      var write_info = {
+        ns: "spec",
+        page: page
+      };
+
+      var write_info2 = {
+        ns: "spec",
+        page: page2
+      };
+
+
+      read_res_params = [];
+      Request("vm", "write", write_info);
+      Request("vm", "watch", watch_info);
+      Request("vm", "write", write_info2);
+    }
+
+    on "read_res", %{
+      read_res_params.push(params);
+    }
+  end
+end

data/spec/kern/assets/vm/controller13.rb

@@ -0,0 +1,40 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var entry = {
+        hello: "world"
+      }
+
+      page = NewPage("test");
+      SetPageHead(page, "head");
+      SetPageNext(page, "next");
+      EntryInsert(page, 0, entry);
+
+      page2 = CopyPage(page)
+      EntryInsert(page, 0, entry);
+
+
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      var write_info = {
+        ns: "spec",
+        page: page
+      };
+
+      //We are writing the same thing twice
+      read_res_params = [];
+      Request("vm", "write", write_info);
+      Request("vm", "watch", watch_info);
+      Request("vm", "write", write_info);
+    }
+
+    on "read_res", %{
+      read_res_params.push(params);
+    }
+  end
+end

data/spec/kern/assets/vm/controller14.rb

@@ -0,0 +1,14 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "watch", watch_info);
+    }
+  end
+end

data/spec/kern/assets/vm/controller15.rb

@@ -0,0 +1,15 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "watch", watch_info);
+      Request("vm", "unwatch", watch_info);
+    }
+  end
+end

data/spec/kern/assets/vm/controller16.rb

@@ -0,0 +1,29 @@
+controller :my_controller do
+  spots "content"
+
+  action :a do
+
+    on_entry %{
+      Embed("a", "content", {});
+    }
+
+    on "next", %{
+      Goto("b");
+    }
+  end
+
+  action :b do
+    on_entry %{
+    }
+  end
+end
+
+controller :a do
+  services :vm
+  action :index do
+    on_entry %{
+      var info = {ns: "spec", id: "test"}
+      Request("vm", "watch", info);
+    }
+  end
+end