flok 0.0.66 → 0.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14b04d730ef3b9aacd8c74e5e4d4aaefe985fa0
-  data.tar.gz: 9b938591a91b898de270c24a5cbea1b7f83ffd3a
+  metadata.gz: 33ebc378b4d4226cb152de93d0d3c6ff42936bad
+  data.tar.gz: eb5bce9429dd9499b956d88b2400315fcf565299
 SHA512:
-  metadata.gz: aeaa0959cfa1e56fff2003ce9e0925c6c5384886a0f82da48269bc9e71b14b3684199b5c72e75bfb5793d2edf33860dd3484749307070b4287574ae413dafee9
-  data.tar.gz: 229329809c8dc148b1a01223d8e3a340ada05bb4d169736aba82578c06614f6f1446c3900a2bf9101ea65410642357698ac89f7f71ac732cd6cfbeaff5881428
+  metadata.gz: f85617167569178963488188a1eb824e656aa0dec2fc6c6d1b719d21df16a71c651688c8f643155ead9c30a56d5c86b2e093df3a33abf40e3d3fb791da70d209
+  data.tar.gz: 5e36c86d1cc67d367d3d052a18966b545cfb0277b4db601a9dcfa6db9b5bdc3bfd735989647f0d0b0df68fe0bbacda590bae6b51348922261cad7b7a64861c33

data/app/drivers/CHROME/src/persist.js

@@ -16,5 +16,5 @@ function if_per_del_ns(ns) {
 function if_per_get(s, ns, key) {
   var _ns = store.namespace(ns);
   var res = _ns.get(key);
-  int_dispatch([3, "int_per_get_res", s, ns, res]);
+  int_dispatch([3, "int_per_get_res", s, ns, key, res]);
 }

data/app/kern/services/vm.rb

@@ -15,8 +15,6 @@ service :vm do
 
     vm_bp_to_nmap = {};
 
-    vm_read_sync_in_progress = [];
-
     //Notification listeners, converts ns+key to an array of base pointers
     vm_notify_map = {
       <% @options[:pagers].each do |p| %>
@@ -24,6 +22,8 @@ service :vm do
       <% end %>
     };
 
+    vm_cache_write_sync_pending = {};
+
     //Cache
     function vm_cache_write(ns, page) {
       <% if @debug %>
@@ -49,13 +49,41 @@ service :vm do
       vm_dirty[ns][page._id] = page;
       vm_cache[ns][page._id] = page;
 
+      //List of controllers to notify synchronously
+      var sync_waiting_controllers = vm_cache_write_sync_pending[page._id];
+
+      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];
+
+          //Save so we don't send the same controller during the async part if the controller
+          //also happends to be part of vm_notify_map (it watched)
+          sync_sent_map[c] = true;
+
+          //Notify controller synchronously
+          int_event(c, "read_res", page);
+        }
+      }
+
       //Try to lookup view controller(s) to notify
       var nbp = vm_notify_map[ns][page._id];
       if (nbp) {
         for (var i = 0; i < nbp.length; ++i) {
-          int_event_defer(nbp[i], "read_res", page);
+          var cbp = nbp[i];
+          //Only send if we didn't just send it above in the previous
+          //block synchronously
+          if (sync_sent_map[cbp] === undefined) {
+            int_event_defer(cbp, "read_res", page);
+          }
         }
       }
+
+      //Clear the sync_waiting_controllers
+      delete vm_cache_write_sync_pending[page._id];
     }
 
     function vm_pageout() {
@@ -82,23 +110,27 @@ 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 (vm_read_sync_in_progress.length > 0) {
-        int_event(vm_read_sync_in_progress.pop(), "read_sync_res", {page: res, ns: ns});
-      }
-
-      //If the key didn't exist, ignore it
-      if (res === null) { return; }
-
-      //If there is already a cached entry, a pager beat us to it
-      //ignore this for now because the pager should be more up to
-      //date
-      if (vm_cache[ns][res._id]) { return };
+    function int_per_get_res(s, ns, id, res) {
+      if (res !== null) {
+        //Write out to the cache
+        vm_transaction_begin();
+        vm_cache_write(ns, res);
+        vm_transaction_end();
+      } else {
+        //Result was blank, signal all controllers that read synchronously
+        var sync_waiting_controllers = vm_cache_write_sync_pending[id];
+        if (sync_waiting_controllers !== undefined) {
+          for (var i = 0; i < sync_waiting_controllers.length; ++i) {
+            var c = sync_waiting_controllers[i];
+
+            //Notify controller synchronously
+            int_event(c, "read_res", {});
+          }
+        }
 
-      vm_transaction_begin();
-      vm_cache_write(ns, res);
-      vm_transaction_end();
+        //Remove all controllers from notification list
+        delete vm_cache_write_sync_pending[id];
+      }
     }
 
     <% if @debug %>
@@ -561,8 +593,18 @@ service :vm do
     }
 
     //Send a request now for disk read for sync
-    if (!cache_entry && params.sync) {
-      SEND("main", "if_per_get", "vm", params.ns, params.id);
+    if (!cache_entry) {
+      if (params.sync !== undefined && params.sync === true) {
+        //Add ourselves to synchronous read list so the next disk read will
+        //send a synchronous event to us (and then clear). We will not get the 
+        //normal asynhronous read. Additionally, we may also get a `{}` page indicating
+        //that the page is blank
+        vm_cache_write_sync_pending[params.id] = vm_cache_write_sync_pending[params.id] || []; 
+        vm_cache_write_sync_pending[params.id].push(bp);
+        SEND("main", "if_per_get", "vm", params.ns, params.id);
+      } else {
+        SEND("disk", "if_per_get", "vm", params.ns, params.id);
+      }
     }
 
     //Do not signal pager if there is a watch request already in place
@@ -570,14 +612,6 @@ service :vm do
     //watch to go through as we have no info on it but just added it
     if (vm_notify_map[params.ns][params.id].length > 1) { return; }
 
-    //While we're waiting for the pager try loading from disk, if this
-    //disk request is slower than the pager response, that's ok...
-    //the disk response will double check to see if the cache got set
-    //somewhere and not set it itself.
-    if (!cache_entry && !params.sync) {
-      SEND("disk", "if_per_get", "vm", params.ns, params.id);
-    }
-
     //Now load the appropriate pager
     <% @options[:pagers].each do |p| %>
       if (params.ns === "<%= p[:namespace] %>") {
@@ -599,9 +633,11 @@ service :vm do
 
     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});
+      int_event(bp, "read_res", cache_entry);
     } else {
-      vm_read_sync_in_progress.unshift(bp);
+      //Set this controller as awaiting as synchronous response
+      vm_cache_write_sync_pending[params.id] = vm_cache_write_sync_pending[params.id] || []; 
+      vm_cache_write_sync_pending[params.id].push(bp);
       SEND("main", "if_per_get", "vm", params.ns, params.id);
     }
   }

data/docs/mod/persist.md

@@ -15,6 +15,6 @@ It is expected that the kernel should manage the write-back cache and that the d
 it is convenient to do so.
 
 ###Kernel interrupts
-`int_per_get_res(s, ns, res)` - A response retrieved from `if_per_get` that contains the session key and result dictionary. Currently,
+`int_per_get_res(s, ns, id, res)` - A response retrieved from `if_per_get` that contains the session key and result dictionary. Currently,
 the service `vm` owns this function; so session does not have an effect on the outcome; but the string `"vm"` should be used for now for any
 session keys involving persist.

data/docs/services/vm.md

@@ -97,39 +97,17 @@ you will want to copy your pager into a seperate piece of code and rename it so
 ##Requests
 
 ###`watch`
-This is how you **read a page** and request notifications for any updates to a page. The following happens when you watch a page:
-```js
-if (page is resident in memory from previous cache write)
-  send the caller a read_res event *now*
-
-increment_page_ref()
-
-//Synchronously request disk load from cache; this will block
-//Even if we have a request in progress; the synchronous
-//may pre-empt that event because the disk queue might be loaded;
-//so we need to send this anyway
-if (page is not redisent in memory and synchronous) {
-  try_sync_load_from_disk_and_update_cache()
-}
-
-//Only notify if this is the first reference, other controllers who attempt a watch will not signal the pager because the pager already knows
-//about this page
-if first_reference {
-  pager_watch()
-}
-
-//Again, only attempt this if the page is not requested by anyone else and is not synchronous (because we would have already tried). The pager will be notified in the meantime, if the disk
-//comes after the pager notification; then the disk will not do anything.
-if (page is not resident in memory && not_synchronous) {
-  //This is an asynchronous request
-  try_load_from_disk_and_update_cache()
-}
-```
+This is how you **read a page** and **request notifications for any updates to a page**.
   * Parameters
     * `ns` - The namespace of the page, e.g. 'user'
     * `id` - Watching the page that contains this in the `_id` field
-    * `sync (optional)` - If set to `true` then the cache read will be performed synchronously; however, the disk read will still be performed
-        asynchronously. Additionally, all future cache reads / updates will be performed synchronously.
+    * `sync (optional)` - If set to `true` then the cache read will be performed synchronously and if the cache misses, the disk will be read
+        synchronously.  If the disk read fails, there will be no warning but this is an untested state and most likely, the next pager read will
+        dispatch asynchronously. This isn't awful but you should never set the `sync` flag to be true on data that you have not already cached at
+        some point. This is useful for profile loading, etc. so you don't have to delay on startup to display user name, etc. Multiple `watch`
+        requests dispatched with `sync` flag within the same frame will incur no performance penalty, they will be coalesced into one disk read.
+        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.
     * Returns an immutable page in params
@@ -151,16 +129,15 @@ use the modification helpers. These modification helpers implement copy on write
     * 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. Multiple read_syncs
+Read from the disk synchronously, or memory if it exists, and return the value in `read_res`. This will not watch the page. Multiple read_syncs
 in the same frame are allowed but discouraged as the order that pages are received back may not necessarily be the order they were synhronously
 requested. This is because a cached page will be returned by the call stack while a synchronous read has to go through the event queue.
   * 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)
+    * `read_res`
+      * `entire params` - 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.
@@ -176,12 +153,9 @@ Pageout is embodied in the function named `vm_pageout()`. This will asynchronous
   * `vm_notify_map` - The dictionary used to lookup what controllers need to be notified about changes. Stored in `vm_notify_map[ns][id]` which yields an array of controller base pointers.
   * `vm_bp_to_nmap` - A dictionary that maps a `bp` key (usually from a controller) to a dictionary. This dictionary contains a mapping of `bp => ns => id` to an array that contains `[node, index]` where `node` is a reference to `vm_notify_map[ns][id]`. This inverted map must (a) provide a way for `unwatch` to quickly remove entries from itself and (b) provide a way for all entries in `vm_notify_map` to be removed when something (usually a controller) disconrnects.
     must support `unwatch` removal which we only receive the `bp`, `ns`, and `key`.
-  * `vm_read_sync_in_progress` - A queue of controller base pointers that are awaiting a response from `read_sync`. This may contain multiple
-      controllers if one controller makes multiple `read_sync` requests within one *frame* as `int_event` only queues the outbounds events
-      and dosen't immediately send them. Not that this makes it not synchronous, just the order of execution is not like a call stack and more
-      like a synchronous high priority deferred queue. The *frontmost* of the array is the lowest index, and the *backmost* is the highest index. In
-      javascript, this means that new requests are placed via `vm_read_sync_in_progress.unshift(new_bp)` and when requests are serviced, they are
-      serviced via the `var bp = vm_read_sync_in_progress.pop()`.
+  * `vm_cache_write_sync_pending` - A hash mapping page_ids to controllers awaiting synchronous responeses, e.g.
+      `vm_cache_write_sync_pending[page_id][0..N] := bp`. Usually set via the `watch` request
+      during a sync call for disk reads or the synchronous `read_sync` request. The format for each element in the array is `{"page_id": [bp1, bp2], ...}`
 
 ##Helper Methods
 

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.66"
+  VERSION = "0.0.67"
 end

data/spec/iface/driver/persist_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe "iface:driver:persist" do
     @pipe.readline_timeout
 
     @pipe.puts [[0, 0, "ping"]].to_json; 
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "pong"], 5.seconds)
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "pong"], 8.seconds)
   end
 
  it "retuns null when calling get on a blank key" do
@@ -29,8 +29,8 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [3, "int_per_get_res", "session", "my_ns", nil]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key, nil]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 7.seconds)
   end
 
   it "Can set a persist, and then get" do
@@ -43,8 +43,8 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [3, "int_per_get_res", "session", "my_ns", value]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key, value]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 8.seconds)
   end
 
   it "Can set a persist, delete the key, and then get" do
@@ -58,8 +58,8 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [3, "int_per_get_res", "session", "my_ns", nil]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key, nil]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 8.seconds)
   end
 
  it "Can set two persists, delete one key, and then get" do
@@ -77,12 +77,12 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key2]].to_json
 
     #Results for first key
-    res = [3, "int_per_get_res", "session", "my_ns", nil]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key, nil]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 8.seconds)
 
     #Expect a response
-    res = [3, "int_per_get_res", "session", "my_ns", value2]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key2, value2]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 8.seconds)
   end
 
   it "Can set a persist, delete the key via ns, and then get" do
@@ -96,7 +96,7 @@ RSpec.describe "iface:driver:persist" do
     @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
 
     #Expect a response
-    res = [3, "int_per_get_res", "session", "my_ns", nil]
-    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+    res = [3, "int_per_get_res", "session", "my_ns", key, nil]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 8.seconds)
   end
 end

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

@@ -22,7 +22,7 @@ controller :my_controller do
       Request("vm", "read_sync", info2);
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       read_sync_res_params.push(params);
     }
   end

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

@@ -21,7 +21,7 @@ controller :my_controller do
       Embed("my_other_controller", "content", {});
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       my_controller_read_sync_res = params;
     }
   end
@@ -44,7 +44,7 @@ controller :my_other_controller do
       Request("vm", "read_sync", info);
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       my_other_controller_read_sync_res = params;
     }
   end

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

@@ -17,7 +17,7 @@ controller :controller0 do
       Embed("controller2", "second", {});
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       controller0_read_sync_res = params;
     }
   end
@@ -40,10 +40,13 @@ controller :controller1 do
       }
       //get page A (again, read from cache)
       Request("vm", "read_sync", info);
+      throw "shit";
     }
 
-    on "read_sync_res", %{
+    on modifyread_res", %{
       controller1_read_sync_res = params;
+
+      expect()
     }
   end
 end
@@ -68,7 +71,7 @@ controller :controller2 do
       Request("vm", "read_sync", info);
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       controller2_read_sync_res = params;
     }
   end

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

@@ -17,7 +17,7 @@ controller :controller0 do
       Embed("controller2", "second", {});
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       controller0_read_sync_res = params;
     }
   end
@@ -42,7 +42,7 @@ controller :controller1 do
       Request("vm", "read_sync", info);
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       controller1_read_sync_res = params;
     }
   end
@@ -68,7 +68,7 @@ controller :controller2 do
       Request("vm", "read_sync", info);
     }
 
-    on "read_sync_res", %{
+    on "read_res", %{
       controller2_read_sync_res = params;
     }
   end

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

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

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

@@ -0,0 +1,21 @@
+controller :my_controller do
+  spots "content"
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      page0 = {
+        ns: "spec",
+        id: "my_key",
+        sync: true
+      };
+
+      Request("vm", "watch", page0);
+    }
+
+    on "read_res", %{
+      read_res_params = params;
+    }
+  end
+end
+

data/spec/kern/vm_service_spec.rb

@@ -671,8 +671,8 @@ RSpec.describe "kern:vm_service" do
     @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",
+    @driver.int "int_per_get_res", ["vm", "spec", "test", {
+      "_id" => "test",
       "_hash" => nil,
       "_next" => nil,
       "entries" => [],
@@ -680,24 +680,48 @@ RSpec.describe "kern:vm_service" do
 
     @driver.mexpect("if_per_get", ["vm", "spec", "test2"], 0)
 
-    @driver.int "int_per_get_res", ["vm", "spec", {
-      "_id" => "default",
+    @driver.int "int_per_get_res", ["vm", "spec", "test2", {
+      "_id" => "test2",
       "_hash" => nil,
       "_next" => nil,
       "entries" => [],
     }]
 
     dump = ctx.evald %{
-      dump.vm_read_sync_in_progress = vm_read_sync_in_progress;
       dump.read_sync_res_params = read_sync_res_params;
     }
 
-    expect(dump["vm_read_sync_in_progress"]).to eq([])
     expect(dump["read_sync_res_params"].length).to eq(2)
-    expect(dump["read_sync_res_params"][0]["ns"]).to eq("spec")
-    expect(dump["read_sync_res_params"][0]["page"]["_id"]).to eq("default")
-    expect(dump["read_sync_res_params"][1]["ns"]).to eq("spec")
-    expect(dump["read_sync_res_params"][1]["page"]["_id"]).to eq("default")
+    expect(dump["read_sync_res_params"][0]["_id"]).to eq("test")
+    expect(dump["read_sync_res_params"][1]["_id"]).to eq("test2")
+  end
+
+  it "Does send a read request from disk cache when synchronously reading a key for the first time via read_sync, and returns a blank hash if the page does not exist" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19h.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)
+
+    #Send back blank result (Send two to make sure we only get one result back)
+    @driver.int "int_per_get_res", ["vm", "spec", "test", nil]
+    @driver.int "int_per_get_res", ["vm", "spec", "test", nil]
+
+    dump = ctx.evald %{
+      dump.read_sync_res_params = read_sync_res_params;
+    }
+
+    expect(dump["read_sync_res_params"].length).to eq(1)
+    expect(dump["read_sync_res_params"][0]).to eq({})
   end
 
   it "Calling read_sync on an entry that already exists in cache will not trigger a disk read" do
@@ -718,7 +742,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "test"], 0)
 
     #Send the disk read response back controller19d:14
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "test", {
       "_id" => "test",
       "_hash" => nil,
       "_next" => nil,
@@ -754,7 +778,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "test2"], 0)
 
     #Send the disk read response back for the first controller (my_controller)
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "test1", {
       "_id" => "test1",
       "_hash" => nil,
       "_next" => nil,
@@ -762,7 +786,7 @@ RSpec.describe "kern:vm_service" do
     }]
 
     #Send the disk read response back for the second controller (my_other_controller)
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "test2", {
       "_id" => "test2",
       "_hash" => nil,
       "_next" => nil,
@@ -775,8 +799,8 @@ RSpec.describe "kern:vm_service" do
       dump.my_other_controller_read_sync_res = my_other_controller_read_sync_res;
     }
 
-    expect(dump["my_controller_read_sync_res"]["page"]["_id"]).to eq("test1")
-    expect(dump["my_other_controller_read_sync_res"]["page"]["_id"]).to eq("test2")
+    expect(dump["my_controller_read_sync_res"]["_id"]).to eq("test1")
+    expect(dump["my_other_controller_read_sync_res"]["_id"]).to eq("test2")
   end
 
   it "Calling read_sync on frame0 for page 'A' on controller0 and then on frame1 for page 'A' on controller1 and page 'B' on controller2 will result in all controllers receiving the correct pages" do
@@ -796,7 +820,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "A"], 0)
 
     #Send the disk read response back for controller0 pageA
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "A", {
       "_id" => "A",
       "_hash" => nil,
       "_next" => nil,
@@ -812,7 +836,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "B"], 0)
 
     #Send the disk read response back for frame1 'B' for controller2
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "B", {
       "_id" => "B",
       "_hash" => nil,
       "_next" => nil,
@@ -825,8 +849,8 @@ RSpec.describe "kern:vm_service" do
       dump.controller2_read_sync_res = controller2_read_sync_res;
     }
 
-    expect(dump["controller1_read_sync_res"]["page"]["_id"]).to eq("A")
-    expect(dump["controller2_read_sync_res"]["page"]["_id"]).to eq("B")
+    expect(dump["controller1_read_sync_res"]["_id"]).to eq("A")
+    expect(dump["controller2_read_sync_res"]["_id"]).to eq("B")
   end
 
   it "Calling read_sync on frame0 for page 'B' on controller0 and then on frame1 for page 'A' on controller1 and page 'B' on controller2 will result in all controllers receiving the correct pages (reversed order from above)" do
@@ -846,7 +870,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "B"], 0)
 
     #Send the disk read response back for controller0 pageB
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "B", {
       "_id" => "B",
       "_hash" => nil,
       "_next" => nil,
@@ -862,7 +886,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "A"], 0)
 
     #Send the disk read response back for frame1 'A' for controller2
-    @driver.int "int_per_get_res", ["vm", "spec", {
+    @driver.int "int_per_get_res", ["vm", "spec", "A", {
       "_id" => "A",
       "_hash" => nil,
       "_next" => nil,
@@ -875,8 +899,8 @@ RSpec.describe "kern:vm_service" do
       dump.controller2_read_sync_res = controller2_read_sync_res;
     }
 
-    expect(dump["controller1_read_sync_res"]["page"]["_id"]).to eq("A")
-    expect(dump["controller2_read_sync_res"]["page"]["_id"]).to eq("B")
+    expect(dump["controller1_read_sync_res"]["_id"]).to eq("A")
+    expect(dump["controller2_read_sync_res"]["_id"]).to eq("B")
   end
 
   it "Does send a sync read request from disk cache when watching a key for the first time with sync: true" do
@@ -916,45 +940,22 @@ RSpec.describe "kern:vm_service" do
     }.to raise_exception
   end
 
-  it "Only sends one disk read request when multiple watches are attempted, and the first watch is sync: true" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
-
-    ctx.eval %{
-      base = _embed("my_controller_sync", 1, {}, null);
-      base2 = _embed("my_controller", base+2, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
-
-    @driver.ignore_up_to "if_per_get", 0
-    @driver.get "if_per_get", 0
-
-    #There should not be another request for the drive
-    expect {
-      @driver.ignore_up_to "if_per_get"
-    }.to raise_exception
-  end
-
-  it "Sends two disk read request when multiple watches are attempted, and the second watch is sync: true but the disk does not read back before it is requested" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+  it "A watch request with the sync flag enabled does trigger a synchronous read for a non-existant page" 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);
-      base2 = _embed("my_controller_sync", base+2, {}, null);
 
       //Drain queue
       int_dispatch([]);
     }
 
-    #The inner controller's on_entry is called before, so it's in reverse order
     @driver.ignore_up_to "if_per_get", 0
-    @driver.get "if_per_get", 0
-    @driver.ignore_up_to "if_per_get", 2
+    @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
   end
 
-  it "Sends one disk read request when multiple watches are attempted, and the second watch is sync: true and the disk *does* read back before it is requested" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8.rb'), File.read("./spec/kern/assets/vm/config4.rb");
+  it "A watch request with the sync flag enabled does return null to read_res if the page does not exist (really an illegal condition, page should always be avaliable if you're doing a watch with sync)" 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);
@@ -963,50 +964,36 @@ RSpec.describe "kern:vm_service" do
       int_dispatch([]);
     }
 
-    page0 = JSON.parse(ctx.eval("JSON.stringify(page0)"))
-    @driver.int "int_per_get_res", ["vm", "spec", page0]
-
-    ctx.eval %{
-      base2 = _embed("my_controller_sync", base+2, {}, null);
-    }
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
 
-    #The inner controller's on_entry is called before, so it's in reverse order
-    @driver.ignore_up_to "if_per_get", 2
-    @driver.get "if_per_get", 2
+    #Send back a blank page
+    @driver.int "int_per_get_res", ["vm", "spec", "my_key", nil]
 
-    #There should not be another request for the drive
-    expect {
-      @driver.ignore_up_to "if_per_get"
-    }.to raise_exception
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params).to eq({})
   end
 
-  it "Only sends one disk read request when multiple sync watches are attempted" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+  it "A watch request with the sync flag enabled does not send two read_res back after int_dispatch" 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_sync", 1, {}, null);
+      base = _embed("my_controller", 1, {}, null);
 
       //Drain queue
       int_dispatch([]);
     }
 
     @driver.ignore_up_to "if_per_get", 0
-    @driver.get "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
 
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-    @driver.int "int_per_get_res", ["vm", "spec", page]
+    #Send back a blank page
+    @driver.int "int_per_get_res", ["vm", "spec", "my_key", nil]
 
-    ctx.eval %{
-      base2 = _embed("my_controller_sync", base+2, {}, null);
-    }
-
-    #There should not be another request for the drive
-    expect {
-      @driver.ignore_up_to "if_per_get"
-    }.to raise_exception
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params).to eq({})
   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") 
 
@@ -1134,7 +1121,7 @@ RSpec.describe "kern:vm_service" do
 
     #And then we let the cache from disk reply, which should be ignored
     #because the cache is already there from the pager
-    @driver.int "int_per_get_res", ["vm", "spec", page]
+    @driver.int "int_per_get_res", ["vm", "spec", page["_id"], page]
 
     res = JSON.parse(ctx.eval("JSON.stringify(read_res)"))
     expect(res).to eq([
@@ -1195,7 +1182,7 @@ RSpec.describe "kern:vm_service" do
 
     #And then we let the cache from disk reply, which should be ignored
     #because the cache is already there from the pager
-    @driver.int "int_per_get_res", ["vm", "spec", page]
+    @driver.int "int_per_get_res", ["vm", "spec", page["_id"], page]
 
     res = JSON.parse(ctx.eval("JSON.stringify(read_res)"))
     expect(res).to eq([

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.66
+  version: 0.0.67
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -1213,6 +1213,7 @@ files:
 - spec/kern/assets/vm/controller19e.rb
 - spec/kern/assets/vm/controller19f.rb
 - spec/kern/assets/vm/controller19g.rb
+- spec/kern/assets/vm/controller19h.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb
@@ -1224,6 +1225,7 @@ files:
 - spec/kern/assets/vm/controller7.rb
 - spec/kern/assets/vm/controller8.rb
 - spec/kern/assets/vm/controller8b.rb
+- spec/kern/assets/vm/controller8ws.rb
 - spec/kern/assets/vm/controller9.rb
 - spec/kern/assets/vm/controller_exc_2watch.rb
 - spec/kern/assets/vm/controller_exc_ewatch.rb
@@ -2147,6 +2149,7 @@ test_files:
 - spec/kern/assets/vm/controller19e.rb
 - spec/kern/assets/vm/controller19f.rb
 - spec/kern/assets/vm/controller19g.rb
+- spec/kern/assets/vm/controller19h.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb
@@ -2158,6 +2161,7 @@ test_files:
 - spec/kern/assets/vm/controller7.rb
 - spec/kern/assets/vm/controller8.rb
 - spec/kern/assets/vm/controller8b.rb
+- spec/kern/assets/vm/controller8ws.rb
 - spec/kern/assets/vm/controller9.rb
 - spec/kern/assets/vm/controller_exc_2watch.rb
 - spec/kern/assets/vm/controller_exc_ewatch.rb