nitro 0.8.0 → 0.9.3

data/Rakefile

@@ -1,8 +1,6 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: connection.rb 71 2004-10-18 10:50:22Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id$
 
 require "rake"
 require "rake/rdoctask"
@@ -52,7 +50,7 @@ if 'nitro' == project
 	#
 	require "lib/nitro/version"
 	
-	PKG_VERSION = $srv_version
+	PKG_VERSION = Nitro::Version 
 	PKG_FILES = FileList[
 		"[A-Z]*", "{bin,benchmark,etc,ext,examples,doc,lib,test,vendor}/**/*" 
 	#	"examples/*.rb"
@@ -87,7 +85,7 @@ else
 	#
 	require "lib/og/version"
 	
-	PKG_VERSION = $og_version
+	PKG_VERSION = Og::Version
 	PKG_FILES = FileList[
 		"README.og", "RELEASES.og", "LICENSE", "AUTHORS", "Rakefile", "ChangeLog*", 
 		"examples/og/*", "lib/glue.rb", "lib/glue/**/*", "lib/og/**/*", "lib/og.rb",
@@ -114,7 +112,7 @@ else
 		s.author = "George Moschovitis"
 		s.email = "gm@navel.gr"
 		s.homepage = "http://www.navel.gr/og"
-		s.rubyforge_project = "og-rml"
+		s.rubyforge_project = "nitro"
 	end
 
 end

data/benchmark/nitro/bench.rb

@@ -0,0 +1,5 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2005 Navel, all rights reserved.
+# $Id$
+
+

data/benchmark/nitro/simple-webrick-n-200.txt

@@ -0,0 +1,44 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        WEBrick/1.3.1
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /index2
+Document Length:        42 bytes
+
+Concurrency Level:      1
+Time taken for tests:   4.644158 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Non-2xx responses:      200
+Total transferred:      51200 bytes
+HTML transferred:       8400 bytes
+Requests per second:    43.06 [#/sec] (mean)
+Time per request:       23.221 [ms] (mean)
+Time per request:       23.221 [ms] (mean, across all concurrent requests)
+Transfer rate:          10.77 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        1    1   2.2      1      31
+Processing:    15   20  11.2     18      89
+Waiting:        0    0   0.0      0       0
+Total:         16   22  11.3     19      90
+
+Percentage of the requests served within a certain time (ms)
+  50%     19
+  66%     19
+  75%     19
+  80%     20
+  90%     48
+  95%     52
+  98%     55
+  99%     56
+ 100%     90 (longest request)

data/benchmark/nitro/static-webrick-n-200.txt

@@ -0,0 +1,43 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        WEBrick/1.3.1
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /test.html
+Document Length:        18 bytes
+
+Concurrency Level:      1
+Time taken for tests:   4.108503 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Total transferred:      51400 bytes
+HTML transferred:       3600 bytes
+Requests per second:    48.68 [#/sec] (mean)
+Time per request:       20.543 [ms] (mean)
+Time per request:       20.543 [ms] (mean, across all concurrent requests)
+Transfer rate:          12.17 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0    0   2.2      0      30
+Processing:    14   19  10.2     16      59
+Waiting:        0   11  12.2     13      58
+Total:         14   19  10.4     16      59
+
+Percentage of the requests served within a certain time (ms)
+  50%     16
+  66%     17
+  75%     17
+  80%     18
+  90%     44
+  95%     48
+  98%     50
+  99%     50
+ 100%     59 (longest request)

data/benchmark/nitro/tiny-lhttpd-n-200-c-5.txt

@@ -0,0 +1,43 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /index
+Document Length:        892 bytes
+
+Concurrency Level:      5
+Time taken for tests:   0.887273 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Total transferred:      201200 bytes
+HTML transferred:       178400 bytes
+Requests per second:    225.41 [#/sec] (mean)
+Time per request:       22.182 [ms] (mean)
+Time per request:       4.436 [ms] (mean, across all concurrent requests)
+Transfer rate:          220.90 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0    0   1.0      0       8
+Processing:     5   21  16.0     14      88
+Waiting:        1   20  16.1     14      87
+Total:          6   21  16.1     14      88
+
+Percentage of the requests served within a certain time (ms)
+  50%     14
+  66%     15
+  75%     16
+  80%     32
+  90%     46
+  95%     47
+  98%     87
+  99%     88
+ 100%     88 (longest request)

data/benchmark/nitro/tiny-webrick-n-200-c-5.txt

@@ -0,0 +1,44 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        WEBrick/1.3.1
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /index
+Document Length:        417 bytes
+
+Concurrency Level:      5
+Time taken for tests:   6.968057 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Non-2xx responses:      202
+Total transferred:      127664 bytes
+HTML transferred:       84234 bytes
+Requests per second:    28.70 [#/sec] (mean)
+Time per request:       174.201 [ms] (mean)
+Time per request:       34.840 [ms] (mean, across all concurrent requests)
+Transfer rate:          17.80 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0   14  29.1      0     119
+Processing:    25  156  71.1    163     446
+Waiting:        0  113  61.8    115     394
+Total:         94  170  53.7    163     446
+
+Percentage of the requests served within a certain time (ms)
+  50%    163
+  66%    188
+  75%    196
+  80%    199
+  90%    210
+  95%    221
+  98%    409
+  99%    425
+ 100%    446 (longest request)

data/benchmark/nitro/tiny-webrick-n-200.txt

@@ -0,0 +1,44 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        WEBrick/1.3.1
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /index
+Document Length:        417 bytes
+
+Concurrency Level:      1
+Time taken for tests:   4.214142 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Non-2xx responses:      200
+Total transferred:      126400 bytes
+HTML transferred:       83400 bytes
+Requests per second:    47.46 [#/sec] (mean)
+Time per request:       21.071 [ms] (mean)
+Time per request:       21.071 [ms] (mean, across all concurrent requests)
+Transfer rate:          29.19 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0    0   0.2      0       2
+Processing:    14   20  11.3     16      86
+Waiting:        0   18  11.5     15      85
+Total:         14   20  11.3     16      86
+
+Percentage of the requests served within a certain time (ms)
+  50%     16
+  66%     17
+  75%     18
+  80%     18
+  90%     44
+  95%     51
+  98%     53
+  99%     55
+ 100%     86 (longest request)

data/benchmark/nitro/tiny2-webrick-n-200.txt

@@ -0,0 +1,44 @@
+This is ApacheBench, Version 2.0.41-dev <$Revision: 1.141 $> apache-2.0
+Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking localhost (be patient)
+
+
+Server Software:        WEBrick/1.3.1
+Server Hostname:        localhost
+Server Port:            8080
+
+Document Path:          /index2
+Document Length:        42 bytes
+
+Concurrency Level:      1
+Time taken for tests:   3.794328 seconds
+Complete requests:      200
+Failed requests:        0
+Write errors:           0
+Non-2xx responses:      200
+Total transferred:      41000 bytes
+HTML transferred:       8400 bytes
+Requests per second:    52.71 [#/sec] (mean)
+Time per request:       18.972 [ms] (mean)
+Time per request:       18.972 [ms] (mean, across all concurrent requests)
+Transfer rate:          10.54 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0    0   0.2      0       2
+Processing:    12   18  10.9     14      85
+Waiting:        0   16  11.4     13      83
+Total:         12   18  10.9     15      85
+
+Percentage of the requests served within a certain time (ms)
+  50%     15
+  66%     15
+  75%     16
+  80%     17
+  90%     43
+  95%     47
+  98%     48
+  99%     49
+ 100%     85 (longest request)

data/{lib/nitro/server/cluster.rb → bin/cluster}

@@ -1,23 +1,22 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: cluster.rb 167 2004-11-23 14:03:10Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: cluster.rb 234 2005-01-27 13:01:40Z gmosx $
+
+# WARNING: This is old code, not updated to work in the
+# latest nitro release. Will be fixed ASAP.
 
-$:.unshift "lib"
+$:.unshift 'lib'
 
-require "drb"
-require "monitor"
+require 'drb'
+require 'monitor'
 
-require "nitro/application"
-require "nitro/server"
-require "glue/cache"
-require "nitro/server/session"
+require 'nitro/application'
+require 'nitro/server'
+require 'glue/cache'
+require 'nitro/server/session'
 
 module N
 
-# = Cluster
-#
 # A Cluster manages the state of a collection of servers. The cluster 
 # synchronizes the servers and distributes the state. An older version 
 # used a polling system, ie: the servers polled the cluster to 
@@ -25,25 +24,25 @@ module N
 # state is changed a delta is pushed to the clients.
 #
 # TODO: use Sync instead of Monitor
-#
+
 class Cluster < N::Application
 
-	# = CHash ClusterHash
-	#
 	# The CHash 'endpoint' resides in the Cluster server
-	#
+	
 	class CHash < Hash
 		attr :mon
 		
 		# drbobject for this hash (local)
+		
 		attr_accessor :ldrb
 		
 		# the cluster, use a cluster to implement a set
 		# (one server per drb_uri)
+		
 		attr_accessor :cluster
 		
 		#
-		#
+
 		def initialize(ldrb_uri = "druby://:8000")
 			@mon = Monitor.new
 			@ldrb = DRb.start_service(ldrb_uri, self)
@@ -51,7 +50,7 @@ class Cluster < N::Application
 		end
 
 		#  
-		#		
+				
 		def join(sdrb_uri)
 			@mon.synchronize {
 				cluster[sdrb_uri] = DRbObject.new(nil, sdrb_uri)
@@ -61,7 +60,7 @@ class Cluster < N::Application
 		alias_method :old_set, :[]=
 
 		# Not really usefull
-		#		
+				
 		def []=(key, value)
 			# store the value (useful on server restarts)
 			@mon.synchronize {
@@ -110,10 +109,8 @@ class Cluster < N::Application
 		
 	end
 	
-	# = SHash ServerHash
-	#
 	# The SHash 'endpoint' resides in the App server
-	#
+	
 	class SHash < Hash
 		attr :mon
 	
@@ -125,7 +122,7 @@ class Cluster < N::Application
 		
 		# ldrb = local drb uri
 		# cdrb = cluster drb uri
-		#
+		
 		def initialize(ldrb_uri = "druby://:9000", cdrb_uri = "druby://:8000")
 			@mon = Monitor.new
 			@ldrb_uri = ldrb_uri
@@ -171,8 +168,8 @@ class Cluster < N::Application
 			
 	end
 
-	# = Clm Cluster Last Modified Hash
-	#
+	# Cluster Last Modified Hash
+	
 	class Clm < CHash
 		def [](key)
 			@mon.synchronize {
@@ -187,7 +184,7 @@ class Cluster < N::Application
 	end
 	
 	# = Slm Server Last Modified Hash
-	#
+	
 	class Slm < SHash
 		def set!(key, lm = nil)
 			lm = Time.now.to_i unless lm
@@ -213,10 +210,9 @@ class Cluster < N::Application
 	
 end
 
-end # module
+end
 
 if $0 == __FILE__
-	require "logger"; $log = Logger.new(STDERR)
-	
+	require 'logger'
 	N::Cluster.new.exec()
 end