flok 0.0.80 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0211bf5635601e2e799ddd564e3612c8a02e1354
-  data.tar.gz: 45aa0d364ed30d8a2d01e0ca2d4cb2abcd2ab61b
+  metadata.gz: 34171632263d52984e5054c52cbe49a8a211a128
+  data.tar.gz: 864c32e073e18f76e714883b098c5fe8115b1cb7
 SHA512:
-  metadata.gz: f47cfbb76f1f5aa170fb8c38963c9df5a2d0179ef617d90c4f7981b733097cf26e6cc4c26c9a74881c1806c40a73a6935d0063ca489c7102630e767e63f59cdd
-  data.tar.gz: 2ab9e84d9daeccf7f11877a4443e8f36a4fcd3ede44cf0cc0ee7ee5a3413c946e9b20d694ee36c131633d8a3c568cc720d798064ca2a4817c441c44f0cb03d63
+  metadata.gz: 572ef58be4f5556a8627ebbbf9bbb5fd8e8088a435ef114bb539befd061f9790e6f39e9dc1b05134a79ed155a681c8688fe2570b45d3517cc8cbfa0f0847bf96
+  data.tar.gz: 479b11b9c06d97ca855c00813aaf7b5eaafa646df33b115df3e19d644c0ef90551bc59d7c6c1fdaf71ce23ce5b86c69963e5f93d2301ff2d4de513f17465a2ec

data/app/kern/services/vm.rb

@@ -29,7 +29,6 @@ service :vm do
         <%= p[:namespace] %>: {},
       <% end %>
     };
-
     ////////////////////////////////////////////////////////////////////////////////////////////
 
     //Cache
@@ -118,6 +117,22 @@ service :vm do
     //Part of the persist module
     //res is page
     function int_per_get_res(s, ns, id, res) {
+      if (ns === "__reserved__") {
+        if (id === "vm_unsynced") {
+          var old_vm_unsynced = vm_unsynced;
+          vm_unsynced = res;
+
+          <% @options[:pagers].each do |p| %>
+            var old_vm_unsynced_ns = old_vm_unsynced.<%= p[:namespace] %>;
+            var ids = Object.keys(old_vm_unsynced_ns);
+            for (var i = 0; i < ids.length; ++i) {
+              vm_unsynced.<%= p[:namespace] %>[ids[i]] = old_vm_unsynced_ns[ids[i]];
+            }
+          <% end %>
+        }
+        return;
+      }
+
       if (res !== null) {
         //Write out to the cache
         vm_transaction_begin();
@@ -517,7 +532,12 @@ service :vm do
       <% end %>
     };
 
+    //Does it need to be written to disk?
+    vm_unsynced_is_dirty = false;
+
     function vm_pg_mark_needs_sync(ns, page_id) {
+      vm_unsynced_is_dirty = true;
+
       //Add to list
       vm_unsynced[ns][page_id] = 0;
 
@@ -538,6 +558,8 @@ service :vm do
     }
 
     function vm_pg_unmark_needs_sync(ns, page_id) {
+      vm_unsynced_is_dirty = true;
+
       delete vm_unsynced[ns][page_id];
     }
 
@@ -557,6 +579,25 @@ service :vm do
         }
       <% end %>
     }
+
+    vm_unsynced_paged_in = false;
+    function vm_pg_sync_pagein() {
+      //Only pages-in if necessary
+      if (vm_unsynced_paged_in === false) {
+        vm_unsynced_paged_in = true;
+
+        //Send a disk read request
+        SEND("disk", "if_per_get", "vm", "__reserved__", "vm_unsynced");
+      }
+    }
+
+    function vm_pg_sync_pageout() {
+      //Only page-out if necessary
+      if (vm_unsynced_is_dirty === true) {
+        vm_unsynced_is_dirty = false;
+        SEND("disk", "if_per_set", "__reserved__", "vm_unsynced", JSON.stringify(vm_unsynced));
+      }
+    }
     ///////////////////////////////////////////////////////////////////////////
   }
 
@@ -765,5 +806,10 @@ service :vm do
   every 20.seconds, %{
     vm_pageout();
     vm_pg_sync_wakeup();
+    vm_pg_sync_pageout();
+  }
+
+  every 2.seconds, %{
+    vm_pg_sync_pagein();
   }
 end

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.80"
+  VERSION = "0.0.81"
 end

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

@@ -0,0 +1,19 @@
+#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"
+      }
+    },
+    {
+      :name => "pg_spec1",
+      :namespace => "spec1",
+      :options => {
+        "hello" => "world"
+      }
+    }
+  ]
+}

data/spec/kern/vm_service_unsynced_persist_spec.rb

@@ -0,0 +1,253 @@
+#The vm service unsynced to ensure that the unsynced survives a restart
+#by saving to the disk cache
+
+Dir.chdir File.join File.dirname(__FILE__), '../../'
+require './spec/env/kern.rb'
+require './spec/lib/helpers.rb'
+require './spec/lib/io_extensions.rb'
+require './spec/lib/rspec_extensions.rb'
+require 'zlib'
+
+RSpec.describe "kern:vm_service unsynced (persist)" do
+  include Zlib
+  include_context "kern"
+
+  it "Should have called vm_pg_sync_pagein after 2 seconds" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5c.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+    }
+
+    #Should not be loaded at this time
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(false)
+
+    #Call the timer for 2 seconds (should invoke the load for the pg_spec0_sync_request)
+    (2*4).times do
+      @driver.int "int_timer", []
+    end
+
+    #Should be loaded at this time
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(true)
+  end
+
+  it "vm_pg_sync_pagein should make a disk request; and only once if called multiple times" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5c.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_pg_sync_pagein();
+      vm_pg_sync_pagein();
+
+      int_dispatch([]);
+    }
+
+    #Should be loaded (manually called)
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(true)
+
+    #Should have made a disk request
+    @driver.ignore_up_to "if_per_get", 2
+
+    #Expect a request for the special page that holds vm_unsynced
+    res = @driver.get "if_per_get", 2
+    expect(res[1]).to eq("__reserved__")
+    expect(res[2]).to eq("vm_unsynced")
+
+    @driver.expect_not_to_contain "if_per_get"
+  end
+
+  it "vm_pg_sync_pagein should write out the read to vm_unsynced" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5c.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_pg_sync_pagein();
+
+      int_dispatch([]);
+    }
+
+    #Should be loaded (manually called)
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(true)
+
+    #Expect a request for the special page that holds vm_unsynced
+    @driver.ignore_up_to "if_per_get", 2
+    res = @driver.get "if_per_get", 2
+    expect(res[1]).to eq("__reserved__")
+    expect(res[2]).to eq("vm_unsynced")
+
+    #Return the vm_unsynced
+    @driver.int "int_per_get_res", [
+      "vm",
+      "__reserved__",
+      "vm_unsynced",
+      {
+        "spec" => {
+          "test" => 1
+        }
+      }
+    ]
+
+    #Expect vm_unsynced to have loaded the data
+    res = @ctx.dump("vm_unsynced")
+    expect(res).to eq({
+        "spec" => {
+          "test" => 1
+        }
+    })
+  end
+
+  it "vm_pg_sync_pagein should write out the read to vm_unsynced and merge if there are any existing elements" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5d.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_pg_sync_pagein();
+
+      vm_unsynced = {
+        "spec": {
+          "foo": 0
+        },
+
+        "spec1": {
+          "bar": 1
+        }
+      }
+
+      int_dispatch([]);
+    }
+
+    #Should be loaded (manually called)
+    expect(ctx.eval("vm_unsynced_paged_in")).to eq(true)
+
+    #Expect a request for the special page that holds vm_unsynced
+    @driver.ignore_up_to "if_per_get", 2
+    res = @driver.get "if_per_get", 2
+    expect(res[1]).to eq("__reserved__")
+    expect(res[2]).to eq("vm_unsynced")
+
+    #Return the vm_unsynced
+    @driver.int "int_per_get_res", [
+      "vm",
+      "__reserved__",
+      "vm_unsynced",
+      {
+        "spec" => {
+          "holah" => 1,
+        },
+        "spec1" => {
+        }
+      }
+    ]
+
+    #Expect vm_unsynced to have loaded the data
+    res = @ctx.dump("vm_unsynced")
+    expect(res).to eq({
+        "spec" => {
+          "foo" => 0,
+          "holah" => 1,
+        },
+        "spec1" => {
+          "bar" => 1
+        }
+    })
+  end
+
+  it "vm_pg_sync_pageout should save the vm_unsynced data to disk; and only once on multiple calls" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5c.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_unsynced = {
+        "spec": {
+          "foo": 0
+        },
+
+        "spec1": {
+          "bar": 1
+        }
+      }
+
+      //Request a save
+      vm_unsynced_is_dirty = true;
+      vm_pg_sync_pageout();
+      vm_pg_sync_pageout();
+
+      int_dispatch([]);
+    }
+
+    #Expect a write out
+    @driver.ignore_up_to "if_per_set", 2
+    res = @driver.get "if_per_set", 2
+    expect(res[0]).to eq("__reserved__")
+    expect(res[1]).to eq("vm_unsynced")
+    vm_unsynced_json = res[2]
+    expect(JSON.parse(vm_unsynced_json)).to eq({
+      "spec" => {
+        "foo" => 0
+      },
+      "spec1" => {
+        "bar" => 1
+      }
+    })
+
+    #Should not have two requests
+    @driver.expect_not_to_contain "if_per_set" 
+
+    expect(ctx.eval("vm_unsynced_is_dirty")).to eq(false)
+  end
+
+  it "vm_pg_sync_pageout should be called periodically every 20 seconds" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config5c.rb")
+    dump = ctx.evald %{
+      //Needed to initialize pagers
+      base = _embed("my_controller", 0, {}, null);
+
+      vm_unsynced = {
+        "spec": {
+          "foo": 0
+        },
+
+        "spec1": {
+          "bar": 1
+        }
+      }
+
+      //Ensure that pageout is going to be called
+      vm_unsynced_is_dirty = true;
+
+      int_dispatch([]);
+    }
+
+    #Expect no write out yet until 20s have passed
+    @driver.expect_not_to_contain "if_per_set"
+    (20*4).times do
+      @driver.int "int_timer", []
+    end
+
+    #Now we expect a write out as 20s have passed
+    #And the 0s should now be 1 because we called vm_pg_sync_wakeup() right before hand
+    @driver.ignore_up_to "if_per_set"
+    res = @driver.get "if_per_set", 2
+    expect(JSON.parse(res[2])).to eq(
+        "spec" => {
+          "foo" => 1
+        },
+
+        "spec1" => {
+          "bar" => 1
+        }
+    )
+
+    #Wait again 20 seconds
+    (20*4).times do
+      @driver.int "int_timer", []
+    end
+
+    #Expect no write out as we are not dirty
+    @driver.expect_not_to_contain "if_per_set"
+  end
+end

data/spec/kern/vm_service_unsynced_spec.rb

@@ -7,7 +7,7 @@ require './spec/lib/io_extensions.rb'
 require './spec/lib/rspec_extensions.rb'
 require 'zlib'
 
-RSpec.describe "kern:vm_service" do
+RSpec.describe "kern:vm_service unsynced" do
   include Zlib
   include_context "kern"
 
@@ -110,7 +110,7 @@ RSpec.describe "kern:vm_service" do
       vm_pg_mark_needs_sync("spec", "test");
     }
 
-    #Call the timer for 1 shot
+    #Call the timer for 1 shot of vm_sync_wakeup
     (20*4).times do
       @driver.int "int_timer", []
     end
@@ -118,7 +118,7 @@ RSpec.describe "kern:vm_service" do
     #First time, the vm_pg_sync_wakeup should not have triggered anything (vm_unsynced still set to 0)
     expect(ctx.dump("pg_spec0_sync_requests")).to eq(["test"])
 
-    #Call the timer for 1 more shot
+    #Call the timer for 1 more shot of vm_sync_wakeup 
     (20*4).times do
       @driver.int "int_timer", []
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -1206,6 +1206,7 @@ files:
 - spec/kern/assets/vm/config5.rb
 - spec/kern/assets/vm/config5b.rb
 - spec/kern/assets/vm/config5c.rb
+- spec/kern/assets/vm/config5d.rb
 - spec/kern/assets/vm/config6.rb
 - spec/kern/assets/vm/controller0.rb
 - spec/kern/assets/vm/controller0_diff.rb
@@ -1304,6 +1305,7 @@ files:
 - spec/kern/vm_service_mem_pagers_spec.rb
 - spec/kern/vm_service_net_sim_pager_spec.rb
 - spec/kern/vm_service_spec.rb
+- spec/kern/vm_service_unsynced_persist_spec.rb
 - spec/kern/vm_service_unsynced_spec.rb
 - spec/kern/vm_sockio_pager_spec.rb
 - spec/kern/vm_transaction_spec.rb
@@ -2156,6 +2158,7 @@ test_files:
 - spec/kern/assets/vm/config5.rb
 - spec/kern/assets/vm/config5b.rb
 - spec/kern/assets/vm/config5c.rb
+- spec/kern/assets/vm/config5d.rb
 - spec/kern/assets/vm/config6.rb
 - spec/kern/assets/vm/controller0.rb
 - spec/kern/assets/vm/controller0_diff.rb
@@ -2254,6 +2257,7 @@ test_files:
 - spec/kern/vm_service_mem_pagers_spec.rb
 - spec/kern/vm_service_net_sim_pager_spec.rb
 - spec/kern/vm_service_spec.rb
+- spec/kern/vm_service_unsynced_persist_spec.rb
 - spec/kern/vm_service_unsynced_spec.rb
 - spec/kern/vm_sockio_pager_spec.rb
 - spec/kern/vm_transaction_spec.rb