agoo 2.4.0 → 2.5.0

data/ext/agoo/server.h

@@ -7,50 +7,39 @@
 #include <stdbool.h>
 #include <stdatomic.h>
 
-#include <ruby.h>
-
-#include "rhook.h"
-#include "log.h"
-#include "page.h"
+#include "bind.h"
+#include "err.h"
+#include "hook.h"
 #include "queue.h"
-#include "sub.h"
-#include "upgraded.h"
-
-#define MAX_WORKERS	32
 
 typedef struct _Server {
     volatile bool	inited;
     volatile bool	active;
     int			thread_cnt;
-    int			worker_cnt;
-    int			max_push_pending;
-    int			port;
-    int			fd;
     bool		pedantic;
     bool		root_first;
-    atomic_int		running;
     pthread_t		listen_thread;
     pthread_t		con_thread;
-
-    pthread_mutex_t	up_lock;
-    Upgraded		up_list;
-
     struct _Queue	con_queue;
-    struct _Queue	pub_queue;
-    struct _Cache	pages;
-    struct _SubCache	sub_cache; // subscription cache
-
     Hook		hooks;
     Hook		hook404;
-    struct _Queue	eval_queue;
 
-    int			worker_pids[MAX_WORKERS];
-    VALUE		*eval_threads; // Qnil terminated
+    //int			port; // TBD remove
+    //int			fd; // TBD remove
+    Bind		binds;
+
+    // A count of the running threads from the wrapper or the server managed
+    // threads.
+    atomic_int		running;
 } *Server;
 
 extern struct _Server	the_server;
 
-extern void	server_init(VALUE mod);
-extern void	server_shutdown();
+extern void	server_setup();
+extern void	server_shutdown(const char *app_name, void (*stop)());
+extern void	server_bind(Bind b);
+
+extern int	setup_listen(Err err);
+extern int	server_start(Err err, const char *app_name, const char *version);
 
 #endif // __AGOO_SERVER_H__

data/ext/agoo/upgraded.c

@@ -7,6 +7,7 @@
 #include "con.h"
 #include "debug.h"
 #include "pub.h"
+#include "rserver.h"
 #include "server.h"
 #include "subject.h"
 #include "upgraded.h"
@@ -28,7 +29,7 @@ destroy(Upgraded up) {
 	up->wrap = Qnil;
     }
     if (NULL == up->prev) {
-	the_server.up_list = up->next;
+	the_rserver.up_list = up->next;
 	if (NULL != up->next) {
 	    up->next->prev = NULL;
 	}
@@ -70,21 +71,21 @@ extract_subject(VALUE subject, int *slen) {
 
 void
 upgraded_release(Upgraded up) {
-    pthread_mutex_lock(&the_server.up_lock);
+    pthread_mutex_lock(&the_rserver.up_lock);
     if (atomic_fetch_sub(&up->ref_cnt, 1) <= 1) {
 	destroy(up);
     }    
-    pthread_mutex_unlock(&the_server.up_lock);
+    pthread_mutex_unlock(&the_rserver.up_lock);
 }
 
 void
 upgraded_release_con(Upgraded up) {
-    pthread_mutex_lock(&the_server.up_lock);
+    pthread_mutex_lock(&the_rserver.up_lock);
     up->con = NULL;
     if (atomic_fetch_sub(&up->ref_cnt, 1) <= 1) {
 	destroy(up);
     }
-    pthread_mutex_unlock(&the_server.up_lock);
+    pthread_mutex_unlock(&the_rserver.up_lock);
 }
 
 // Called from the con_loop thread, no need to lock, this steals the subject
@@ -151,11 +152,11 @@ get_upgraded(VALUE self) {
     Upgraded	up = NULL;
 
     if (the_server.active) {
-	pthread_mutex_lock(&the_server.up_lock);
+	pthread_mutex_lock(&the_rserver.up_lock);
 	if (NULL != (up = DATA_PTR(self))) {
 	    atomic_fetch_add(&up->ref_cnt, 1);
 	}
-	pthread_mutex_unlock(&the_server.up_lock);
+	pthread_mutex_unlock(&the_rserver.up_lock);
     }
     return up;
 }
@@ -176,7 +177,7 @@ up_write(VALUE self, VALUE msg) {
     if (NULL == up) {
 	return Qfalse;
     }
-    if (0 < the_server.max_push_pending && the_server.max_push_pending <= atomic_load(&up->pending)) {
+    if (0 < the_rserver.max_push_pending && the_rserver.max_push_pending <= atomic_load(&up->pending)) {
 	atomic_fetch_sub(&up->ref_cnt, 1);
 	// Too many pending messages.
 	return Qfalse;
@@ -193,7 +194,7 @@ up_write(VALUE self, VALUE msg) {
 	p = pub_write(up, StringValuePtr(rs), RSTRING_LEN(rs), false);
     }
     atomic_fetch_add(&up->pending, 1);
-    queue_push(&the_server.pub_queue, p);
+    queue_push(&the_rserver.pub_queue, p);
 
     return Qtrue;
 }
@@ -217,7 +218,7 @@ up_subscribe(VALUE self, VALUE subject) {
 
     if (NULL != (up = get_upgraded(self))) {
 	atomic_fetch_add(&up->pending, 1);
-	queue_push(&the_server.pub_queue, pub_subscribe(up, subj, slen));
+	queue_push(&the_rserver.pub_queue, pub_subscribe(up, subj, slen));
     }
     return Qnil;
 }
@@ -242,7 +243,7 @@ up_unsubscribe(int argc, VALUE *argv, VALUE self) {
     }
     if (NULL != (up = get_upgraded(self))) {
 	atomic_fetch_add(&up->pending, 1);
-	queue_push(&the_server.pub_queue, pub_unsubscribe(up, subject, slen));
+	queue_push(&the_rserver.pub_queue, pub_unsubscribe(up, subject, slen));
     }
     return Qnil;
 }
@@ -259,7 +260,7 @@ up_close(VALUE self) {
 
     if (NULL != up) {
 	atomic_fetch_add(&up->pending, 1);
-	queue_push(&the_server.pub_queue, pub_close(up));
+	queue_push(&the_rserver.pub_queue, pub_close(up));
     }
     return Qnil;
 }
@@ -315,7 +316,7 @@ protocol(VALUE self) {
     if (the_server.active) {
 	Upgraded	up;
 	
-	pthread_mutex_lock(&the_server.up_lock);
+	pthread_mutex_lock(&the_rserver.up_lock);
 	if (NULL != (up = DATA_PTR(self)) && NULL != up->con) {
 	    switch (up->con->kind) {
 	    case CON_WS:
@@ -328,7 +329,7 @@ protocol(VALUE self) {
 		break;
 	    }
 	}
-	pthread_mutex_unlock(&the_server.up_lock);
+	pthread_mutex_unlock(&the_rserver.up_lock);
     }
     return pro;
 }
@@ -355,16 +356,16 @@ upgraded_create(Con c, VALUE obj, VALUE env) {
 	up->wrap = Data_Wrap_Struct(upgraded_class, NULL, NULL, up);
 	up->subjects = NULL;
 	up->prev = NULL;
-	pthread_mutex_lock(&the_server.up_lock);
-	if (NULL == the_server.up_list) {
+	pthread_mutex_lock(&the_rserver.up_lock);
+	if (NULL == the_rserver.up_list) {
 	    up->next = NULL;
 	} else {
-	    the_server.up_list->prev = up;
+	    the_rserver.up_list->prev = up;
 	}
-	up->next = the_server.up_list;
-	the_server.up_list = up;
+	up->next = the_rserver.up_list;
+	the_rserver.up_list = up;
 	c->up = up;
-	pthread_mutex_unlock(&the_server.up_lock);
+	pthread_mutex_unlock(&the_rserver.up_lock);
 
 	if (rb_respond_to(obj, on_open_id)) {
 	    rb_funcall(obj, on_open_id, 1, up->wrap);
@@ -376,6 +377,13 @@ upgraded_create(Con c, VALUE obj, VALUE env) {
 // Use the publish from the Agoo module.
 extern VALUE	ragoo_publish(VALUE self, VALUE subject, VALUE message);
 
+/* Document-method: env
+ *
+ * call-seq: env()
+ *
+ * Returns the environment passed to the call method that initiated the
+ * Upgraded Object creation.
+ */
 static VALUE
 env(VALUE self) {
     Upgraded	up = get_upgraded(self);

data/ext/agoo/websocket.c

@@ -6,6 +6,7 @@
 #include "con.h"
 #include "debug.h"
 #include "request.h"
+#include "rserver.h"
 #include "sha1.h"
 #include "text.h"
 #include "websocket.h"
@@ -185,11 +186,8 @@ ws_create_req(Con c, long mlen) {
     c->req->upgrade = UP_NONE;
     c->req->up = c->up;
     c->req->res = NULL;
-    c->req->handler_type = PUSH_HOOK;
     if (c->up->on_msg) {
-	c->req->handler = c->up->handler;
-    } else {
-	c->req->handler = Qnil;
+	c->req->hook = hook_create(NONE, NULL, (void*)c->up->handler, PUSH_HOOK, &the_rserver.eval_queue);
     }
     return false;
 }
@@ -201,10 +199,9 @@ ws_req_close(Con c) {
 	    
 	req->up = c->up;
 	req->method = ON_CLOSE;
-	req->handler_type = PUSH_HOOK;
-	req->handler = c->up->handler;
+	req->hook = hook_create(NONE, NULL, (void*)c->up->handler, PUSH_HOOK, &the_rserver.eval_queue);
 	atomic_fetch_add(&c->up->ref_cnt, 1);
-	queue_push(&the_server.eval_queue, (void*)req);
+	queue_push(&the_rserver.eval_queue, (void*)req);
     }
 }
 

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/test/bind_test.rb

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__)
+$root_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($root_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'net/http'
+require 'socket'
+
+require 'agoo'
+
+class BindTest < Minitest::Test
+
+  # Run all the tests in one test to avoid creating the server multiple times.
+  def test_static
+    begin
+      Agoo::Log.configure(dir: '',
+			  console: true,
+			  classic: true,
+			  colorize: true,
+			  states: {
+			    INFO: false,
+			    DEBUG: false,
+			    connect: false,
+			    request: false,
+			    response: false,
+			    eval: true,
+			  })
+
+      addr = ''
+      Socket.ip_address_list.each { |ai|
+	if ai.ipv4? && '127.0.0.1' != ai.ip_address
+	  addr = ai.ip_address
+	  break
+	end
+      }
+      addr6 = '::1'
+      name = '/tmp/agoo_test.socket'
+      Agoo::Server.init(6471, 'root', thread_count: 1,
+			bind: ['http://127.0.0.1:6472',
+			       "http://#{addr}:6473",
+			       "http://[#{addr6}]:6474",
+			       "unix://#{name}",
+			      ])
+      Agoo::Server.start()
+
+      port_test
+      localhost_test
+      ipv4_test(addr)
+      ipv6_test(addr6)
+      restrict_test
+      named_test(name)
+    ensure
+      Agoo::shutdown
+    end
+  end
+
+  def port_test
+    uri = URI('http://localhost:6471/index.html')
+    request(uri)
+  end
+
+  def localhost_test
+    uri = URI('http://localhost:6472/index.html')
+    request(uri)
+  end
+
+  def ipv4_test(addr)
+    uri = URI("http://#{addr}:6473/index.html")
+    request(uri)
+  end
+
+  def ipv6_test(addr)
+    uri = URI("http://[#{addr}]:6474/index.html")
+    request(uri)
+  end
+
+  def restrict_test
+    uri = URI("http://127.0.0.1:6473/index.html")
+    assert_raises Exception do
+      Net::HTTP.get(uri)
+    end
+  end
+
+  def named_test(name)
+    content = ''
+    UNIXSocket.open(name) {|c|
+      c.print(%|GET /index.html HTTP/1.1\r
+Accept-Encoding: *\r
+Accept: */*\r
+User-Agent: Ruby\r
+\r
+|)
+      rcnt = 0
+      c.each_line { |line|
+	rcnt = line.split(':')[1].to_i if line.start_with?("Content-Length: ")
+	break if line.length <= 2 # \r\n
+      }
+      if 0 < rcnt
+	content = c.read(rcnt)
+      end
+    }
+    expect = %|<!DOCTYPE html>
+<html>
+  <head><title>Agoo Test</title></head>
+  <body>Agoo</body>
+</html>
+|
+    assert_equal(expect, content)
+  end
+
+  def request(uri)
+    expect = %|<!DOCTYPE html>
+<html>
+  <head><title>Agoo Test</title></head>
+  <body>Agoo</body>
+</html>
+|
+    req = Net::HTTP::Get.new(uri)
+    req['Accept-Encoding'] = '*'
+    req['User-Agent'] = 'Ruby'
+    res = Net::HTTP.start(uri.hostname, uri.port) { |h|
+      h.request(req)
+    }
+    content = res.body
+    assert_equal('text/html', res['Content-Type'])
+    assert_equal(expect, content)
+  end
+  
+end

data/test/named_client.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+
+UNIXSocket.open("/tmp/sockme") {|c|
+  p c.read #=> "hi\n"
+}

data/test/named_server.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+
+serv = UNIXServer.new("/tmp/sockme")
+begin
+  sock = serv.accept_nonblock
+  sock.puts "hello"
+  sock.flush()
+rescue IO::WaitReadable, Errno::EINTR
+  IO.select([serv])
+  retry
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -48,6 +48,8 @@ files:
 - ext/agoo/agoo.c
 - ext/agoo/base64.c
 - ext/agoo/base64.h
+- ext/agoo/bind.c
+- ext/agoo/bind.h
 - ext/agoo/con.c
 - ext/agoo/con.h
 - ext/agoo/debug.c
@@ -85,6 +87,8 @@ files:
 - ext/agoo/rhook.h
 - ext/agoo/rlog.c
 - ext/agoo/rlog.h
+- ext/agoo/rserver.c
+- ext/agoo/rserver.h
 - ext/agoo/seg.h
 - ext/agoo/server.c
 - ext/agoo/server.h
@@ -107,8 +111,11 @@ files:
 - lib/agoo/version.rb
 - lib/rack/handler/agoo.rb
 - test/base_handler_test.rb
+- test/bind_test.rb
 - test/hijack_test.rb
 - test/log_test.rb
+- test/named_client.rb
+- test/named_server.rb
 - test/rack_handler_test.rb
 - test/static_test.rb
 homepage: https://github.com/ohler55/agoo
@@ -147,8 +154,11 @@ signing_key:
 specification_version: 4
 summary: An HTTP server
 test_files:
+- test/named_client.rb
 - test/log_test.rb
 - test/rack_handler_test.rb
 - test/hijack_test.rb
+- test/named_server.rb
 - test/base_handler_test.rb
 - test/static_test.rb
+- test/bind_test.rb