0
@@ -92,10 +92,10 @@ class ServerTest
0
     case name
0
     when 'emongrel'
0
       @pid = fork { start_emongrel }
0
-    when /^ebb(\d*)$/
0
-      workers = $1.to_i
0
-      workers = 1 if workers <= 0
0
-      @pid = fork { start_ebb(workers) }
0
+    when 'ebb_threaded'
0
+      @pid = fork { start_ebb_threaded }
0
+    when 'ebb_sequential'
0
+      @pid = fork { start_ebb_sequential }
0
     when 'mongrel'
0
       @pid = fork { start_mongrel }
0
     when 'thin'
0
@@ -116,9 +116,14 @@ class ServerTest
0
     Rack::Handler::Mongrel.run(app, :Host => '0.0.0.0', :Port => @port.to_i)
0
   end
0
   
0
-  def start_ebb(workers = 1)
0
+  def start_ebb_threaded
0
     require File.dirname(__FILE__) + '/../ruby_lib/ebb'
0
-    server = Ebb::start_server(app, :port => @port, :workers => workers)
0
+    server = Ebb::start_server(app, :port => @port, :threaded_processing => true)
0
+  end
0
+
0
+  def start_ebb_sequential
0
+    require File.dirname(__FILE__) + '/../ruby_lib/ebb'
0
+    server = Ebb::start_server(app, :port => @port, :threaded_processing => false)
0
   end
0
   
0
   def start_mongrel

0
@@ -9,18 +9,28 @@ module Ebb
0
   
0
   def self.start_server(app, options={})
0
     port = (options[:port] || 4001).to_i
0
-    FFI::server_listen_on_port(port)
0
+    if options.has_key?(:threaded_processing)
0
+      threaded_processing = options[:threaded_processing] ? true : false
0
+    else
0
+      threaded_processing = true
0
+    end
0
     
0
-    puts "Ebb listening at http://0.0.0.0:#{port}/"
0
+    Client::BASE_ENV['rack.multithread'] = threaded_processing
0
+    
0
+    FFI::server_listen_on_port(port)
0
     
0
+    puts "Ebb listening at http://0.0.0.0:#{port}/ (#{threaded_processing ? 'threaded' : 'sequential'} processing)"
0
     trap('INT')  { @running = false }
0
     @running = true
0
     
0
     while @running
0
       FFI::server_process_connections()
0
       while client = FFI::waiting_clients.shift
0
-        #process_client(app, client)
0
-        Thread.new(client) { |c| c.process(app) }
0
+        if threaded_processing
0
+          Thread.new(client) { |c| c.process(app) }
0
+        else
0
+          client.process(app)
0
+        end
0
       end
0
     end
0
     
0
@@ -157,4 +167,4 @@ module Ebb
0
     504  => 'Gateway Time-out', 
0
     505  => 'HTTP Version not supported'
0
   }.freeze
0
-end
0
\ No newline at end of file
0
+end

0
@@ -23,7 +23,8 @@ module Ebb
0
     DEFAULT_OPTIONS = {
0
       :port         => 4001,
0
       :timeout      => 60,
0
-      :workers      => 1
0
+      :workers      => 1,
0
+      :threaded_processing => true
0
     }
0
     
0
     # Kill the process which PID is stored in +pid_file+.
0
@@ -119,6 +120,12 @@ module Ebb
0
         parser.on("-P", "--pid-file FILE", "File to store PID") { |f| options[:pid_file]=f }
0
         parser.on("-t", "--timeout SECONDS", "(default: #{options[:timeout]})") { |s| options[:timeout]=s }
0
         #parser.on("-w", "--workers WORKERS", "Number of worker threads (default: #{options[:workers]})") { |w| options[:workers]=w }
0
+        parser.on("-w", "-- WORKERS", "Number of worker threads (default: #{options[:workers]})") { |w| options[:workers]=w }
0
+        
0
+        parser.on("-S", "--sequential", "do not use threaded processing") do
0
+          options[:threaded_processing] = false
0
+        end
0
+        
0
         parser.separator ""
0
         parser.on_tail("-h", "--help", "Show this message") do
0
           puts parser

0
@@ -58,14 +58,17 @@ VALUE server_process_connections(VALUE _)
0
 {
0
   ev_timer timeout;
0
   ev_timer_init (&timeout, oneshot_timeout, 0.01, 0.);
0
-  ev_timer_start (loop, &timeout);
0
-   
0
+  ev_timer_start (loop, &timeout); 
0
   ev_loop(loop, EVLOOP_ONESHOT);
0
-  /* XXX: Need way to know when the loop is finished...
0
-   * should return true or false */
0
-   
0
   ev_timer_stop(loop, &timeout);
0
   
0
+  /* Call rb_thread_schedule() proportional to the number of rb threads running */
0
+  /* SO HACKY! Anyone have a better way to do this? */
0
+  int i;
0
+  for(i = 0; i < EBB_MAX_CLIENTS; i++)
0
+    if(server->clients[i].in_use)
0
+      rb_thread_schedule();
0
+  
0
   if(server->open)
0
     return Qtrue;
0
   else