flok 0.0.87 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe6aff1ca42440bbac2069214724add409de0e8
-  data.tar.gz: 9a0fd374f5b7787f71c6926e1502e287be3b96a6
+  metadata.gz: 7f7c1d58d114b65944fe9b7c0b93cf3f1add02ab
+  data.tar.gz: 3b56e5c4a6e7e99fbb8a6dc08100890141cbe934
 SHA512:
-  metadata.gz: 0cda7f2305edd0b418dd09bd3b36bfd4ecfd69cec19a5a023ae5e0f84163d3dde95f1fe7b6ca8e78ad614e098cedacb7f29fc232ad431dd4a80d2daac3dbbb19
-  data.tar.gz: bce8a88f827beb44dd3921d13c541c56fa1be3fa3230aaab9f79817336fa8efa8cc0095aba94f3285dd2c156f9916758f116f707418d4736f25b39c8b3c5b841
+  metadata.gz: f8df5aa50fea837620349c56c9910bd63b12bf66a823a7fbf80c24b8a71371c34c681effb071971d7ba421b1f11d28475a8665222f1c40b8491dc337835c1b56
+  data.tar.gz: 28957c4505e8e45fb166c0e1975c299e2469cdb18d5c07daff402f411b3cc63343bea482e5f8e1c3f82dfc93c539f4a525bd94fa03ebdb6f07257c702ac2266a

data/app/drivers/chrome/config.yml

@@ -10,6 +10,7 @@ DEBUG:
     - sockio
     - persist
     - timer
+    - rtc
   defines:
     - mem_pager
     - sockio_pager
@@ -23,6 +24,7 @@ RELEASE:
     - sockio
     - persist
     - timer
+    - rtc
   defines:
     - mem_pager
     - sockio_pager

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

@@ -0,0 +1,9 @@
+function rtc_callback() {
+  //Call timer interrupt
+  int_dispatch([0, "int_rtc", Math.floor(new Date() / 1000)]);
+}
+
+function if_rtc_init(tps) {
+  //Call timer 1 time per second
+  setInterval(rtc_callback, 1000.0);
+}

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

@@ -1,6 +1,6 @@
 function timer_callback() {
   //Call timer interrupt
-  int_dispatch([0, "int_timer"]);
+  int_dispatch([0, "int_timer"])
 }
 
 function if_timer_init(tps) {

data/app/kern/mod/rtc.js

@@ -0,0 +1,5 @@
+__epoch__ = -1;
+
+function int_rtc(epoch) {
+  __epoch__ = epoch;
+}

data/app/kern/time.js

@@ -0,0 +1,4 @@
+function time() {
+  //Usually defined in rtc
+  return __epoch__;
+}

data/docs/kernel_api.md

@@ -42,6 +42,9 @@ instead.
 ##Timers
   * See [./callout.md](Callout) for how to register a timer
 
+##Time
+  * `time()` - Returns the time in seconds since 1970 (unix epoch). Must have a compatible module, [`rtc`]
+
 ##Things that are compiled into the kernel from user given data
 `MODS` - A list of modules that was specified in `./app/drivers/$PLATFORM/config.yml`
 `PLATFORM` - The platform that this kernel was compiled with

data/docs/mod/rtc.md

@@ -0,0 +1,10 @@
+#Real Time Clock (rtc.js)
+
+###Driver
+`if_rtc_init()` - Initialize the RTC module.
+
+###Interrupts
+`int_rtc(epoch)` - Called every second to indicate that a second has passed.
+
+###Helper functions
+`time()` - Retrieves the time as an integer based on the unix epoch (Seconds since 1970)

data/docs/mod/speech.md

@@ -9,4 +9,4 @@ There is a software-simulation of the `speech` module. To enable it, put `speech
 `int_speech_cancelled()` - The speech was cancelled
 `int_speech_finished()` - The speech completed succesfully
 `int_speech_started()` - The speech has started
-`int_will_speak_range(offset, count)` - The speech is in the process of talking over a range of the text
+`int_will_speak_range(offset, count)` - The speech is in the process of talking over a range of the text

data/docs/mod/timer.md

@@ -4,7 +4,8 @@
 `if_timer_init(tps)` - Initiate a timer that calls `int_timer` N `tps` (ticsk per second). This is always called via the cpu scheduling class (3)
 
 ###Interrupts
-`int_timer` - Called by the device at the rate described in `tps`. This function lives inside the `timer` service's initialization portion.
+`int_timer()` - Called by the device at the rate described in `tps`. This function lives inside the `timer` service's initialization portion.
+A. Requires the timer module.
 
 ###Callout
 The kernel's `int_timer` function gets sent to `callout_wakeup()` located in `callout.js`.

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.87"
+  VERSION = "0.0.88"
 end

data/spec/iface/driver/rtc_spec.rb

@@ -0,0 +1,45 @@
+Dir.chdir File.join File.dirname(__FILE__), '../../../'
+require './spec/env/iface.rb'
+require './spec/lib/helpers.rb'
+require './spec/lib/io_extensions.rb'
+require './spec/lib/rspec_extensions.rb'
+
+RSpec.describe "iface:driver:rtc" do
+  module_dep "rtc"
+  include_context "iface:driver"
+
+  it "Does update epoch every second" do
+    #Wait for response
+    @pipe.puts [[0, 0, "ping"]].to_json; @pipe.readline_timeout
+
+    @pipe.puts [[0, 1, "if_rtc_init"]].to_json
+
+    #Wait to start until after the 1st event fires to make sure timer started up
+    @pipe.readline
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "int_rtc", Fixnum], 5.seconds)
+    start_time = Time.now.to_i
+    5.times do
+      expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "int_rtc", Fixnum], 2.seconds)
+    end
+    end_time = Time.now.to_i
+
+    #Just leave some room for connection latency, etc.
+    expect(end_time - start_time).to be < 7
+    expect(end_time - start_time).to be > 4
+
+    #Now let's compare one-to-three 'ticks'
+    a = JSON.parse(@pipe.readline_timeout)
+    sleep 1
+    b = JSON.parse(@pipe.readline_timeout)
+
+    #They should be at least 1 second apart and not more than 3
+    a_timestamp = a[2]
+    b_timestamp = b[2]
+    expect(b_timestamp - a_timestamp).to be > 0
+    expect(b_timestamp - a_timestamp).to be < 4
+
+    #Should match the current epoch within 1 minute
+    current_epoch = Time.now.to_i
+    expect((b_timestamp - current_epoch).abs).to be < 60
+  end
+end

data/spec/iface/driver/timer_spec.rb

@@ -5,7 +5,7 @@ require './spec/lib/io_extensions.rb'
 require './spec/lib/rspec_extensions.rb'
 
 RSpec.describe "iface:driver:timer" do
-  module_dep "net"
+  module_dep "timer"
   include_context "iface:driver"
 
   it "Can call initiate a timer" do

data/spec/kern/rtc_spec.rb

@@ -0,0 +1,26 @@
+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'
+
+RSpec.describe "kern:rtc_spec" do
+  include_context "kern"
+
+  it "Does update the epoch when receiving the int_rtc message" do
+    #Compile the controller
+    ctx = flok_new_user File.read('./spec/kern/assets/blank.rb')
+
+    @driver.int("int_rtc", [555])
+    dump = ctx.evald %{
+      dump.time = time()
+    }
+    expect(dump["time"]).to eq(555)
+
+    @driver.int("int_rtc", [556])
+    dump = ctx.evald %{
+      dump.time = time()
+    }
+    expect(dump["time"]).to eq(556)
+  end
+end

data/spec/lib/rspec_extensions.rb

@@ -97,7 +97,21 @@ RSpec::Matchers.define :readline_and_equal_json_x_within_y_seconds do |json, sec
     begin
       Timeout::timeout(seconds) do
         @res = JSON.parse(pipe.readline.strip)
-        return true if @res == json
+
+        if json.class != Array
+          return true if @res == json
+        else
+          expect(@res.length).to eq(json.length)
+          @res.each_with_index do |r, i|
+            if json[i] == Fixnum
+              expect(r.class).to eq(Fixnum)
+            else
+              expect(r).to eq(json[i])
+            end
+          end
+          return true
+        end
+
       end
     rescue Timeout::Error #Time out
     rescue EOFError #Couldn't read pipe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.87
+  version: 0.0.88
 platform: ruby
 authors:
 - seo
@@ -285,6 +285,7 @@ files:
 - app/drivers/chrome/src/helpers.js
 - app/drivers/chrome/src/net.js
 - app/drivers/chrome/src/persist.js
+- app/drivers/chrome/src/rtc.js
 - app/drivers/chrome/src/segue.js
 - app/drivers/chrome/src/sockio.js
 - app/drivers/chrome/src/timer.js
@@ -304,6 +305,7 @@ files:
 - app/kern/mod/event.js
 - app/kern/mod/net.js
 - app/kern/mod/persist.js
+- app/kern/mod/rtc.js
 - app/kern/mod/segue.js
 - app/kern/mod/sockio.js
 - app/kern/mod/timer.js
@@ -319,6 +321,7 @@ files:
 - app/kern/services/vm.rb
 - app/kern/spec_helper.js
 - app/kern/tel.js
+- app/kern/time.js
 - bin/flok
 - docs/architecture.md
 - docs/branches.md
@@ -345,6 +348,7 @@ files:
 - docs/mod/intercept.md
 - docs/mod/net.md
 - docs/mod/persist.md
+- docs/mod/rtc.md
 - docs/mod/sockio.md
 - docs/mod/speech.md
 - docs/mod/timer.md
@@ -1130,6 +1134,7 @@ files:
 - spec/iface/driver/persist_spec.rb
 - spec/iface/driver/ping_spec.rb
 - spec/iface/driver/pipe_spec.rb
+- spec/iface/driver/rtc_spec.rb
 - spec/iface/driver/sockio_spec.rb
 - spec/iface/driver/timer_spec.rb
 - spec/iface/driver/ui_spec.rb
@@ -1303,6 +1308,7 @@ files:
 - spec/kern/functions_spec.rb
 - spec/kern/global_functions_spec.rb
 - spec/kern/rest_service_spec.rb
+- spec/kern/rtc_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/test_service_spec.rb
 - spec/kern/vm_service_functional_spec.rb
@@ -2086,6 +2092,7 @@ test_files:
 - spec/iface/driver/persist_spec.rb
 - spec/iface/driver/ping_spec.rb
 - spec/iface/driver/pipe_spec.rb
+- spec/iface/driver/rtc_spec.rb
 - spec/iface/driver/sockio_spec.rb
 - spec/iface/driver/timer_spec.rb
 - spec/iface/driver/ui_spec.rb
@@ -2259,6 +2266,7 @@ test_files:
 - spec/kern/functions_spec.rb
 - spec/kern/global_functions_spec.rb
 - spec/kern/rest_service_spec.rb
+- spec/kern/rtc_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/test_service_spec.rb
 - spec/kern/vm_service_functional_spec.rb