david 0.4.3 → 0.4.4

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

@@ -1,29 +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
+concurrent,loss,throughput,sd
+10.0,0.0,5192.0,205.87537
+20.0,0.0,6229.33333,66.30401
+30.0,0.0,7727.66667,31.25522
+40.0,0.0,8624.33333,10.20893
+50.0,0.0,8949.0,80.13738
+60.0,0.0,9122.66667,10.40299
+70.0,0.0,9349.0,24.85961
+80.0,0.0,9672.66667,25.9401
+90.0,0.0,9836.66667,124.8261
+100.0,0.0,9978.0,24.34475
+200.0,0.0,10871.0,6.16441
+300.0,0.01345,10903.33333,22.291
+400.0,0.07517,10819.66667,21.66923
+500.0,0.13742,10777.0,71.51224
+600.0,0.22956,10749.33333,45.84273
+700.0,0.31443,10773.66667,29.4543
+800.0,0.40563,10772.66667,60.80753
+900.0,0.48934,10780.33333,15.54206
+1000.0,0.59199,10720.33333,52.47433
+2000.0,1.52498,10651.0,50.57667
+3000.0,2.48929,10700.33333,70.28197
+4000.0,3.44407,10638.33333,100.16764
+5000.0,4.25959,10850.33333,295.77168
+6000.0,5.28891,10764.33333,85.35937
+7000.0,6.10506,10903.0,214.97442
+8000.0,7.1729,10730.66667,32.14896
+9000.0,7.99336,10855.0,234.45398
+10000.0,8.86836,10892.33333,294.90601

data/benchmarks/plot.frameworks.r

@@ -15,6 +15,9 @@ Rails = rails$throughput
 df = data.frame(Concurrent, Rack, Rails)
 df.long = melt(df, id.vars='Concurrent')
 
+sd = c(rack$sd, rails$sd)
+df.long = cbind(df.long, sd)
+
 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)) +
@@ -23,6 +26,7 @@ g = ggplot(df.long, aes(Concurrent, value, shape=variable)) +
 	xlab('Concurrent clients (log.)') +
 	geom_line() +
 	geom_point() +
+ 	geom_errorbar(aes(ymin=value-sd, ymax=value+sd)) +
 	theme_bw()
 
 path = paste(args[1], 'frameworks', 'pdf', sep='.')

data/benchmarks/plot.vms.r

@@ -10,18 +10,19 @@ 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 = data.frame(x, mri22, mri23, jruby17, jruby9)
 df.long = melt(df, id.vars='x')
 
+sd = c(mri22_data$sd, mri23_data$sd, jruby17_data$sd, jruby9_data$sd)
+df.long = cbind(df.long, sd)
+
 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)) +
@@ -30,6 +31,7 @@ g = ggplot(df.long, aes(x, value, shape=variable)) +
 	xlab('Concurrent clients (log.)') +
 	geom_line() +
 	geom_point() +
+ 	geom_errorbar(aes(ymin=value-sd, ymax=value+sd)) +
 	theme_bw()
 
 path = paste(args[1], 'vms', 'pdf', sep='.')

data/benchmarks/rackup/Gemfile

@@ -4,7 +4,7 @@ gem 'david', path: '../..'
 gem 'rack'
 
 # Rails
-gem 'rails', '~> 4.2.0'
+gem 'rails', '~> 4.2.0', group: :rails
 
 # Grape
-gem 'grape'
+gem 'grape', group: :grape

data/benchmarks/rackup/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    david (0.4.3.pre)
+    david (0.4.4.pre)
       celluloid-io (~> 0.16, >= 0.16.1)
       coap (>= 0.1)
       rack (~> 1.6)

data/benchmarks/tocsv.rb

@@ -5,18 +5,32 @@ def process_line(line)
 end
 
 def process_lines(lines)
-  lines.map! { |line| process_line(line) }
-  lines[0].zip(*lines[1..2]).map { |x| avg(*x.map(&:to_f)) }
+  lines.map { |line| process_line(line) }
+end
+
+def avg_lines(lines)
+  ls = process_lines(lines)
+  ls[0].zip(*ls[1..2]).map { |x| avg(*x.map(&:to_f)) }
 end
 
 def avg(*args)
   args.reduce(:+) / args.size.to_f
 end
 
+def sd_lines(lines)
+  sd(*process_lines(lines).map { |a| a[4].to_f })
+end
+
+def sd(*args)
+  avg = avg(*args)
+  Math.sqrt(avg(*args.map { |x| (x - avg)**2 }))
+end
+
 CSV.open(ARGV[0] + '.csv', 'wb') do |csv|
-  csv << %w[concurrent loss throughput]
+  csv << %w[concurrent loss throughput sd]
   File.readlines(ARGV[0]).each_slice(3) do |lines|
-    conc, _, total, loss, throughput = process_lines(lines)
-    csv << [conc, (loss/total)*100, throughput].map { |x| x.round(5) }
+    conc, _, total, loss, throughput = avg_lines(lines)
+    sd = sd_lines(lines)
+    csv << [conc, (loss/total)*100, throughput, sd].map { |x| x.round(5) }
   end
 end

data/david.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
     Things."
 
   s.homepage = 'https://github.com/nning/david'
-  s.license  = 'GPL-3.0'
+  s.license  = 'MIT'
   s.author   = 'henning mueller'
   s.email    = 'henning@orgizm.net'
 

data/experiments/symbol_to_proc.rb

@@ -1,7 +1,7 @@
 require 'benchmark/ips'
 
 Benchmark.ips do |x|
-  a = [0..99999]
+  a = [*0..99999]
 
   x.report('map') do
     a.map { |e| e.to_s }

data/lib/david/server.rb

@@ -27,7 +27,7 @@ module David
       host, port  = @options.values_at(:Host, :Port)
 
       log.info "David #{David::VERSION} on #{RUBY_DESCRIPTION}"
-      log.info "Starting on [#{host}]:#{port}"
+      log.info "Starting on coap://[#{host}]:#{port}"
 
       af = ipv6? ? ::Socket::AF_INET6 : ::Socket::AF_INET
 

data/lib/david/trap.rb

@@ -1,10 +1,12 @@
-class Trap
-  def initialize(value)
-    @value = value
-  end
+module David
+  class Trap
+    def initialize(value = nil)
+      @value = value
+    end
 
-  def method_missing(method, *args)
-    p method, caller[0]
-    @value.send(method, *args)
+    def method_missing(method, *args)
+      p method, caller[0]
+      @value.send(method, *args) unless @value.nil?
+    end
   end
 end

data/lib/david/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: david
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -244,7 +244,7 @@ files:
 - spec/utility_spec.rb
 homepage: https://github.com/nning/david
 licenses:
-- GPL-3.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []