goat 0.3.47 → 0.3.48

data/bin/channel-srv

@@ -155,7 +155,7 @@ def usage
 end
 
 OptionParser.new do |opts|
-  opts.on('-pMANDATORY', Integer) {|p| $port = p}
+  opts.on('-pMANDATORY', Integer) {|p| $port = r}
   opts.on('-HMANDATORY', String) {|h| $host = h}
   opts.on('-SMANDATORY', String) {|h| $statesrv_host = h}
   opts.on('-sMANDATORY', Integer) {|p| $statesrv_port = p}

data/bin/state-srv

@@ -13,6 +13,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '../lib'))
 
 require 'goat/common'
 require 'goat/net-common'
+require 'goat/extn'
 
 module Goat
   module StateSrv
@@ -190,7 +191,8 @@ module Goat
       end
 
       def memusage
-        $stderr.puts "Components in memory: #{@components_by_id.values.count}"
+        Goat.logd "Components in memory: #{@components_by_id.values.count}"
+        @components_by_id.values.map(&:cls).tally.sort.each {|k, v| Goat.logd "#{k} - #{v}"}
       end
     end
 
@@ -236,6 +238,10 @@ module Goat
           updates.map(&:removed).flatten.each{|c| @registry.delete_component(c)}
 
           updates.each {|u| handle_component_update(txn, u)}
+          if txn
+            txn_complete_update(pgid, txn)
+          end
+
           send_updates(pgid)
 
           {'type' => 'update_ack', 'components' => updates.map{|u| u.skel.id}}
@@ -260,7 +266,8 @@ module Goat
           if c = @registry.find_id(msg['id'])
             c.to_hash
           else
-            raise "Couldn't find component #{msg['id']}"
+            Goat.logw "Couldn't find component #{msg['id']}"
+            {} # if we return nil, no resp will be sent
           end
         end
 
@@ -289,17 +296,18 @@ module Goat
             msgs = []
 
             need.each do |u|
-              msgs << {
-                'pgid' => pgid,
-                'class' => u.skel.cls,
-                'id' => u.skel.id,
-                'type' => 'component_updated',
-                'updates' => u.mutations,
-                'version' => u.version
-              }
-
-              txn = vers[u.version]
-              msgs << {'type' => 'txn_complete', 'txn' => txn} if txn
+              if u.is_a?(ComponentUpdate)
+                msgs << {
+                  'pgid' => pgid,
+                  'class' => u.skel.cls,
+                  'id' => u.skel.id,
+                  'type' => 'component_updated',
+                  'updates' => u.mutations,
+                  'version' => u.version
+                }
+              elsif u.is_a?(TxnCompleteUpdate)
+                msgs << {'type' => 'txn_complete', 'txn' => u.txn, 'version' => u.version}
+              end
             end
 
             send_message(chsrv_id, 'page_updated', {'pgid' => pgid, 'messages' => msgs}) unless msgs.empty?
@@ -329,6 +337,11 @@ module Goat
           end
         end
 
+        def txn_complete_update(pgid, txn)
+          @registry.incr_page_version(pgid)
+          @registry.add_update(pgid, txn, TxnCompleteUpdate.new(@registry.page_version(pgid), txn))
+        end
+
         def page_connected(msg)
           ensure_keys(msg, %w{pgid chsrv version})
 
@@ -401,6 +414,16 @@ module Goat
         if ObjectSpace.respond_to?(:live_objects)
           Goat.logd "Done. Live objects: #{ObjectSpace.live_objects}"
         end
+
+        maybe_print_statistics
+      end
+
+      def maybe_print_statistics
+        @last_printed ||= Time.now
+        if Time.now - @last_printed > 2
+          Delegate.registry.memusage
+        end
+        @last_printed = Time.now
       end
     end
 
@@ -428,16 +451,6 @@ module Goat
         else
           $stderr.puts "Delegate doesn't respond to #{type.inspect}"
         end
-
-        maybe_print_statistics
-      end
-
-      def maybe_print_statistics
-        @last_printed ||= Time.now
-        if Time.now - @last_printed > 10
-          Delegate.registry.memusage
-        end
-        @last_printed = Time.now
       end
 
       def unbind

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.47'
+  s.version = '0.3.48'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat.rb

@@ -32,15 +32,16 @@ require 'goat/dynamic'
 
 $verbose ||= ARGV.include?('-v')
 
-class Profile
-  # TODO make sure not already defined
-  def self.in(*args); end
-  def self.out(*args); end
-  def self.request_start(*args); end
-  def self.request_end(*args); end
+unless defined?(Profile)
+  class Profile
+    # TODO make sure not already defined
+    def self.in(*args); end
+    def self.out(*args); end
+    def self.request_start(*args); end
+    def self.request_end(*args); end
+  end
 end
 
-
 class String
   def prefix_ns(ns)
     self.gsub(/^%(.+)$/, "#{ns}_\\1")

data/lib/goat/common.rb

@@ -53,9 +53,21 @@ module Goat
     end
   end
 
-  class ComponentUpdate
-    attr_reader :skel, :mutations, :added, :removed
+  class PageUpdate
     attr_accessor :version
+  end
+
+  class TxnCompleteUpdate < PageUpdate
+    attr_reader :txn
+
+    def initialize(version, txn)
+      @version = version
+      @txn = txn
+    end
+  end
+
+  class ComponentUpdate < PageUpdate
+    attr_reader :skel, :mutations, :added, :removed
 
     def initialize(skel, mutations, added, removed)
       @skel = skel

data/lib/goat/extn.rb

@@ -30,6 +30,16 @@ class String
   end
 end
 
+module Enumerable
+  def tally
+    h = {}
+    self.each do |elt|
+      h[elt] = h.fetch(elt, 0) + 1
+    end
+    h
+  end
+end
+
 class Object
   def self.superclasses(upto=Object)
     cs = []

data/lib/goat/goat.js

@@ -130,18 +130,23 @@ Goat.RT = {
     Goat.loadComponents();
   }
 
-  function updateReceived(m) {
-    var id = m.id;
-    var version = m.version;
-    var updates = m.updates;
-
-    if(m.version == rt.version + 1) {
-      $(updates).each(function(_,u) {
-        rt.consecutiveFailures = 0;
-        applyUpdate(u);
-      });
+  function updateReceived(u, t) {
+    var version = u.version;
+    var updates = u.updates;
+    var txn = u.txn;
+
+    if(u.version == rt.version + 1) {
+      if(t == 'component_updated') {
+        $(updates).each(function(_,up) {
+          rt.consecutiveFailures = 0;
+          applyUpdate(up);
+        });
+      } else if(t == 'txn_complete') {
+        completeTxn(txn);
+      }
+
       rt.version++;
-    } else if(m.version <= rt.version) {
+    } else if(u.version <= rt.version) {
       rt.consecutiveFailures = 0;
       // fine, we already have this 
     } else {
@@ -399,8 +404,8 @@ $.extend(Goat, {
     Goat.log('messageReceived', m.type, m);
 
     var t = m['type'];
-    if(t == 'component_updated') {
-      Goat.RT.updateReceived(m);
+    if(t == 'component_updated' || t == 'txn_complete') {
+      Goat.RT.updateReceived(m, t);
     } else if(t == 'redirect') {
       if(m["location"]) {
         Goat.log('Redirecting to ' + m['location']);
@@ -412,8 +417,6 @@ $.extend(Goat, {
     } else if(t == 'page_expired') {
       alert("Due to inactivity, you'll need to refresh this page.");
       Goat.setPageDead();
-    } else if(t == 'txn_complete') {
-      Goat.RT.completeTxn(m['txn']);
     } else if(t == 'alert') {
       this.showAlert(m);
     } else {

data/lib/goat/state-srv.rb

@@ -37,7 +37,8 @@ module Goat
 
     def self.fetch_component(id)
       resp = send_message('fetch_component', {'id' => id}, true)
-      ComponentSkeleton.from_hash(JSON.load(resp)['response'])
+      skelhash = JSON.load(resp)['response']
+      skelhash.empty? ? nil : ComponentSkeleton.from_hash(skelhash)
     end
 
     def self.component_updated(txn, pgid, update)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 115
   prerelease: false
   segments: 
   - 0
   - 3
-  - 47
-  version: 0.3.47
+  - 48
+  version: 0.3.48
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +00:00
+date: 2011-03-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency