flok 0.0.36 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a8425b97376c2855610394bfe1e5c12a498005
-  data.tar.gz: 4a274f3ba25a295cb5971eef748a1e48cb5ac952
+  metadata.gz: 847b5b5b82356f175e5193de663c69487bc543fc
+  data.tar.gz: 06b557dd275ee22398619033cc94b893eb815cc8
 SHA512:
-  metadata.gz: 2cf06cfac24fbaa78bed6f8bebdf63631325a32755fe38bfd7ec27368ccf411fdcdcf48b3b3d3dc7de4cee31c5e2ae845395b555d2c688a4a149ea9b5e21e03e
-  data.tar.gz: 5ab28831852850064e7e6f2ae4484e937cf825e1fd197fa887f53bd320ddb070aa2d7d2aacb3f6a9d50e761b408268f2af9e62f63d30aa64d652cd6ffa8008f8
+  metadata.gz: 2dd662522a021063c44cfdbea4db37ea388f7d82f42108be93cd2b68507286b21650e524c9a2f99d2025781a375ae6d133383bb767e77cfa5af9642d37467f36
+  data.tar.gz: eed43cf8edd7d656d0364770c73468658bff40759621629f3e127627327ab7c9f03a3d3bf4200c079a5293297216fac924efb35bd259bb474bd1e97c6687ce26

data/Rakefile

@@ -67,6 +67,7 @@ namespace :build do
     #What platform are we working with?
     raise "No $PLATFORM given" unless platform = ENV["PLATFORM"]
     raise "No $FLOK_ENV given" unless environment = ENV["FLOK_ENV"]
+
     build_path = "./products/#{platform}"
 
     Flok.build_world(build_path, platform, environment)

data/app/drivers/chrome/build_context.rb

@@ -6,7 +6,7 @@ module Chrome
       @debug = (ENV['FLOK_ENV'] == "DEBUG")
       @release = (ENV['FLOK_ENV'] == "RELEASE")
       Dir.chdir File.join(File.dirname(__FILE__), "../../../") do
-        @mods = Flok::Platform.mods(ENV['PLATFORM'], ENV['FLOK_ENV'])
+        @mods = Flok::Platform.mods(ENV['FLOK_ENV'])
       end
     end
 

data/app/drivers/chrome/config.yml

@@ -8,6 +8,11 @@ DEBUG:
     - controller
     - debug
     - sockio
+    - persist
+    - timer
+  defines:
+    - mem_pager
+    - sockio_pager
 RELEASE:
   mods:
     - ui
@@ -16,3 +21,8 @@ RELEASE:
     - segue
     - controller
     - sockio
+    - persist
+    - timer
+  defines:
+    - mem_pager
+    - sockio_pager

data/app/drivers/chrome/pipe.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'tempfile'
 require 'securerandom'
 require 'open3'
+$stdout.sync = true
 
 #Interactive pipe for testing.
 #Creates a server that routes $stdin into if_dispatch and $stdout to int_dispatch.
@@ -33,7 +34,29 @@ class InteractiveServer
           if results[0].include? STDIN
             begin
               q = gets.strip
-              inp.puts "if_dispatch(JSON.parse('#{q}'))"
+              if q == "RESTART"
+                inp.puts "$__RESTART__"
+
+                begin
+                  #Wait for restart to respond 'ok'
+                  Timeout::timeout(10) do
+                    restart_res = out.readline
+                    raise "Restart of phantomjs did not return '__RESTART_OK__' like expected, returned: #{restart_res.inspect}" unless restart_res == "$__RESTART_OK__\n"
+                  end
+                rescue Timeout::Error
+                  raise "Restart of boojs did not happen within 5 seconds"
+                rescue EOFError
+                  #Sleep for a second to let the error pipe fill up from boojs, this error
+                  #will then be displayed and then we will crash
+                  sleep 3
+                  $stderr.puts err.read
+                  raise "boojs encountered an error"
+                end
+
+                puts "RESTART OK"
+              else
+                inp.puts "if_dispatch(JSON.parse('#{q}'))"
+              end
             rescue Errno::EIO
               #Can't say anything here, we don't have a pipe
               exit 1

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

@@ -0,0 +1,29 @@
+function if_per_set(ns, key, value) {
+  var _ns = store.namespace(ns);
+  _ns.set(key, value)
+}
+
+function if_per_del(ns, key) {
+  var _ns = store.namespace(ns);
+  _ns.remove(key);
+}
+
+function if_per_del_ns(ns) {
+  var _ns = store.namespace(ns);
+  _ns.clearAll();
+}
+
+function if_per_get(s, ns, key) {
+  function async() {
+    var _ns = store.namespace(ns);
+    var res = _ns.get(key);
+    int_dispatch([2, "int_per_get_res", s, res]);
+  }
+  setTimeout(async, 0);
+}
+
+function if_per_get_sync(s, ns, key) {
+  var _ns = store.namespace(ns);
+  var res = _ns.get(key);
+  int_dispatch([2, "int_per_get_res", s, res]);
+}

data/app/drivers/chrome/src/sockio.js

@@ -1,7 +1,9 @@
 sp_to_sockio = {}
 
 function if_sockio_init(url, sp) {
-  sp_to_sockio[sp] = io(url);
+  sp_to_sockio[sp] = io(url, {
+    "forceNew": true
+  });
 }
 
 function if_sockio_fwd(sp, event_name, bp) {

data/app/drivers/chrome/src/vendor/store2.js

@@ -0,0 +1,3 @@
+/*! store2 - v2.3.0 - 2015-05-22
+* Copyright (c) 2015 Nathan Bubna; Licensed MIT, GPL */
+(function(t,e){var n={version:"2.3.0",areas:{},apis:{},inherit:function(t,e){for(var n in t)e.hasOwnProperty(n)||(e[n]=t[n]);return e},stringify:function(t){return void 0===t||"function"==typeof t?t+"":JSON.stringify(t)},parse:function(t){try{return JSON.parse(t)}catch(e){return t}},fn:function(t,e){n.storeAPI[t]=e;for(var i in n.apis)n.apis[i][t]=e},get:function(t,e){return t.getItem(e)},set:function(t,e,n){t.setItem(e,n)},remove:function(t,e){t.removeItem(e)},key:function(t,e){return t.key(e)},length:function(t){return t.length},clear:function(t){t.clear()},Store:function(t,e,i){var r=n.inherit(n.storeAPI,function(t,e,n){return 0===arguments.length?r.getAll():void 0!==e?r.set(t,e,n):"string"==typeof t?r.get(t):t?r.setAll(t,e):r.clear()});r._id=t;try{var s="_safariPrivate_";e.setItem(s,"sucks"),r._area=e,e.removeItem(s)}catch(a){}return r._area||(r._area=n.inherit(n.storageAPI,{items:{},name:"fake"})),r._ns=i||"",n.areas[t]||(n.areas[t]=r._area),n.apis[r._ns+r._id]||(n.apis[r._ns+r._id]=r),r},storeAPI:{area:function(t,e){var i=this[t];return i&&i.area||(i=n.Store(t,e,this._ns),this[t]||(this[t]=i)),i},namespace:function(t,e){if(!t)return this._ns?this._ns.substring(0,this._ns.length-1):"";var i=t,r=this[i];return r&&r.namespace||(r=n.Store(this._id,this._area,this._ns+i+"."),this[i]||(this[i]=r),e||r.area("session",n.areas.session)),r},isFake:function(){return"fake"===this._area.name},toString:function(){return"store"+(this._ns?"."+this.namespace():"")+"["+this._id+"]"},has:function(t){return this._area.has?this._area.has(this._in(t)):!!(this._in(t)in this._area)},size:function(){return this.keys().length},each:function(t,e){for(var i=0,r=n.length(this._area);r>i;i++){var s=this._out(n.key(this._area,i));if(void 0!==s&&t.call(this,s,e||this.get(s))===!1)break;r>n.length(this._area)&&(r--,i--)}return e||this},keys:function(){return this.each(function(t,e){e.push(t)},[])},get:function(t,e){var i=n.get(this._area,this._in(t));return null!==i?n.parse(i):e||i},getAll:function(){return this.each(function(t,e){e[t]=this.get(t)},{})},set:function(t,e,i){var r=this.get(t);return null!=r&&i===!1?e:n.set(this._area,this._in(t),n.stringify(e),i)||r},setAll:function(t,e){var n,i;for(var r in t)i=t[r],this.set(r,i,e)!==i&&(n=!0);return n},remove:function(t){var e=this.get(t);return n.remove(this._area,this._in(t)),e},clear:function(){return this._ns?this.each(function(t){n.remove(this._area,this._in(t))},1):n.clear(this._area),this},clearAll:function(){var t=this._area;for(var e in n.areas)n.areas.hasOwnProperty(e)&&(this._area=n.areas[e],this.clear());return this._area=t,this},_in:function(t){return"string"!=typeof t&&(t=n.stringify(t)),this._ns?this._ns+t:t},_out:function(t){return this._ns?t&&0===t.indexOf(this._ns)?t.substring(this._ns.length):void 0:t}},storageAPI:{length:0,has:function(t){return this.items.hasOwnProperty(t)},key:function(t){var e=0;for(var n in this.items)if(this.has(n)&&t===e++)return n},setItem:function(t,e){this.has(t)||this.length++,this.items[t]=e},removeItem:function(t){this.has(t)&&(delete this.items[t],this.length--)},getItem:function(t){return this.has(t)?this.items[t]:null},clear:function(){for(var t in this.list)this.removeItem(t)},toString:function(){return this.length+" items in "+this.name+"Storage"}}};t.store&&(n.conflict=t.store);var i=n.Store("local",function(){try{return localStorage}catch(t){}}());i.local=i,i._=n,i.area("session",function(){try{return sessionStorage}catch(t){}}()),t.store=i,"function"==typeof e&&void 0!==e.amd?e(function(){return i}):"undefined"!=typeof module&&module.exports&&(module.exports=i)})(this,this.define);

data/app/kern/callout.js

@@ -0,0 +1,55 @@
+callout_tick = 0;
+callout_queue = {};
+
+function callout_wakeup() {
+  callout_tick += 1;
+
+  //Get an array of things that should fire now
+  var arr = callout_queue[callout_tick];
+  if (arr === undefined) {
+    return;
+  }
+  delete callout_queue[callout_tick];
+
+  for (var i = 0; i < arr.length; ++i) {
+    var e = arr[i];
+
+    //Send event
+    var ep_ok = int_event(e.ep, e.ename, {});
+
+    //Reschedule interval if the ep still exists
+    if (e.interval && ep_ok) {
+      reg_interval(e.ep, e.ename, e.ticks);
+    }
+  }
+}
+
+function reg_timeout(ep, ename, ticks) {
+  //Create an array if there isn't already one
+  if (callout_queue[ticks+callout_tick] === undefined) {
+    callout_queue[ticks+callout_tick] = [];
+  }
+
+  //Insert an item
+  callout_queue[ticks+callout_tick].push({
+    ep: ep,
+    ename: ename,
+    ticks: ticks,
+    interval: false
+  });
+}
+
+function reg_interval(ep, ename, ticks) {
+  //Create an array if there isn't already one
+  if (callout_queue[ticks+callout_tick] === undefined) {
+    callout_queue[ticks+callout_tick] = [];
+  }
+
+  //Insert an item
+  callout_queue[ticks+callout_tick].push({
+    ep: ep,
+    ename: ename,
+    ticks: ticks,
+    interval: true 
+  });
+}

data/app/kern/controller.js

@@ -90,6 +90,9 @@ function _embed(vc_name, sp, context, event_gw) {
   //Register the event handler callback
   reg_evt(base, controller_event_callback);
 
+  //Call __init__
+  cte.__init__(base);
+
   //Call the on_entry function with the base address
   cte.actions[action].on_entry(base);
 

data/app/kern/crc32.js

@@ -0,0 +1,22 @@
+function crc_init() {
+  var c;
+  crc_table = [];
+  for (var n = 0; n < 256; n++) {
+    c = n;
+    for (var k = 0; k < 8; k++) {
+      c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+    }
+    crc_table[n] = c;
+  }
+}
+crc_init();
+
+function crc32(seed, str) {
+  var crc = seed ^ (-1);
+
+  for (var i = 0; i < str.length; i++) {
+    crc = (crc >>> 8) ^ crc_table[(crc ^ str.charCodeAt(i)) & 0xFF];
+  }
+
+  return (crc ^ (-1)) >>> 0;
+};

data/app/kern/dispatch.js

@@ -96,6 +96,16 @@ function int_dispatch(q) {
     gpu_q_rem -= n;
   }
 
+  //Send async queue
+  if (async_q.length > 0) {
+    var out = [5];
+    for (var i = 0; i < async_q.length; ++i) {
+      out.push.apply(out, async_q[i]);
+    }
+    dump.push(out);
+    async_q = [];
+  }
+
   if (dump.length != 0) {
     if_dispatch(dump);
   }
@@ -125,6 +135,8 @@ function ping3(arg1) {
     SEND("cpu", "pong3");
   } else if (arg1 == "gpu") {
     SEND("gpu", "pong3");
+  } else if (arg1 == "async") {
+    SEND("async", "pong3");
   }
 }
 
@@ -139,6 +151,8 @@ function ping4(arg1) {
     SEND("cpu", "pong4");
   } else if (arg1 == "gpu") {
     SEND("gpu", "pong4");
+  } else if (arg1 == "async") {
+    SEND("async", "pong4");
   }
 }
 
@@ -152,6 +166,7 @@ function ping4_int(arg1) {
     ++cpu_q_rem;
   } else if (arg1 == "gpu") {
     ++gpu_q_rem;
+  } else if (arg1 == "async") {
   }
 }
 
@@ -161,6 +176,7 @@ net_q = [];
 disk_q = [];
 cpu_q = [];
 gpu_q = [];
+async_q = [];
 
 //Each queue has a max # of things that can be en-queued
 //These are decremented when the message is sent (not just queued)

data/app/kern/mod/event.js

@@ -5,6 +5,9 @@ function int_event(ep, event_name, info) {
   var f = evt[ep];
   if (f != undefined) {
     f(ep, event_name, info);
+    return true;
+  } else {
+    return false;
   }
 }
 

data/app/kern/mod/persist.js

@@ -0,0 +1 @@
+//Stub

data/app/kern/mod/timer.js

@@ -0,0 +1,5 @@
+//SEND("cpu", "if_timer_init", 4);
+
+function int_timer() {
+  callout_wakeup();
+}

data/app/kern/pagers/mem_pager.js

@@ -0,0 +1,2 @@
+<% if @defines['mem_pager'] %>
+<% end %>

data/app/kern/pagers/sockio_pager.js

@@ -0,0 +1,66 @@
+<% if @defines['sockio_pager'] %>
+  sockio_pager_data = {};
+
+  sockio_pager_sp = null;
+  sockio_pager_bp = null;
+  waiting_bp = null;
+  function sockio_pager_init(options) {
+    sockio_pager_sp = tels(1);
+    sockio_pager_bp = tels(1);
+    SEND("main", "if_sockio_init", options.url, sockio_pager_sp);
+    reg_evt(sockio_pager_bp, sockio_pager_sp_endpoint);
+    SEND("async", "if_sockio_fwd", sockio_pager_sp, "read_res", sockio_pager_bp);
+    SEND("async", "if_sockio_fwd", sockio_pager_sp, "notify", sockio_pager_bp);
+  }
+
+  function sockio_pager_read_sync(ns, bp, key) {
+    throw "sockio_pager does not support read_sync"
+  }
+
+  function sockio_pager_read(ns, bp, key) {
+    var info = {
+      key: key,
+      bp: bp
+    }
+
+    SEND("async", "if_sockio_send", sockio_pager_sp, "read", info);
+
+    waiting_bp = bp;
+  }
+
+  function sockio_pager_write(key, value) {
+    throw "sockio_pager does not support write"
+  }
+
+  //Where socket.io data comes in
+  function sockio_pager_sp_endpoint(ep, ename, info) {
+    if (ename === "read_res") {
+      var bp = info.bp;
+      var key = info.key;
+      var value = info.value;
+      int_event(waiting_bp, "read_res", info);
+      vm_cache_write("net", key, value);
+    } else if (ename === "notify") {
+      var key = info.key;
+      vm_notify("net", key);
+    }
+  }
+
+  function sockio_pager_watch(ns, key) {
+    var info = {
+      ns: ns,
+      key: key
+    }
+    SEND("async", "if_sockio_send", sockio_pager_sp, "watch", info);
+  }
+
+  function sockio_pager_unwatch(ns, key) {
+    var info = {
+      ns: ns,
+      key: key
+    }
+    SEND("async", "if_sockio_send", sockio_pager_sp, "unwatch", info);
+  }
+
+
+<% end %>

data/app/kern/pagers/spec0.js

@@ -0,0 +1,35 @@
+<% if @debug %>
+spec0_data = {};
+spec0_read_count = 0;
+
+function spec0_init(options) {
+  spec0_init_options = options;
+}
+
+function spec0_read_sync(ns, bp, key) {
+  spec0_read_count += 1;
+
+  var info = {
+    key: key,
+    value: spec0_data[key],
+  }
+  int_event(bp, "read_res", info);
+  //vm_cache[ns][key] = spec0_data[key];
+}
+
+function spec0_read(ns, bp, key) {
+  spec0_read_count += 1;
+
+  var info = {
+    key: key,
+    value: spec0_data[key],
+  }
+
+  int_event(bp, "read_res", info);
+  vm_cache_write(ns, key, spec0_data[key]);
+}
+
+function spec0_write(key, value) {
+  spec0_data[key] = value;
+}
+<% end %>

data/app/kern/pagers/spec1.js

@@ -0,0 +1,24 @@
+<% if @debug %>
+spec1_value = "a";
+
+function spec1_init(options) {
+  spec1_init_options = options;
+}
+
+function spec1_read_sync(ns, bp, key) {
+  throw "unsupported"
+}
+
+function spec1_read(ns, bp, key) {
+  var info = {
+    key: key,
+    value: spec1_value,
+  }
+
+  int_event(bp, "read_res", info);
+  vm_cache_write(ns, key, spec1_value);
+
+  //Now change the value
+  spec1_value = "b";
+}
+<% end %>

data/app/kern/pagers/spec2.js

@@ -0,0 +1,31 @@
+<% if @debug %>
+spec2_value = "a";
+
+function spec2_init(options) {
+  spec2_init_options = options;
+}
+
+function spec2_read_sync(ns, bp, key) {
+  throw "unsupported"
+}
+
+function spec2_read(ns, bp, key) {
+  var info = {
+    key: key,
+    value: spec2_value,
+  }
+
+  int_event(bp, "read_res", info);
+  vm_cache_write(ns, key, spec2_value);
+
+  //Now change the value
+  spec2_value = "b";
+}
+
+function spec2_watch(ns, key) {
+}
+
+function spec2_spec_trigger() {
+  vm_notify("user", "my_key");
+}
+<% end %>