omf_rc_shm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVlZDhmOTQ2NzU5MWZhOTg0ODQ0MjAyMmVkODU0Mzg0ZDY3YmUyMA==
+    YWI4OGY2NmNkZDk0ZjFkYzA5NTUyNzA4MzZkYWFmMzUxNjMzMjc0NA==
   data.tar.gz: !binary |-
-    OGE1NmNkOWJmMDFjMGNhOWMxNWU1ZGY3YmIyYTZjODE4NmQxNzQwYg==
+    M2ZjMGIzNzQ4OWEyY2Y1NTlkNGRkNTY5NjJjYjAxMTI3NDA2MjFkZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjQwYWVkNjUwYzVlMWUwNTM3NTVkNzhlYzJjNDNiMjIxNWFjOTZkMmRhYTY2
-    MTg1Mjg2NzI0MWZhODVlNjU4MjAwNjQ3ZWNkYjViNjg2NTllM2RlOGFhZjYw
-    ZjAzYjA3ZjEwMGI4ZjgwNGUxNzUwNDUxYjlhZmYyODUyMTNiOTI=
+    ZTlmZGQ3YWVkZmVkZmExODc2YzI2NzI2ODYwM2ZmZjZkOWQwMjdhZjNhNzEy
+    OWNhY2E4NDM3ZTNiZjIxNDVjOTdjYTMyMGFkNTUxMjNiOTM3ZGRiMWMzZGVi
+    MjQ1YTgxYjhjYTYxMWY5NzkxYTAwYmE5N2YyODk0YWNiZTI3OTA=
   data.tar.gz: !binary |-
-    YTE2MTMxYTgzMmNhMzdiNDZjOTc4YmQ0NzFmNzQ3Y2NkNjAyODczNmEzMjQ4
-    NzdjOGMzODY4YWQzZmIxOGI5YzYzMDljOTYzODZkMGE4NjIzNTJmY2QxMzEw
-    NDFhNWZjYmY0OGI0ZmE4MmJhYmUyYjNhZTBjMTBjNDk1M2EyNjY=
+    Y2Y5M2U2ZGNiOWIwZjUzNTRjNjJjZTMwZjhhNmQ2NDgxZGZlNzkyNWQzZWE1
+    Zjk3MGEzYmYyNDljN2MzYTNlNzg4NGMwODNiNjgxNDczZDhlNDRiYjYxMjAz
+    ZDlhY2IyM2I0ZWE4ODhlMDljNDlmMDZhNTgzNDQ5MGM0MDA0MTM=

data/README.md

@@ -26,23 +26,51 @@ Configure OmfRc to load SHM extension, simply modify '/etc/omf_rc/config.yml' to
     :factories:
     - :require: omf_rc_shm
 
-Where app_definition_file for shm_node simply defines the applications it runs using OEDL defApplication syntax.
-
-Example of defApplication:
-
-    defApplication('otr2') do |a|
-      a.schedule = "* 18 * * *"
-      a.binary_path = "/usr/bin/otr2"
-      a.defProperty('udp_local_host', 'IP address of this Destination node', '--udp:local_host', { :type => :string, :dynamic => false })
-      a.defProperty('udp_local_port', 'Receiving Port of this Destination node', '--udp:local_port', { :type => :integer, :dynamic => false })
-      a.defMeasurement('udp_in') do |m|
-        m.defMetric('flow_id',:long)
-        m.defMetric('seq_no',:long)
-        m.defMetric('pkt_length',:long)
-        m.defMetric('dst_host',:string)
-        m.defMetric('dst_port',:long)
-      end
-    end
+## Define applications
+
+app_definition_file for shm_node simply defines the applications it runs.
+
+Example:
+
+    App.define(
+      "otr2", {
+        schedule: "* * * * *",
+        timeout: 20,
+        binary_path: "/usr/bin/otr2",
+        use_oml: true,
+        parameters: {
+          udp_local_host: { cmd: "--udp:local_host", value: "0.0.0.0" }
+        },
+        oml: {
+          experiment: "otr2_#{Time.now.to_i}",
+          id: "otr2",
+          available_mps: [
+            {
+              mp: "udp_in",
+              fields: [
+                { field: "flow_id", type: :long },
+                { field: "seq_no", type: :long },
+                { field: "pkt_length", type: :long },
+                { field: "dst_host", type: :string },
+                { field: "dst_port", type: :long }
+              ]
+            }
+          ],
+          collection: [
+            {
+              url: "tcp://0.0.0.0:3003",
+              streams: [
+                {
+                  mp: "udp_in",
+                  interval: 3
+                }
+              ]
+            }
+          ]
+        }
+      }
+    )
+
 
 ## Usage
 

data/config/test.rb

@@ -1,54 +1,39 @@
-defApplication('otr2') do |a|
-  a.schedule = "* * * * *"
-  a.timeout = 20
-  a.binary_path = "/usr/bin/otr2"
-  a.description = <<TEXT
-      otr is a configurable traffic sink. It contains port to receive
-      packet streams via various transport options, such as TCP and UDP.
-      This version 2 is compatible with OMLv2.
-TEXT
-
-  a.defProperty('udp_local_host', 'IP address of this Destination node', '--udp:local_host', {:type => :string, :dynamic => false})
-  a.defProperty('udp_local_port', 'Receiving Port of this Destination node', '--udp:local_port', {:type => :integer, :dynamic => false})
-  a.defMeasurement('udp_in') do |m|
-    m.defMetric('flow_id',:long)
-    m.defMetric('seq_no',:long)
-    m.defMetric('pkt_length',:long)
-    m.defMetric('dst_host',:string)
-    m.defMetric('dst_port',:long)
-  end
-end
-
-defApplication('otg2') do |a|
-  a.schedule = "* * * * *"
-  a.timeout = 20
-  a.binary_path = "/usr/bin/otg2"
-  a.description = <<TEXT
-      OTG is a configurable traffic generator. It contains generators
-      producing various forms of packet streams and port for sending
-      these packets via various transports, such as TCP and UDP.
-      This version 2 is compatible with OMLv2
-TEXT
-
-  a.defProperty('generator', 'Type of packet generator to use (cbr or expo)', '-g', {:type => :string, :dynamic => false})
-  a.defProperty('udp_broadcast', 'Broadcast', '--udp:broadcast', {:type => :integer, :dynamic => false})
-  a.defProperty('udp_dst_host', 'IP address of the Destination', '--udp:dst_host', {:type => :string, :dynamic => false})
-  a.defProperty('udp_dst_port', 'Destination Port to send to', '--udp:dst_port', {:type => :integer, :dynamic => false})
-  a.defProperty('udp_local_host', 'IP address of this Source node', '--udp:local_host', {:type => :string, :dynamic => false})
-  a.defProperty('udp_local_port', 'Local Port of this source node', '--udp:local_port', {:type => :integer, :dynamic => false})
-  a.defProperty("cbr_size", "Size of packet [bytes]", '--cbr:size', {:dynamic => true, :type => :integer})
-  a.defProperty("cbr_rate", "Data rate of the flow [kbps]", '--cbr:rate', {:dynamic => true, :type => :integer})
-  a.defProperty("exp_size", "Size of packet [bytes]", '--exp:size', {:dynamic => true, :type => :integer})
-  a.defProperty("exp_rate", "Data rate of the flow [kbps]", '--exp:rate', {:dynamic => true, :type => :integer})
-  a.defProperty("exp_ontime", "Average length of burst [msec]", '--exp:ontime', {:dynamic => true, :type => :integer})
-  a.defProperty("exp_offtime", "Average length of idle time [msec]", '--exp:offtime', {:dynamic => true, :type => :integer})
-  a.defMeasurement('udp_out') do |m|
-    m.defMetric('ts',:float)
-    m.defMetric('flow_id',:long)
-    m.defMetric('seq_no',:long)
-    m.defMetric('pkt_length',:long)
-    m.defMetric('dst_host',:string)
-    m.defMetric('dst_port',:long)
-  end
-end
+App.define(
+  "otr2", {
+    schedule: "* * * * *",
+    timeout: 20,
+    binary_path: "/usr/bin/otr2",
+    use_oml: true,
+    parameters: {
+      udp_local_host: { cmd: "--udp:local_host", value: "0.0.0.0" }
+    },
+    oml: {
+      experiment: "otr2_#{Time.now.to_i}",
+      id: "otr2",
+      available_mps: [
+        {
+          mp: "udp_in",
+          fields: [
+            { field: "flow_id", type: :long },
+            { field: "seq_no", type: :long },
+            { field: "pkt_length", type: :long },
+            { field: "dst_host", type: :string },
+            { field: "dst_port", type: :long }
+          ]
+        }
+      ],
+      collection: [
+        {
+          url: "tcp:0.0.0.0:3003",
+          streams: [
+            {
+              mp: "udp_in",
+              interval: 3
+            }
+          ]
+        }
+      ]
+    }
+  }
+)
 

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -96,7 +96,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
   property :oml, :default => Hashie::Mash.new
   property :oml_logfile, :default => nil
   property :oml_loglevel, :default => nil
-  property :schedule, :default => "now"
+  property :schedule, :default => 'now'
   property :timeout, :default => 0
   property :timeout_kill_signal, :default => 'TERM'
   property :file_change_listener, :default => nil
@@ -282,8 +282,16 @@ module OmfRc::ResourceProxy::ScheduledApplication
   # @!method switch_to_unscheduled
   work('switch_to_unscheduled') do |res|
     if res.property.state == :scheduled
-      info "Removing cron job for #{res.property.app_id} with command #{res.build_command_line}"
+      info "Removing cron job for '#{res.property.app_id}'"
       CronEdit::Crontab.Remove res.property.app_id
+      pid_file = "#{res.property.app_log_dir}/#{res.property.app_id}.pid.log"
+      File.readlines(pid_file).each do |line|
+        begin
+          Process.kill(res.property.timeout_kill_signal, line.to_i)
+          info "Killing process #{line.to_i}"
+        rescue Errno::ESRCH
+        end
+      end
       res.property.file_change_listener.stop
       res.property.state = :unscheduled
     end
@@ -316,27 +324,18 @@ module OmfRc::ResourceProxy::ScheduledApplication
         File.delete(stderr_file) if File.exist?(stderr_file)
         File.delete(stdout_file) if File.exist?(stdout_file)
         File.delete(pid_file) if File.exist?(pid_file)
-        #cmd = "#{res.build_command_line} 2>>#{stderr_file} 1>>#{stdout_file}; echo \"Application exited with code: $? \" >>#{stderr_file}"
-        cmd = "ruby -e 'pid = spawn(\"#{res.build_command_line}\", :out=>[\"#{stdout_file}\", \"a\"], :err=>[\"#{stderr_file}\", \"a\"])
+        cmd = "ruby -e 'extend Process
+pid = spawn(\"#{res.build_command_line}\", :out=>[\"#{stdout_file}\", \"a\"], :err=>[\"#{stderr_file}\", \"a\"])
 `echo \#{pid} >> #{pid_file}`
 fork {
   sleep #{res.property.timeout}
-  Process.kill(\"#{res.property.timeout_kill_signal}\", pid)
+  kill(\"#{res.property.timeout_kill_signal}\", pid)
 } if #{res.property.timeout} > 0
-Process.waitpid(pid)
+waitpid(pid)
 `echo Process \#{pid} exited with code: \#{$?.exitstatus} >> #{stderr_file}`'"
-        cmd.gsub!(/[\n]+/, ";");
-        # cmd = "#{res.build_command_line} 2>>#{stderr_file} 1>>#{stdout_file};"
-        # if res.property.timeout > 0
-        #   cmd = "timeout -s #{res.property.timeout_kill_signal} #{res.property.timeout} #{cmd}"
-        # end
+        cmd.gsub!(/[\n]+/, ";") # make it a one-liner
         info "Adding cron job for '#{res.property.app_id}' with schedule '#{res.property.schedule}' and command '#{cmd}'"
         CronEdit::Crontab.Add res.property.app_id, "#{res.property.schedule} #{cmd}"
-#        ExecApp.new(res.property.app_id,
-#                    res.build_command_line,
-#                    res.property.map_err_to_out) do |event_type, app_id, msg|
-#                      res.process_event(res, event_type, app_id, msg)
-#                    end
         res.property.file_change_callback = Proc.new do |modified, added, removed|
           removed.each do |file|
             res.property.file_read_offset[file]=nil
@@ -345,7 +344,6 @@ Process.waitpid(pid)
           files.each do |file|
             if file.include? stderr_file or file.include? stdout_file
               res.property.file_read_offset[file]=0 if res.property.file_read_offset[file].nil?
-              p res.property.file_read_offset[file]
               data = IO.read(file,nil,res.property.file_read_offset[file])
               res.property.file_read_offset[file]+=data.length
               data.split(/\r?\n/).each do |line|

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -4,6 +4,7 @@ module OmfRc::ResourceProxy::ShmNode
   register_proxy :shm_node
 
   property :app_definition_file
+  property :oml_uri
 
   request :cron_jobs do |node|
     node.children.find_all { |v| v.type =~ /scheduled_application/ }.map do |v|
@@ -14,14 +15,19 @@ module OmfRc::ResourceProxy::ShmNode
   hook :after_initial_configured do |node|
     OmfRcShm.app.load_definition(node.request_app_definition_file)
 
-    OmfRcShm.app.definitions.each do |d|
-      info "Got definition #{d.inspect}, now schedule them..."
-      app_id = d[0]
-      app_opts = d[1].properties.merge(hrn: app_id, use_oml: true)
+    OmfRcShm.app.definitions.each do |name, app_opts|
+      info "Got definition #{app_opts.inspect}, now schedule them..."
+      app_opts[:hrn] = name
+
       s_app = OmfRc::ResourceFactory.create(:scheduled_application, app_opts)
       OmfCommon.el.after(5) do
         s_app.configure_state(:scheduled)
       end
     end
   end
+
+  hook :before_ready do
+    system "crontab -r"
+  end
+
 end

data/lib/omf_rc_shm/app.rb

@@ -17,5 +17,9 @@ module OmfRcShm
     def load_definition(file_path)
       eval(File.read(file_path))
     end
+
+    def self.define(app_name, app_opts)
+      self.instance.definitions[app_name] = app_opts
+    end
   end
 end

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/scheduled_app_tester.rb

@@ -20,10 +20,10 @@ def run_test(app)
 
   # Configure the 'binary_path' and 'parameters' properties of the App Proxy
   app.configure(binary_path: "sleep 5",
-                oml_configfile: "/Users/cdw/tempo/omf_rc_shm/README.md",
+#                oml_configfile: "/some/file",
                 timeout: 3,
 #                use_oml: true,
-                schedule: "now")
+                schedule: "* * * * *") # or use "now"
 
   # Start the application 2 seconds later
   OmfCommon.eventloop.after 1 do
@@ -31,7 +31,7 @@ def run_test(app)
   end
 
   # Stop the application another 10 seconds later
-  OmfCommon.eventloop.after 200 do
+  OmfCommon.eventloop.after 150 do
     app.configure(state: :unscheduled)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler