david 0.4.1 → 0.4.2

data/benchmarks/data/mri-2.3.0-dev-rails.csv

@@ -0,0 +1,29 @@
+concurrent,loss,throughput
+10.0,0.0,5192.0
+20.0,0.0,6229.33333
+30.0,0.0,7727.66667
+40.0,0.0,8624.33333
+50.0,0.0,8949.0
+60.0,0.0,9122.66667
+70.0,0.0,9349.0
+80.0,0.0,9672.66667
+90.0,0.0,9836.66667
+100.0,0.0,9978.0
+200.0,0.0,10871.0
+300.0,0.01345,10903.33333
+400.0,0.07517,10819.66667
+500.0,0.13742,10777.0
+600.0,0.22956,10749.33333
+700.0,0.31443,10773.66667
+800.0,0.40563,10772.66667
+900.0,0.48934,10780.33333
+1000.0,0.59199,10720.33333
+2000.0,1.52498,10651.0
+3000.0,2.48929,10700.33333
+4000.0,3.44407,10638.33333
+5000.0,4.25959,10850.33333
+6000.0,5.28891,10764.33333
+7000.0,6.10506,10903.0
+8000.0,7.1729,10730.66667
+9000.0,7.99336,10855.0
+10000.0,8.86836,10892.33333

data/benchmarks/interop.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar coapbench/californium/run/cf-plugtest-checker-1.0.0-SNAPSHOT.jar -s "coap://[::1]:5683" CC01 CC02 CC03 CC04 CC05 CC06 CC07 CC08 CC10 CC11 CC12 CC13 CB01 CB02 CO01_12

data/benchmarks/max.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'csv'
+puts CSV.parse(File.read(ARGV[0])).map { |x| x[2].to_f }.unshift.max

data/benchmarks/plot.frameworks.r

@@ -0,0 +1,30 @@
+#!/usr/lib/R/bin/Rscript
+
+library(methods)
+library(ggplot2)
+library(reshape2)
+
+args  = commandArgs(T)
+rack  = read.table(file=args[1], sep=',', header=T)
+rails = read.table(file=args[2], sep=',', header=T)
+
+Concurrent = rack$concurrent
+Rack = rack$throughput
+Rails = rails$throughput
+
+df = data.frame(Concurrent, Rack, Rails)
+df.long = melt(df, id.vars='Concurrent')
+
+g = ggplot(df.long, aes(Concurrent, value, shape=variable)) +
+	scale_x_log10(breaks=c(10, 50, 100, 500, 1000, 5000, 10000)) +
+	scale_y_continuous(breaks=round(seq(1000, 15000, by=1000), 1)) +
+    scale_shape(name='Framework') +
+    ylab('Requests per second') +
+	xlab('Concurrent clients (log.)') +
+	geom_line() +
+	geom_point() +
+	theme_bw()
+
+path = paste(args[1], 'frameworks', 'pdf', sep='.')
+print(path)
+ggsave(g, file=path)

data/benchmarks/plot.loss.r

@@ -0,0 +1,35 @@
+#!/usr/lib/R/bin/Rscript
+
+library(methods)
+library(ggplot2)
+library(reshape2)
+
+args = commandArgs(T)
+
+mri22_data   = read.table(file=args[1], sep=',', header=T)
+mri23_data   = read.table(file=args[2], sep=',', header=T)
+jruby17_data = read.table(file=args[3], sep=',', header=T)
+jruby9_data  = read.table(file=args[4], sep=',', header=T)
+# rbx25_data   = read.table(file=args[5], sep=',', header=T)
+
+x       = mri22_data$concurrent
+mri22   = mri22_data$loss
+mri23   = mri23_data$loss
+jruby17 = jruby17_data$loss
+jruby9  = jruby9_data$loss
+# rbx25   = rbx25_data$loss
+
+df = data.frame(x, mri22, mri23, jruby17, jruby9) #, rbx25)
+df.long = melt(df, id.vars='x')
+
+g = ggplot(df.long, aes(x, value, shape=variable)) +
+    scale_shape(name='Ruby VM') +
+    ylab('Percentage of lost messages') +
+	xlab('Concurrent clients') +
+	geom_line() +
+	geom_point() +
+	theme_bw()
+
+path = paste(args[1], 'loss', 'pdf', sep='.')
+print(path)
+ggsave(g, file=path)

data/benchmarks/plot.vms.r

@@ -0,0 +1,37 @@
+#!/usr/lib/R/bin/Rscript
+
+library(methods)
+library(ggplot2)
+library(reshape2)
+
+args = commandArgs(T)
+
+mri22_data   = read.table(file=args[1], sep=',', header=T)
+mri23_data   = read.table(file=args[2], sep=',', header=T)
+jruby17_data = read.table(file=args[3], sep=',', header=T)
+jruby9_data  = read.table(file=args[4], sep=',', header=T)
+# rbx25_data   = read.table(file=args[5], sep=',', header=T)
+
+x       = mri22_data$concurrent
+mri22   = mri22_data$throughput
+mri23   = mri23_data$throughput
+jruby17 = jruby17_data$throughput
+jruby9  = jruby9_data$throughput
+# rbx25   = rbx25_data$throughput
+
+df = data.frame(x, mri22, mri23, jruby17, jruby9) #, rbx25)
+df.long = melt(df, id.vars='x')
+
+g = ggplot(df.long, aes(x, value, shape=variable)) +
+	scale_x_log10(breaks=c(10, 50, 100, 500, 1000, 5000, 10000)) +
+	scale_y_continuous(breaks=round(seq(1000, 15000, by=1000), 1)) +
+    scale_shape(name='Ruby VM') +
+    ylab('Requests per second') +
+	xlab('Concurrent clients (log.)') +
+	geom_line() +
+	geom_point() +
+	theme_bw()
+
+path = paste(args[1], 'vms', 'pdf', sep='.')
+print(path)
+ggsave(g, file=path)

data/benchmarks/rackup/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    david (0.4.1.pre)
+    david (0.4.2.pre)
       celluloid-io (~> 0.16, >= 0.16.1)
       coap (>= 0.1)
       rack (~> 1.6)
@@ -79,9 +79,11 @@ GEM
     hashie (3.4.0)
     hike (1.2.3)
     hitimes (1.2.2)
+    hitimes (1.2.2-java)
     i18n (0.7.0)
     ice_nine (0.11.1)
     json (1.8.2)
+    json (1.8.2-java)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -92,8 +94,10 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     nio4r (1.1.0)
+    nio4r (1.1.0-java)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
     rack (1.6.0)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -138,6 +142,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -150,6 +155,7 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/benchmarks/rackup/interop.ru

@@ -0,0 +1,17 @@
+#\ -o ::1 -p 5683 -O Block=true -O Multicast=false -O Observe=false -O Log=debug -E none
+
+module David; module ETSI; end; end
+
+require 'bundler/setup'
+Bundler.setup
+
+require 'david'
+require 'david/etsi/mandatory/rack'
+require 'david/etsi/optional/rack'
+
+apps = [
+  David::ETSI::Optional::Rack.new,
+  David::ETSI::Mandatory::Rack.new,
+]
+
+run Rack::Cascade.new(apps)

data/experiments/concurrency/stub.rb

@@ -10,13 +10,12 @@ class Listener
     @socket = socket
     @cache = cache
     @app = Rack::HelloWorld.new
-    @block = true
-    @observe = true
+    @options = David::AppConfig.new
   end
 
   def run
     loop do
-      if defined?(JRuby) || @mode == :prefork || @mode == :threaded
+      if defined?(JRuby) || defined?(Rubinius) || @mode == :prefork || @mode == :threaded
         data, sender = @socket.recvfrom(1152)
         port, _, host = sender[1..3]
       else
@@ -73,15 +72,16 @@ case ARGV[0]
     socket.bind('::', 5683)
     4.times { fork { Listener.new(:prefork, socket, cache).run } }
   when 'threaded'
-    # ~16000
+    # ~17500
     socket = UDPSocket.new(Socket::AF_INET6)
     socket.bind('::', 5683)
     Listener.send(:include, Celluloid)
     Listener.pool(size: 8, args: [:threaded, socket, cache]).run
   else
-    # ~14000
+    # ~17000
     socket = Celluloid::IO::UDPSocket.new(Socket::AF_INET6)
     socket.bind('::', 5683)
+    Listener.send(:include, Celluloid::IO)
     Listener.new(:sped, socket, cache).run
 end
 

data/lib/david/etsi.rb

@@ -0,0 +1,5 @@
+module David::ETSI
+end
+
+require 'david/etsi/mandatory'
+require 'david/etsi/optional'

data/lib/david/etsi/mandatory.rb

@@ -0,0 +1,4 @@
+module David::ETSI::Mandatory
+  path = File.expand_path('../mandatory', __FILE__)
+  Dir["#{path}/*.rb"].each { |file| require file }
+end

data/lib/david/{interop/mandatory_etsi → etsi/mandatory}/grape.rb

@@ -1,4 +1,4 @@
-module David::Interop::MandatoryETSI
+module David::ETSI::Mandatory
   class Grape < ::Grape::API
     content_type :txt, 'text/plain'
     default_format :txt

data/lib/david/{interop/mandatory_etsi → etsi/mandatory}/hobbit.rb

@@ -1,4 +1,4 @@
-module David::Interop::MandatoryETSI
+module David::ETSI::Mandatory
   class Hobbit < ::Hobbit::Base
     get '/test' do
       response.status = 2.05

data/lib/david/{interop/mandatory_etsi → etsi/mandatory}/nyny.rb

@@ -1,4 +1,4 @@
-module David::Interop::MandatoryETSI
+module David::ETSI::Mandatory
   class NYNY < ::NYNY::App
     before { headers['Content-Type'] = 'text/plain' }
 

data/lib/david/{interop/mandatory_etsi → etsi/mandatory}/rack.rb

@@ -1,6 +1,6 @@
-module David::Interop::MandatoryETSI
+module David::ETSI::Mandatory
   class Rack
-    EMPTY_CONTENT = [2.05, {'Content-Type' => 'text/plain'}, []]
+    EMPTY_CONTENT = [2.05, {'Content-Type' => 'text/plain'}, ['foo']]
 
     def call(env)
       return case request(env)
@@ -13,7 +13,7 @@ module David::Interop::MandatoryETSI
       when 'DELETE /test'
         [2.02, {}, []]
       else
-        [4.04, {}, []]
+        [404, {}, []]
       end
     end
 

data/lib/david/{interop/mandatory_etsi → etsi/mandatory}/sinatra.rb

@@ -1,4 +1,4 @@
-module David::Interop::MandatoryETSI
+module David::ETSI::Mandatory
   class Sinatra < ::Sinatra::Base
     before { content_type 'text/plain' }
 

data/lib/david/etsi/optional.rb

@@ -0,0 +1,4 @@
+module David::ETSI::Optional
+  path = File.expand_path('../optional', __FILE__)
+  Dir["#{path}/*.rb"].each { |file| require file }
+end

data/lib/david/etsi/optional/rack.rb

@@ -0,0 +1,26 @@
+module David::ETSI::Optional
+  class Rack
+    def call(env)
+      return case request(env)
+      when 'GET /large'
+        [2.05, {'Content-Type' => 'text/plain'}, ['*'*1025]]
+      when 'GET /obs'
+        [2.05,
+          {
+            'Content-Type' => 'text/plain',
+            'ETag' => rand(0xffff).to_s
+          },
+          [Time.now.to_s]
+        ]
+      else
+        [404, {}, []]
+      end
+    end
+
+    private
+
+    def request(env)
+      env['REQUEST_METHOD'] + ' ' + env['PATH_INFO']
+    end
+  end
+end

data/lib/david/registry.rb

@@ -15,9 +15,11 @@ module David
     #   Celluloid::Actor[:gc]
     # end
 
-    # def observe
-    #   Celluloid::Actor[:observe]
-    # end
+    def observe
+      # Supervision is only initialized from here in tests.
+      Observe.supervise_as(:observe) if Celluloid::Actor[:observe].nil?
+      Celluloid::Actor[:observe]
+    end
 
     def server
       Celluloid::Actor[:server]

data/lib/david/server.rb

@@ -1,7 +1,9 @@
 require 'david/app_config'
+
 require 'david/server/mid_cache'
 require 'david/server/multicast'
 require 'david/server/respond'
+require 'david/server/utility'
 
 module David
   class Server
@@ -10,6 +12,7 @@ module David
     include MidCache
     include Multicast
     include Respond
+    include Utility
 
     attr_reader :log, :socket
 
@@ -36,7 +39,7 @@ module David
 
     def run
       loop do
-        if defined?(JRuby) || defined?(Rubinius)
+        if jruby_or_rbx?
           dispatch(*@socket.recvfrom(1152))
         else
           begin
@@ -66,7 +69,7 @@ module David
     def dispatch(*args)
       data, sender, _, anc = args
 
-      if defined?(JRuby) || defined?(Rubinius)
+      if jruby_or_rbx?
         port, _, host = sender[1..3]
       else
         host, port = sender.ip_address, sender.ip_port
@@ -106,10 +109,6 @@ module David
       end
     end
 
-    def ipv6?
-      IPAddr.new(@options[:Host]).ipv6?
-    end
-
     def pong(exchange)
       exchange.message.tt = :ack
       answer(exchange)

data/lib/david/server/utility.rb

@@ -10,6 +10,14 @@ module David
         body.close if body.respond_to?(:close)
         s.chomp
       end
+
+      def ipv6?
+        @ipv6 ||= IPAddr.new(@options[:Host]).ipv6?
+      end
+
+      def jruby_or_rbx?
+        @jruby_or_rbx ||= !!(defined?(JRuby) || defined?(Rubinius))
+      end
     end
   end
 end

data/lib/david/version.rb

@@ -1,7 +1,7 @@
 module David
   MAJOR = 0
   MINOR = 4
-  PATCH = 1
+  PATCH = 2
   SUFFIX = nil
 
   VERSION = [MAJOR, MINOR, PATCH, SUFFIX].compact.join('.')

data/spec/interop/mandatory_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 [
-  Interop::MandatoryETSI::Grape,
-  Interop::MandatoryETSI::Hobbit,
-  Interop::MandatoryETSI::NYNY,
-  Interop::MandatoryETSI::Rack,
-  Interop::MandatoryETSI::Sinatra,
+  ETSI::Mandatory::Grape,
+  ETSI::Mandatory::Hobbit,
+  ETSI::Mandatory::NYNY,
+  ETSI::Mandatory::Rack,
+  ETSI::Mandatory::Sinatra,
   Rails.application
 ].each do |app|
   describe "ETSI Plugstests, Mandatory, #{app.to_s.split('::').last}" do
@@ -50,10 +50,6 @@ require 'spec_helper'
       end
     end
 
-    context 'TD_COAP_CORE_09' do
-      pending
-    end
-
     it 'TD_COAP_CORE_10' do
       token = rand(0xffffffff)
       mid, response = req(:get, '/test', token: token)