flok 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9f261a2ac31edfd21f064be57fb220825ab161
-  data.tar.gz: 8772a24eeee08c527703bd1a512bb64b73885521
+  metadata.gz: 3a7905b48da7599f5f6f62357affb30856c22cf7
+  data.tar.gz: 340d2d3ddf2cf4d564959a0b9d553dd9fb6eb7f2
 SHA512:
-  metadata.gz: 7e192dd155ce89611416bc62c2cc375641232c0f1fb6d5b67a9e3c40c9da14e35ec38af950ce9c9b8e9054c52d5a4d7082294eb50ee9ff2642a0115826df8402
-  data.tar.gz: 3c2b238399f9c9148980f55f2b345e9c88b3a42295c16257daf87eaf0d6f0bd27bc6187eebd9c94cecd0a2e8b876e73cbdaf9d1ddf05a57a9f21c2830efa5e1b
+  metadata.gz: 48ac928647f77627085badb6eb35d7b419e4bd523b9772a146476a95f6cd4571f723cd986d105643b79d4c12d2b5c1fa62c09c186bc5a3288f5402c8d5d5b682
+  data.tar.gz: ba8832ae43f3fa6855036ce0a273041826d7eb30db5ebd843472190da32df5db0537072487d9fbe9f1489325de891254aff6c2faf119fc54664256b44081fdc6

data/app/kern/pagers/pg_spec.js

@@ -17,7 +17,9 @@
     }
 
     function pg_spec<%= i %>_write(page) {
+      vm_transaction_begin();
       vm_cache_write(pg_spec<%= i %>_ns, page);
+      vm_transaction_end();
     }
   <% end %>
 <% end %>

data/docs/services/vm.md

@@ -109,7 +109,8 @@ This is how you **read a page** and **request notifications for any updates to a
         Likewise, a `sync` watch request is perfectly acceptible to be called many times for a new controller needing the information. There is little
         performance benefit in locally caching the data and many drawbacks like not getting updates of changes.
   * Event Responses
-    * `read_res` - Whenever a change occurs to a page or the first read.
+    * `read_res` - Whenever a change occurs to a page or the first read. If `sync` is true, the page may be `{}` which indicates that no page existed
+        when sync was called (really an illegal condition, you should never use sync unless it's cached)
     * Returns an immutable page in params
 
 ###`unwatch`
@@ -137,7 +138,7 @@ requested. This is because a cached page will be returned by the call stack whil
     * `id` - id of the page
   * Event Responses
     * `read_res`
-      * `entire params` - The page that was retrieved (or null if it dosen't exist)
+      * `entire params` - The page that was retrieved (or `{}` if it dosen't exist)
 
 ##Cache
 See below with `vm_cache_write` for how to write to the cache. Each pager can choose whether or not to cache; some pagers may cache only reads while others will cache writes.  Failure to write to the cache at all will cause `watch` to never trigger. Some pagers may use a trick where writes are allowed, and go directly to the cache but nowhere else. This is to allow things like *pending* transactions where you can locally fake data until a server response is received which will both wipe the fake write and insert the new one. Cache writes will trigger `watch`; if you write to cache with `vm_cache_write` with a page that has the same `_hash` as a page that already exists in cache, no `watch` events will be triggered. Additionally, calling `vm_cache_write` with a non-modified page will result in no performance penalty. `vm_cache_write` notifies controllers asynchronously and is not effected by the `watch` flag on controllers.

data/lib/flok/version.rb

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

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

@@ -0,0 +1,46 @@
+controller :my_controller do
+  spots "content"
+  services :vm
+
+  on_entry %{
+      read_res_params = [];
+  }
+
+  action :my_action do
+    on_entry %{
+      page0 = {
+        ns: "spec",
+        id: "my_key",
+        sync: true
+      };
+
+      Request("vm", "watch", page0);
+    }
+
+    on "read_res", %{
+      read_res_params.push(params);
+    }
+  end
+end
+
+controller :my_other_controller do
+  services "vm"
+
+  action :index do
+    #Make changes to page, read_res should be called a second
+    #time (asynchronously)
+    on "modify_page", %{
+      var p = vm_create_page("my_key");
+      p.entries.push({
+        _id: "test",
+        _sig: "test",
+        value: "test"
+      });
+      var info = {
+        ns: "spec",
+        page: p
+      }
+      Request("vm", "write", info);
+    }
+  end
+end

data/spec/kern/vm_service_spec.rb

@@ -1037,14 +1037,20 @@ RSpec.describe "kern:vm_service" do
   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 = flok_new_user File.read('./spec/kern/assets/vm/controller8ws2.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
 
     ctx.eval %{
       base = _embed("my_controller", 1, {}, null);
 
+      //We need another controller, plans to synchronously dispatch
+      //changes within the same controller
+      other_base = _embed("my_other_controller", base+2, {}, null);
+
       //Drain queue
       int_dispatch([]);
     }
+    base = ctx.eval("base")
+    other_base = ctx.eval("other_base")
 
     @driver.ignore_up_to "if_per_get", 0
     @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
@@ -1068,6 +1074,24 @@ RSpec.describe "kern:vm_service" do
     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)
+
+    #Signal controller to modify page
+    @driver.int "int_event", [other_base, "modify_page", {}]
+
+    #Expect nothing to show up yet (should be dispatched asynchrosouly and will show up after int_dispatch
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params.length).to eq(1)
+
+    #Dispatch any pending async
+    #(This should trigger an additional read_res)
+    @ctx.eval %{
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+    }
+
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params.length).to eq(2)
   end
 
   it "Clears the dirty page when pageout runs" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - seo
@@ -1226,6 +1226,7 @@ files:
 - spec/kern/assets/vm/controller8.rb
 - spec/kern/assets/vm/controller8b.rb
 - spec/kern/assets/vm/controller8ws.rb
+- spec/kern/assets/vm/controller8ws2.rb
 - spec/kern/assets/vm/controller9.rb
 - spec/kern/assets/vm/controller_exc_2watch.rb
 - spec/kern/assets/vm/controller_exc_ewatch.rb
@@ -2162,6 +2163,7 @@ test_files:
 - spec/kern/assets/vm/controller8.rb
 - spec/kern/assets/vm/controller8b.rb
 - spec/kern/assets/vm/controller8ws.rb
+- spec/kern/assets/vm/controller8ws2.rb
 - spec/kern/assets/vm/controller9.rb
 - spec/kern/assets/vm/controller_exc_2watch.rb
 - spec/kern/assets/vm/controller_exc_ewatch.rb