flok 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322e33d75061a0053edd6c19efbb252639c1537d
-  data.tar.gz: e5f0ea65132822c49497510001cc4a9c2a882448
+  metadata.gz: 34017063eb6a9e0ec5c835b31f20820df152548a
+  data.tar.gz: d7752b56cb6586b4a4baf5888fcfa2d6a860057b
 SHA512:
-  metadata.gz: 6126951cecdb3acc59d10eac9578bd77d89e11ed92042f8424c97bd850aeebadc545e3b7fc30844e8c80588dfeed6700db9e40b0fb743536b305b59bd26a8f5f
-  data.tar.gz: 5508fb77fbd94365ee2e952aa5dc84191a98e44378ba8d2c5e158b7cd581f54c5ddb9251f322d4e15fc17b905abb9656613f2aa59ff11227c90f1b1d36bac51a
+  metadata.gz: b9863c2d44654803d8bca864379b186592672e58c26b686425420a02e4fa0391779ee6358d58fe19ac271ffa0aa84b0c741c41d57da1f721f538acd838de2cc2
+  data.tar.gz: 5a9d6c902aa19887b2b70ce2f7df69e26a6364a85e6a60c55b073c2270d420c5d8fcd5a454af1567b0d14d1d522d55be6fb2e31a3d3697b9198caa081af3f3a7

data/app/kern/services/vm.rb

@@ -81,6 +81,13 @@ service :vm do
     //Part of the persist module
     //res is page
     function int_per_get_res(s, ns, res) {
+      //Controller made a read_sync request, fulfull it
+      if (read_sync_in_progress !== undefined) {
+
+        int_event(read_sync_in_progress, "read_sync_res", {page: res, ns: ns});
+        read_sync_in_progress = undefined;
+      }
+
       //If the key didn't exist, ignore it
       if (res === null) { return; }
 
@@ -579,6 +586,25 @@ service :vm do
     <% end %>
   }
 
+  on "read_sync", %{
+    <% if @debug %>
+      if (params.id === undefined) {
+        throw "You need to pass an id for the page in read_sync request";
+      }
+
+      if (params.ns === undefined) {
+        throw "You need to pass an ns for the page in read_sync request";
+      }
+    <% end %>
+
+    read_sync_in_progress = bp;
+    var cache_entry = vm_cache[params.ns][params.id];
+    if (cache_entry !== undefined) {
+      int_event(bp, "read_sync_res", {ns: params.ns, page: cache_entry});
+    } else {
+      SEND("main", "if_per_get", "vm", params.ns, params.id);
+    }
+  }
 
   on "unwatch", %{
     <% raise "No pagers given in options for vm" unless @options[:pagers] %>

data/docs/services/vm.md

@@ -150,6 +150,16 @@ use the modification helpers. These modification helpers implement copy on write
   * Spec helpers
     * If in `@debug` mode, the variable `vm_write_list` contains an array dictionary of the last page passed to the pager (tail is latest).
 
+###`read_sync`
+Read from the disk synchronously, or memory if it exists, and return the value in `read_sync_res`. This will not watch the page.
+  * Parameters
+    * `ns` - Namespace of the page
+    * `id` - id of the page
+  * Event Responses
+    * `read_sync_res`
+      * `ns` - The namespace of the page, e.g. 'user'
+      * `page` - The page that was retrieved (or null 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.47"
+  VERSION = "0.0.48"
 end

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

@@ -0,0 +1,29 @@
+controller :my_controller do
+  services :vm
+
+  on_entry %{
+    read_sync_res_params = [];
+  }
+
+  action :my_action do
+    on_entry %{
+      var info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      var info2 = {
+        ns: "spec",
+        id: "test2"
+      }
+
+      Request("vm", "read_sync", info);
+
+      Request("vm", "read_sync", info2);
+    }
+
+    on "read_sync_res", %{
+      read_sync_res_params.push(params);
+    }
+  end
+end

data/spec/kern/vm_service_spec.rb

@@ -655,6 +655,42 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "test"], 2)
   end
 
+  it "Does send a read request from disk cache when synchronously reading a key for the first time" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19c.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    ctx.eval %{
+      base = _embed("my_controller", 1, {}, null);
+
+      //Call pageout *now*
+      vm_pageout();
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "test"], 0)
+
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "default",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "test2"], 0)
+
+    dump = ctx.evald %{
+      dump.read_sync_in_progress = read_sync_in_progress;
+      dump.read_sync_res_params = read_sync_res_params;
+    }
+
+    expect(dump["read_sync_in_progress"]).to eq(nil)
+    expect(dump["read_sync_res_params"][0]["ns"]).to eq("spec")
+    expect(dump["read_sync_res_params"][0]["page"]["_id"]).to eq("default")
+  end
+
   it "Does send a sync read request from disk cache when watching a key for the first time with sync: true" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19b.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.47
+  version: 0.0.48
 platform: ruby
 authors:
 - seo
@@ -1207,6 +1207,7 @@ files:
 - spec/kern/assets/vm/controller18.rb
 - spec/kern/assets/vm/controller19.rb
 - spec/kern/assets/vm/controller19b.rb
+- spec/kern/assets/vm/controller19c.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb
@@ -2117,6 +2118,7 @@ test_files:
 - spec/kern/assets/vm/controller18.rb
 - spec/kern/assets/vm/controller19.rb
 - spec/kern/assets/vm/controller19b.rb
+- spec/kern/assets/vm/controller19c.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb