agoo 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c72122c668962937fb515235a7e54ac99aac7d0b70b96d2536caf5b682832e8b
-  data.tar.gz: be5095e0f7a8222d6860f67191cc989ad688a2c9c54c5a6e8b8b6b4e76b6af11
+  metadata.gz: 00756b3df4ad9bf284685f770eac1535e7ed1fd78c3c48b8bf71445d6af6f3ea
+  data.tar.gz: e055161332315715e295918121c0241fd517b31f730b2296b37f4f31b56e7df8
 SHA512:
-  metadata.gz: 726616b8f62a4f2e116aff746aa517c1ad6f1176ae1a31a2790b8fd156c4d0c49eba7588d92be3600407f925c9d7158472e096f47c58cb4dc1c2109e446f2cc0
-  data.tar.gz: 590334a3f012719cc51bcc554470cb7807b0363af51c20068b2461f5c1b9990658e0748cff4ff20f336295555a523902f3f756dae3982ef1a2c4ad347c944348
+  metadata.gz: 5cc15a45719ede4f3c6a2d2075a8c2d61eb3de1e89c1cbf726116bb70794c10820131912c646b392eb1829b4c7643bd952aeba3e296b1d55f61bbfb9b5c0072f
+  data.tar.gz: 99c9c21864789960c30de16dea4a08399dd8ef8fc958e1150a1c0232d116b6d182ac378b3a2676550baa7985abe29a5fc05587a4c5280b3dfc0b7f363e72fcb3

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # CHANGELOG
 
+### 2.5.2 - 2018-11-09
+
+Latency improvements.
+
+- Allow empty pages to be returned.
+
+- Included multiple read/write threads.
+
 ### 2.5.1 - 2018-08-30
 
 Bug fix.
 
-- Sending a POST request that was not hanlded cause a segfault. Fixed.	
+- Sending a POST request that was not handled and caused a segfault. Fixed.
 
 ### 2.5.0 - 2018-08-10
 

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/ohler55/agoo/master.svg)](http://travis-ci.org/ohler55/agoo?branch=master)
 [![Gem Version](https://badge.fury.io/rb/agoo.svg)](https://badge.fury.io/rb/agoo)
-![Gem](https://img.shields.io/gem/dt/agoo.svg)
+![Gem](https://img.shields.io/gem/dt/agoo.svg) [![TideLift](https://tidelift.com/badges/github/ohler55/agoo)](https://tidelift.com/subscription/pkg/rubygems-agoo?utm_source=rubygems-agoo&utm_medium=referral&utm_campaign=readme)
 
 A High Performance HTTP Server for Ruby
 
@@ -50,8 +50,15 @@ benchmarks driver could not push Agoo hard enough.
 Agoo supports the [Ruby rack API](https://rack.github.io) which allows for the
 use of rack compatible gems such as Hanami and Rails. Agoo also supports WebSockets and SSE.
 
+Agoo is not available on Windows.
+
 ## News
 
+- Agoo takes first place as the highest throughput on [web-frameworks
+  benchmarks](https://github.com/the-benchmarker/web-frameworks). Latency was
+  not at the top but release 2.5.2 improves that. Look for an Agoo-C benchmark
+  in the future.
+
 - Clustered Agoo is ready. For slower application and a machine with multiple
   cores a significant improvement is performance is realized. The application
   must be stateless in that no data is shared between workers.
@@ -71,6 +78,10 @@ See [file:CHANGELOG.md](CHANGELOG.md)
 Releases are made from the master branch. The default branch for checkout is
 the develop branch. Pull requests should be made against the develop branch.
 
+## Support
+
+[Get supported Agoo with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-agoo?utm_source=rubygems-agoo&utm_medium=referral&utm_campaign=readme)
+
 ## Links
 
  - *Documentation*: http://rubydoc.info/gems/agoo or http://www.ohler.com/agoo/doc/index.html

data/ext/agoo/agoo.c

@@ -10,9 +10,10 @@
 #include "pub.h"
 #include "rack_logger.h"
 #include "request.h"
-#include "response.h"
+#include "rresponse.h"
 #include "rlog.h"
 #include "rserver.h"
+#include "rupgraded.h"
 #include "server.h"
 #include "upgraded.h"
 
@@ -48,7 +49,7 @@ ragoo_publish(VALUE self, VALUE subject, VALUE message) {
     const char	*subj = extract_subject(subject, &slen);
 
     rb_check_type(message, T_STRING);
-    queue_push(&the_rserver.pub_queue, pub_publish(subj, slen, StringValuePtr(message), (int)RSTRING_LEN(message)));
+    server_publish(pub_publish(subj, slen, StringValuePtr(message), (int)RSTRING_LEN(message)));
 
     return Qnil;
 }
@@ -65,7 +66,7 @@ static VALUE
 ragoo_unsubscribe(VALUE self, VALUE subject) {
     rb_check_type(subject, T_STRING);
 
-    queue_push(&the_rserver.pub_queue, pub_unsubscribe(NULL, StringValuePtr(subject), (int)RSTRING_LEN(subject)));
+    server_publish(pub_unsubscribe(NULL, StringValuePtr(subject), (int)RSTRING_LEN(subject)));
 
     return Qnil;
 }

data/ext/agoo/bind.c

@@ -25,13 +25,18 @@ bind_port(Err err, int port) {
 	b->port = port;
 	b->family = AF_INET;
 	snprintf(id, sizeof(id) - 1, "http://:%d", port);
+	strcpy(b->scheme, "http");
 	b->id = strdup(id);
+	b->kind = CON_HTTP;
+	b->read = NULL;
+	b->write = NULL;
+	b->events = NULL;
     }
     return b;
 }
 
 static Bind
-url_tcp(Err err, const char *url) {
+url_tcp(Err err, const char *url, const char *scheme) {
     char		*colon = index(url, ':');
     struct in_addr	addr = { .s_addr = 0 };
     int			port;
@@ -40,15 +45,17 @@ url_tcp(Err err, const char *url) {
     if (NULL == colon) {
 	port = 80;
     } else if (15 < colon - url) {
-	err_set(err, ERR_ARG, "tcp/http bind address is not valid. (%s)", url);
+	err_set(err, ERR_ARG, "%s bind address is not valid, too long. (%s)", scheme, url);
 	return NULL;
+    } else if (':' == *url) {
+	port = atoi(colon + 1);
     } else {
 	char	buf[32];
 
 	strncpy(buf, url, colon - url);
 	buf[colon - url] = '\0';
 	if (0 == inet_aton(buf, &addr)) {
-	    err_set(err, ERR_ARG, "tcp/http bind address is not valid. (%s)", url);
+	    err_set(err, ERR_ARG, "%s bind address is not valid. (%s)", scheme, url);
 	    return NULL;
 	}
 	port = atoi(colon + 1);
@@ -62,8 +69,14 @@ url_tcp(Err err, const char *url) {
 	b->port = port;
 	b->addr4 = addr;
 	b->family = AF_INET;
-	snprintf(id, sizeof(id), "http://%s:%d", inet_ntoa(addr), port);
+	snprintf(id, sizeof(id), "%s://%s:%d", scheme, inet_ntoa(addr), port);
 	b->id = strdup(id);
+	strncpy(b->scheme, scheme, sizeof(b->scheme));
+	b->scheme[sizeof(b->scheme) - 1] = '\0';
+	b->kind = CON_HTTP;
+	b->read = NULL;
+	b->write = NULL;
+	b->events = NULL;
 
 	return b;
     }
@@ -73,7 +86,7 @@ url_tcp(Err err, const char *url) {
 }
 
 static Bind
-url_tcp6(Err err, const char *url) {
+url_tcp6(Err err, const char *url, const char *scheme) {
     struct in6_addr	addr;
     char		*end = index(url, ']');
     int			port = 80;
@@ -87,7 +100,7 @@ url_tcp6(Err err, const char *url) {
     buf[end - url - 1] = '\0';
     memset(&addr, 0, sizeof(addr));
     if (0 == inet_pton(AF_INET6, buf, &addr)) {
-	err_set(err, ERR_ARG, "tcp/http bind address is not valid. (%s)", url);
+	err_set(err, ERR_ARG, "%s bind address is not valid. (%s)", scheme, url);
 	return NULL;
     }
     if (NULL != (b = (Bind)malloc(sizeof(struct _Bind)))) {
@@ -99,8 +112,14 @@ url_tcp6(Err err, const char *url) {
 	b->port = port;
 	b->addr6 = addr;
 	b->family = AF_INET6;
-	snprintf(buf, sizeof(buf), "http://[%s]:%d", inet_ntop(AF_INET6, &addr, str, INET6_ADDRSTRLEN), port);
+	snprintf(buf, sizeof(buf), "%s://[%s]:%d", scheme, inet_ntop(AF_INET6, &addr, str, INET6_ADDRSTRLEN), port);
 	b->id = strdup(buf);
+	strncpy(b->scheme, scheme, sizeof(b->scheme));
+	b->scheme[sizeof(b->scheme) - 1] = '\0';
+	b->kind = CON_HTTP;
+	b->read = NULL;
+	b->write = NULL;
+	b->events = NULL;
 
 	return b;
     }
@@ -126,6 +145,11 @@ url_named(Err err, const char *url) {
 	    b->name = strdup(url);
 	    snprintf(id, sizeof(id) - 1, fmt, url);
 	    b->id = strdup(id);
+	    strcpy(b->scheme, "unix");
+	    b->kind = CON_HTTP;
+	    b->read = NULL;
+	    b->write = NULL;
+	    b->events = NULL;
 	}
 	return b;
     }
@@ -144,15 +168,15 @@ Bind
 bind_url(Err err, const char *url) {
     if (0 == strncmp("tcp://", url, 6)) {
 	if ('[' == url[6]) {
-	    return url_tcp6(err, url + 6);
+	    return url_tcp6(err, url + 6, "tcp");
 	}
-	return url_tcp(err, url + 6);
+	return url_tcp(err, url + 6, "tcp");
     }
     if (0 == strncmp("http://", url, 7)) {
 	if ('[' == url[7]) {
-	    return url_tcp6(err, url + 7);
+	    return url_tcp6(err, url + 7, "http");
 	}
-	return url_tcp(err, url + 7);
+	return url_tcp(err, url + 7, "http");
     }
     if (0 == strncmp("unix://", url, 7)) {
 	return url_named(err, url + 7);
@@ -163,6 +187,22 @@ bind_url(Err err, const char *url) {
     if (0 == strncmp("ssl://", url, 6)) {
 	return url_ssl(err, url + 6);
     }
+    // All others assume
+    {
+	char	*colon = index(url, ':');
+	char	scheme[8];
+
+	if (NULL != colon && colon - url < (int)sizeof(scheme)) {
+	    int	slen = colon - url;
+
+	    memcpy(scheme, url, slen);
+	    scheme[slen] = '\0';
+	    if ('[' == url[slen + 3]) {
+		return url_tcp6(err, url + slen + 3, scheme);
+	    }
+	    return url_tcp(err, url + slen + 3, scheme);
+	}
+    }
     return NULL;
 }
 

data/ext/agoo/bind.h

@@ -3,11 +3,15 @@
 #ifndef __AGOO_BIND_H__
 #define __AGOO_BIND_H__
 
+#include <stdbool.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "err.h"
+#include "kinds.h"
+
+struct _Con;
 
 typedef struct _Bind {
     struct _Bind	*next;
@@ -18,6 +22,11 @@ typedef struct _Bind {
 	struct in_addr	addr4;
 	struct in6_addr	addr6;
     };
+    ConKind		kind;
+    bool		(*read)(struct _Con *c);
+    bool		(*write)(struct _Con *c);
+    short		(*events)(struct _Con *c);
+    char		scheme[8];
     char		*name; // if set then Unix file
     char		*key;  // if set then SSL
     char		*cert;

data/ext/agoo/con.c

@@ -4,17 +4,19 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
+#include "bind.h"
 #include "con.h"
 #include "debug.h"
 #include "dtime.h"
 #include "hook.h"
 #include "http.h"
+#include "log.h"
 #include "page.h"
 #include "pub.h"
 #include "res.h"
 #include "seg.h"
-#include "rserver.h"
 #include "server.h"
 #include "sse.h"
 #include "subject.h"
@@ -24,10 +26,28 @@
 #define CON_TIMEOUT		5.0
 #define INITIAL_POLL_SIZE	1024
 
-extern void	agoo_shutdown();
+static bool	con_ws_read(Con c);
+static bool	con_ws_write(Con c);
+static short	con_ws_events(Con c);
+static bool	con_sse_write(Con c);
+static short	con_sse_events(Con c);
+
+static struct _Bind	ws_bind = {
+    .kind = CON_WS,
+    .read = con_ws_read,
+    .write = con_ws_write,
+    .events = con_ws_events,
+};
+
+static struct _Bind	sse_bind = {
+    .kind = CON_SSE,
+    .read = NULL,
+    .write = con_sse_write,
+    .events = con_sse_events,
+};
 
 Con
-con_create(Err err, int sock, uint64_t id) {
+con_create(Err err, int sock, uint64_t id, Bind b) {
     Con	c;
 
     if (NULL == (c = (Con)malloc(sizeof(struct _Con)))) {
@@ -37,15 +57,17 @@ con_create(Err err, int sock, uint64_t id) {
 	memset(c, 0, sizeof(struct _Con));
 	c->sock = sock;
 	c->id = id;
-	c->kind = CON_HTTP;
 	c->timeout = dtime() + CON_TIMEOUT;
+	c->bind = b;
     }
     return c;
 }
 
 void
 con_destroy(Con c) {
-    if (CON_WS == c->kind || CON_SSE == c->kind) {
+    atomic_fetch_sub(&the_server.con_cnt, 1);
+
+    if (CON_WS == c->bind->kind || CON_SSE == c->bind->kind) {
 	ws_req_close(c);
     }
     if (0 < c->sock) {
@@ -53,7 +75,7 @@ con_destroy(Con c) {
 	c->sock = 0;
     }
     if (NULL != c->req) {
-	request_destroy(c->req);
+	req_destroy(c->req);
     }
     if (NULL != c->up) {
 	upgraded_release_con(c->up);
@@ -157,8 +179,8 @@ page_response(Con c, Page p, char *hend) {
 // rserver
 static void
 push_error(Upgraded up, const char *msg, int mlen) {
-    if (NULL != up && Qnil != up->handler && up->on_error) {
-	Req	req = request_create(mlen);
+    if (NULL != up && the_server.ctx_nil_value != up->ctx && up->on_error) {
+	Req	req = req_create(mlen);
 
 	if (NULL == req) {
 	    return;
@@ -167,9 +189,9 @@ push_error(Upgraded up, const char *msg, int mlen) {
 	req->msg[mlen] = '\0';
 	req->up = up;
 	req->method = ON_ERROR;
-	req->hook = hook_create(NONE, NULL, (void*)up->handler, PUSH_HOOK, &the_rserver.eval_queue);
+	req->hook = hook_create(NONE, NULL, up->ctx, PUSH_HOOK, &the_server.eval_queue);
 	upgraded_ref(up);
-	queue_push(&the_rserver.eval_queue, (void*)req);
+	queue_push(&the_server.eval_queue, (void*)req);
     }
 }
 
@@ -332,7 +354,7 @@ con_header_read(Con c) {
    }
 HOOKED:
     // Create request and populate.
-    if (NULL == (c->req = request_create(mlen))) {
+    if (NULL == (c->req = req_create(mlen))) {
 	return bad_request(c, 413, __LINE__);
     }
     if ((long)c->bcnt <= mlen) {
@@ -351,6 +373,7 @@ HOOKED:
     c->req->path.len = (int)(path.end - path.start);
     c->req->query.start = c->req->msg + (query - c->buf);
     c->req->query.len = (int)(qend - query);
+    c->req->query.start[c->req->query.len] = '\0';
     c->req->body.start = c->req->msg + (hend - c->buf + 4);
     c->req->body.len = (unsigned int)clen;
     b = strstr(b, "\r\n");
@@ -390,7 +413,7 @@ check_upgrade(Con c) {
     }
 }
 
-static bool
+bool
 con_http_read(Con c) {
     ssize_t	cnt;
 
@@ -570,7 +593,7 @@ con_ws_read(Con c) {
 		}
 	    }
 	    upgraded_ref(c->up);
-	    queue_push(&the_rserver.eval_queue, (void*)c->req);
+	    queue_push(&the_server.eval_queue, (void*)c->req);
 	    if (mlen < (long)c->bcnt) {
 		memmove(c->buf, c->buf + mlen, c->bcnt - mlen);
 		c->bcnt -= mlen;
@@ -591,19 +614,14 @@ con_ws_read(Con c) {
 // return true to remove/close connection
 static bool
 con_read(Con c) {
-    switch (c->kind) {
-    case CON_HTTP:
-	return con_http_read(c);
-    case CON_WS:
-	return con_ws_read(c);
-    default:
-	break;
+    if (NULL != c->bind->read) {
+	return c->bind->read(c);
     }
     return true;
 }
 
 // return true to remove/close connection
-static bool
+bool
 con_http_write(Con c) {
     Text	message = res_message(c->res_head);
     ssize_t	cnt;
@@ -628,7 +646,7 @@ con_http_write(Con c) {
 	    log_cat(&debug_cat, "response on %llu: %s", (unsigned long long)c->id, message->text);
 	}
     }
-    if (0 > (cnt = send(c->sock, message->text + c->wcnt, message->len - c->wcnt, 0))) {
+    if (0 > (cnt = send(c->sock, message->text + c->wcnt, message->len - c->wcnt, MSG_DONTWAIT))) {
 	if (EAGAIN == errno) {
 	    return false;
 	}
@@ -650,6 +668,7 @@ con_http_write(Con c) {
 
 	return done;
     }
+
     return false;
 }
 
@@ -819,27 +838,21 @@ con_write(Con c) {
     bool	remove = true;
     ConKind	kind = c->res_head->con_kind;
 
-    switch (c->kind) {
-    case CON_HTTP:
-	remove = con_http_write(c);
-	break;
-    case CON_WS:
-	remove = con_ws_write(c);
-	break;
-    case CON_SSE:
-	remove = con_sse_write(c);
-	break;
-    default:
-	break;
+    if (NULL != c->bind->write) {
+	remove = c->bind->write(c);
     }
-    if (kind != c->kind && CON_ANY != kind) {
-	c->kind = kind;
-	/*
-	if (CON_HTTP != kind && !remove) {
-	    // TBD add to up_list now or later?
-	    //c->slot = cc_set_con(&the_server.con_cache, c);
+    //if (kind != c->kind && CON_ANY != kind) {
+    if (CON_ANY != kind) {
+	switch (kind) {
+	case CON_WS:
+	    c->bind = &ws_bind;
+	    break;
+	case CON_SSE:
+	    c->bind = &sse_bind;
+	    break;
+	default:
+	    break;
 	}
-	*/
     }
     return remove;
 }
@@ -850,7 +863,7 @@ publish_pub(Pub pub) {
     const char	*sub = pub->subject->pattern;
     int	cnt = 0;
     
-    for (up = the_rserver.up_list; NULL != up; up = up->next) {
+    for (up = the_server.up_list; NULL != up; up = up->next) {
 	if (NULL != up->con && upgraded_match(up, sub)) {
 	    Res	res = res_create(up->con);
 
@@ -874,7 +887,7 @@ unsubscribe_pub(Pub pub) {
     if (NULL == pub->up) {
 	Upgraded	up;
 
-	for (up = the_rserver.up_list; NULL != up; up = up->next) {
+	for (up = the_server.up_list; NULL != up; up = up->next) {
 	    upgraded_del_subject(up, pub->subject);
 	}
     } else {
@@ -891,20 +904,20 @@ process_pub_con(Pub pub) {
 	
 	// TBD Change pending to be based on length of con queue
 	if (1 == (pending = atomic_fetch_sub(&up->pending, 1))) {
-	    if (NULL != up && Qnil != up->handler && up->on_empty) {
-		Req	req = request_create(0);
+	    if (NULL != up && the_server.ctx_nil_value != up->ctx && up->on_empty) {
+		Req	req = req_create(0);
 	    
 		req->up = up;
 		req->method = ON_EMPTY;
-		req->hook = hook_create(NONE, NULL, (void*)up->handler, PUSH_HOOK, &the_rserver.eval_queue);
+		req->hook = hook_create(NONE, NULL, up->ctx, PUSH_HOOK, &the_server.eval_queue);
 		upgraded_ref(up);
-		queue_push(&the_rserver.eval_queue, (void*)req);
+		queue_push(&the_server.eval_queue, (void*)req);
 	    }
 	}
     }
     switch (pub->kind) {
     case PUB_CLOSE:
-	// An close after already closed is used to decrement the reference
+	// A close after already closed is used to decrement the reference
 	// count on the upgraded so it can be destroyed in the con loop
 	// threads.
 	if (NULL != up->con) {
@@ -917,7 +930,7 @@ process_pub_con(Pub pub) {
 		    up->con->res_tail->next = res;
 		}
 		up->con->res_tail = res;
-		res->con_kind = up->con->kind;
+		res->con_kind = up->con->bind->kind;
 		res->close = true;
 	    }
 	}
@@ -957,15 +970,47 @@ process_pub_con(Pub pub) {
     pub_destroy(pub);	
 }
 
+short
+con_http_events(Con c) {
+    short	events = 0;
+    
+    if (!c->closing) {
+	events = POLLIN | POLLOUT;
+    }
+    return events;
+}
+
+static short
+con_ws_events(Con c) {
+    short	events = 0;
+
+    if (NULL != c->res_head && (c->res_head->close || c->res_head->ping || NULL != res_message(c->res_head))) {
+	events = POLLIN | POLLOUT;
+    } else if (!c->closing) {
+	events = POLLIN;
+    }
+    return events;
+}
+
+static short
+con_sse_events(Con c) {
+    short	events = 0;
+
+    if (NULL != c->res_head && NULL != res_message(c->res_head)) {
+	events = POLLOUT;
+    }
+    return events;
+}
+
 static struct pollfd*
-poll_setup(Con c, struct pollfd *pp) {
+poll_setup(Con c, Queue q, struct pollfd *pp) {
     // The first two pollfd are for the con_queue and the pub_queue in that
     // order.
     pp->fd = queue_listen(&the_server.con_queue);
     pp->events = POLLIN;
     pp->revents = 0;
     pp++;
-    pp->fd = queue_listen(&the_rserver.pub_queue);
+    pp->fd = queue_listen(q);
     pp->events = POLLIN;
     pp->revents = 0;
     pp++;
@@ -979,31 +1024,7 @@ poll_setup(Con c, struct pollfd *pp) {
 	}
 	c->pp = pp;
 	pp->fd = c->sock;
-	pp->events = 0;
-	switch (c->kind) {
-	case CON_HTTP:
-	    if (NULL != c->res_head && NULL != res_message(c->res_head)) {
-		pp->events = POLLIN | POLLOUT;
-	    } else if (!c->closing) {
-		pp->events = POLLIN;
-	    }
-	    break;
-	case CON_WS:
-	    if (NULL != c->res_head && (c->res_head->close || c->res_head->ping || NULL != res_message(c->res_head))) {
-		pp->events = POLLIN | POLLOUT;
-	    } else if (!c->closing) {
-		pp->events = POLLIN;
-	    }
-	    break;
-	case CON_SSE:
-	    if (NULL != c->res_head && NULL != res_message(c->res_head)) {
-		pp->events = POLLOUT;
-	    }
-	    break;
-	default:
-	    continue; // should never get here
-	    break;
-	}
+	pp->events = c->bind->events(c);
 	pp->revents = 0;
 	pp++;
     }
@@ -1029,6 +1050,7 @@ remove_dead_res(Con c) {
 
 void*
 con_loop(void *x) {
+    ConLoop		loop = (ConLoop)x;
     Con			c;
     Con			prev;
     Con			next;
@@ -1041,7 +1063,7 @@ con_loop(void *x) {
     int			i;
     double		now;
     Pub			pub;
-    
+
     atomic_fetch_add(&the_server.running, 1);
     memset(pa, 0, size);
     while (the_server.active) {
@@ -1055,18 +1077,19 @@ con_loop(void *x) {
 		size = sizeof(struct pollfd) * cnt;
 		if (NULL == (pa = (struct pollfd*)malloc(size))) {
 		    log_cat(&error_cat, "Out of memory.");
-		    agoo_shutdown();
+		    log_close();
+		    exit(EXIT_FAILURE);
+
 		    return NULL;
 		}
 		pend = pa + cnt;
 	    }
 	}
-	while (NULL != (pub = (Pub)queue_pop(&the_rserver.pub_queue, 0.0))) {
+	while (NULL != (pub = (Pub)queue_pop(&loop->pub_queue, 0.0))) {
 	    process_pub_con(pub);
 	}
-	
-	pp = poll_setup(cons, pa);
-	if (0 > (i = poll(pa, (nfds_t)(pp - pa), 100))) {
+	pp = poll_setup(cons, &loop->pub_queue, pa);
+	if (0 > (i = poll(pa, (nfds_t)(pp - pa), 10))) {
 	    if (EAGAIN == errno) {
 		continue;
 	    }
@@ -1075,7 +1098,6 @@ con_loop(void *x) {
 	    break;
 	}
 	now = dtime();
-
 	if (0 < i) {
 	    // Check con_queue if an event is waiting.
 	    if (0 != (pa->revents & POLLIN)) {
@@ -1090,7 +1112,9 @@ con_loop(void *x) {
 			size = sizeof(struct pollfd) * cnt;
 			if (NULL == (pa = (struct pollfd*)malloc(size))) {
 			    log_cat(&error_cat, "Out of memory.");
-			    agoo_shutdown();
+			    log_close();
+			    exit(EXIT_FAILURE);
+
 			    return NULL;
 			}
 			pend = pa + cnt;
@@ -1099,8 +1123,8 @@ con_loop(void *x) {
 	    }
 	    // Check pub_queue if an event is waiting.
 	    if (0 != (pa[1].revents & POLLIN)) {
-		queue_release(&the_rserver.pub_queue);
-		while (NULL != (pub = (Pub)queue_pop(&the_rserver.pub_queue, 0.0))) {
+		queue_release(&loop->pub_queue);
+		while (NULL != (pub = (Pub)queue_pop(&loop->pub_queue, 0.0))) {
 		    process_pub_con(pub);
 		}
 	    }
@@ -1118,7 +1142,7 @@ con_loop(void *x) {
 		    goto CON_CHECK;
 		}
 	    }
-	    if (0 != (pp->revents & POLLOUT)) {
+	    if (0 != (pp->revents & POLLOUT) && NULL != c->res_head && NULL != res_message(c->res_head)) {
 		if (con_write(c)) {
 		    c->dead = true;
 		    goto CON_CHECK;
@@ -1147,14 +1171,13 @@ con_loop(void *x) {
 		if (remove_dead_res(c)) {
 		    goto CON_RM;
 		}
-	    } else if (CON_WS == c->kind || CON_SSE == c->kind) {
+	    } else if (CON_WS == c->bind->kind || CON_SSE == c->bind->kind) {
 		c->timeout = dtime() + CON_TIMEOUT;
 		ws_ping(c);
 		continue;
 	    } else {
 		c->closing = true;
 		c->timeout = now + 0.5;
-		//wush_text_set(&c->resp, (char*)close_resp, sizeof(close_resp) - 1, false);
 		prev = c;
 		continue;
 	    }
@@ -1180,3 +1203,18 @@ con_loop(void *x) {
     return NULL;
 }
 
+ConLoop
+conloop_create(Err err, int id) {
+     ConLoop	loop;
+
+    if (NULL == (loop = (ConLoop)malloc(sizeof(struct _ConLoop)))) {
+	err_set(err, ERR_MEMORY, "Failed to allocate memory for a connection thread.");
+    } else {
+	//DEBUG_ALLOC(mem_con, c);
+	loop->next = NULL;
+	queue_multi_init(&loop->pub_queue, 256, true, false);
+	loop->id = id;
+	pthread_create(&loop->thread, NULL, con_loop, loop);
+    }
+    return loop;
+}