flok 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287f1f518fcf5f7c25b591d19c81246499091a07
-  data.tar.gz: 027fc95d97fd69b2765f4159709a46d3c7bc7282
+  metadata.gz: 0c9f261a2ac31edfd21f064be57fb220825ab161
+  data.tar.gz: 8772a24eeee08c527703bd1a512bb64b73885521
 SHA512:
-  metadata.gz: d09bc22ecf0daf4d829e9e7ad297cfabdb47cd44d9ef591801d0e534eeee2c3168ca4c207cd135ea9960fa2706cd88e34922943ba3d793ee14d2f11c7b4c09a3
-  data.tar.gz: 9782cd1e8bd0b95b01e803d1f96ac35046ff7f64f7163a34dca09664316562ce377ee27660ec19dcced1c239e2687e2a981b26bcaab415df24e43d19b751cfcb
+  metadata.gz: 7e192dd155ce89611416bc62c2cc375641232c0f1fb6d5b67a9e3c40c9da14e35ec38af950ce9c9b8e9054c52d5a4d7082294eb50ee9ff2642a0115826df8402
+  data.tar.gz: 3c2b238399f9c9148980f55f2b345e9c88b3a42295c16257daf87eaf0d6f0bd27bc6187eebd9c94cecd0a2e8b876e73cbdaf9d1ddf05a57a9f21c2830efa5e1b

data/app/kern/services/vm.rb

@@ -52,11 +52,10 @@ service :vm do
       //List of controllers to notify synchronously
       var sync_waiting_controllers = vm_cache_write_sync_pending[page._id];
 
+      //Map that holds all controllers synchronously sent (used to avoid sending
+      //those controllers that are also on vm_notify_map a second message)
+      var sync_sent_map = {}; 
       if (sync_waiting_controllers !== undefined) {
-        //Map that holds all controllers synchronously sent (used to avoid sending
-        //those controllers that are also on vm_notify_map a second message)
-        var sync_sent_map = {}; 
-
         for (var i = 0; i < sync_waiting_controllers.length; ++i) {
           var c = sync_waiting_controllers[i];
 

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.69"
+  VERSION = "0.0.70"
 end

data/spec/kern/vm_service_spec.rb

@@ -1036,6 +1036,40 @@ RSpec.describe "kern:vm_service" do
     expect(read_res_params.length).to eq(1)
   end
 
+  it "A watch request with the sync flag enabled does return the page to read_res followed by all future changes being sent asynchronously" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8ws.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    ctx.eval %{
+      base = _embed("my_controller", 1, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
+
+    #Send back a real page
+    @driver.int "int_per_get_res", ["vm", "spec", "my_key", {
+      "_id" => "my_key",
+      "entries" => [],
+      "_head" => nil,
+      "_next" => nil
+    }]
+
+    #Dispatch any pending async
+    #should not do anything here
+    @ctx.eval %{
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+    }
+
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params[0]["_id"]).to eq("my_key")
+    expect(read_res_params.length).to eq(1)
+  end
+
   it "Clears the dirty page when pageout runs" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller18.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
 platform: ruby
 authors:
 - seo