agoo 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aebba91a863e1bdbaa53c1d31560728968f7d2e27c27af21691bf8d502f4afb
-  data.tar.gz: e0b3efd1eaa9dbe2629738c3b8ecdc0e61e208ae94f54598a182791c23d4873c
+  metadata.gz: d44ba7a7229894d86dba33f2138fc300cf1885c20078709fda7ebe9264e4a6fe
+  data.tar.gz: 411a5541b7d47bd2dd5dc68a45401206787b026599c33eff3544a71757cf8072
 SHA512:
-  metadata.gz: 82944a0b58ea473b2b4228c3d59901b29fdae19ef3ad1711a84980d7d2028418abaeb9f05b93d4d7f8649e0ceeb3bebaaaa5d448ac48dcbc647cdeeaf494a169
-  data.tar.gz: 84894610f09ea3a7c089cc11e4edc3479bf641dda306f7e9dbf89fc88e4c0c8018d0d84a8e7df98c6296215f9c4a26cacc6b3c593e63b869308177f820411cee
+  metadata.gz: 21ecc474d333acad22a54e781b135eb450273d0f6662c1566dd0b1949e9db3051db08264021b99fe01cd2fc819e7fab56abec3bbbb0dfd04b7fc6bc4a05f82e9
+  data.tar.gz: b7f92457d97efd991b2a8e54bc1c0ae488482dcde217f32a2a2ea6d4f07536cab3b97341aebf0eadeaa514c03251a97e85510e3bf7b185aa43007f52a130bacc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+### 2.2.1 - 2018-05-31
+
+- Corrected header bug where a `:` in the value would cause an incorrect header key and value.
+
+- Improved idle CPU use.
+
 ### 2.2.0 - 2018-05-30
 
 - Clustering now supported with forked workers making Agoo even faster.

data/ext/agoo/log.c

@@ -1,6 +1,8 @@
 // Copyright 2018 by Peter Ohler, All Rights Reserved
 
 #include <dirent.h>
+#include <fcntl.h>
+#include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,6 +10,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "debug.h"
 #include "dtime.h"
@@ -15,6 +18,7 @@
 
 // lower gives faster response but burns more CPU. This is a reasonable compromise.
 #define RETRY_SECS	0.0001
+#define WAIT_MSECS	100
 #define NOT_WAITING	0
 #define WAITING		1
 #define NOTIFIED	2
@@ -90,11 +94,37 @@ log_queue_empty() {
     return false;
 }
 
+static int
+log_listen() {
+    if (0 == the_log.rsock) {
+	int	fd[2];
+
+	if (0 == pipe(fd)) {
+	    fcntl(fd[0], F_SETFL, O_NONBLOCK);
+	    fcntl(fd[1], F_SETFL, O_NONBLOCK);
+	    the_log.rsock = fd[0];
+	    the_log.wsock = fd[1];
+	}
+    }
+    atomic_store(&the_log.wait_state, WAITING);
+    
+    return the_log.rsock;
+}
+
+static void
+log_release() {
+    char	buf[8];
+
+    // clear pipe
+    while (0 < read(the_log.rsock, buf, sizeof(buf))) {
+    }
+    atomic_store(&the_log.wait_state, NOT_WAITING);
+}
+
 static LogEntry
 log_queue_pop(double timeout) {
     LogEntry	e = the_log.head;
     LogEntry	next;
-
     if (e->ready) {
 	return e;
     }
@@ -103,12 +133,18 @@ log_queue_pop(double timeout) {
 	next = the_log.q;
     }
     // If the next is the tail then wait for something to be appended.
-    for (int cnt = (int)(timeout / RETRY_SECS); atomic_load(&the_log.tail) == next; cnt--) {
-	// TBD poll would be better
+    for (int cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&the_log.tail) == next; cnt--) {
+	struct pollfd	pa;
+
 	if (cnt <= 0) {
 	    return NULL;
 	}
-	dsleep(RETRY_SECS);
+	pa.fd = log_listen();
+	pa.events = POLLIN;
+	pa.revents = 0;
+	if (0 < poll(&pa, 1, WAIT_MSECS)) {
+	    log_release();
+	}
     }
     atomic_store(&the_log.head, next);
 
@@ -313,6 +349,7 @@ open_log_file() {
     if (the_log.max_size <= the_log.size) {
 	log_rotate();
     }
+    // TBD open rscok and wsock
 }
 
 void
@@ -937,6 +974,7 @@ log_start(bool with_pid) {
     if (NULL != the_log.file) {
 	fclose(the_log.file);
 	the_log.file = NULL;
+	// TBD close rsock and wsock
     }
     the_log.with_pid = with_pid;
     if (with_pid && '\0' != *the_log.dir) {

data/ext/agoo/queue.c

@@ -1,6 +1,7 @@
 // Copyright 2015, 2016, 2018 by Peter Ohler, All Rights Reserved
 
 #include <fcntl.h>
+#include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,6 +15,7 @@
 
 // lower gives faster response but burns more CPU. This is a reasonable compromise.
 #define RETRY_SECS	0.0001
+#define WAIT_MSECS	100
 
 #define NOT_WAITING	0
 #define WAITING		1
@@ -126,14 +128,21 @@ queue_pop(Queue q, double timeout) {
 	next = q->q;
     }
     // If the next is the tail then wait for something to be appended.
-    for (int cnt = (int)(timeout / RETRY_SECS); atomic_load(&q->tail) == next; cnt--) {
+    for (int cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&q->tail) == next; cnt--) {
+	struct pollfd	pa;
+
 	if (cnt <= 0) {
 	    if (q->multi_pop) {
 		atomic_flag_clear(&q->pop_lock);
 	    }
 	    return NULL;
 	}
-	dsleep(RETRY_SECS);
+	pa.fd = queue_listen(q);
+	pa.events = POLLIN;
+	pa.revents = 0;
+	if (0 < poll(&pa, 1, WAIT_MSECS)) {
+	    queue_release(q);
+	}
     }
     atomic_store(&q->head, next);
 

data/ext/agoo/request.c

@@ -395,7 +395,7 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
 	strncpy(k, key, klen);
 	hkey[klen + 5] = '\0';
     
-	rb_hash_aset(hh, rb_str_new(hkey, klen + 5), sval);
+	//rb_hash_aset(hh, rb_str_new(hkey, klen + 5), sval);
 	// Contrary to the Rack spec, Rails expects all upper case keys so add those as well.
 	for (k = hkey + 5; '\0' != *k; k++) {
 	    if ('-' == *k) {
@@ -423,11 +423,14 @@ fill_headers(Req r, VALUE hash) {
     if (NULL == r) {
 	rb_raise(rb_eArgError, "Request is no longer valid.");
     }
+    
     for (; h < end; h++) {
 	switch (*h) {
 	case ':':
-	    kend = h;
-	    val = h + 1;
+	    if (NULL == val) {
+		kend = h;
+		val = h + 1;
+	    }
 	    break;
 	case '\r':
 	    if (NULL != val) {

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/test/base_handler_test.rb

@@ -95,9 +95,9 @@ class BaseHandlerTest < Minitest::Test
     obj = Oj.load(content, mode: :strict)
 
     expect = {
-      "HTTP_Accept" => "application/json",
-      "HTTP_Accept-Encoding" => "*",
-      "HTTP_User-Agent" => "Ruby",
+      "HTTP_ACCEPT" => "application/json",
+      "HTTP_ACCEPT_ENCODING" => "*",
+      "HTTP_USER_AGENT" => "Ruby",
       "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",

data/test/rack_handler_test.rb

@@ -79,17 +79,18 @@ class RackHandlerTest < Minitest::Test
     req['Accept-Encoding'] = '*'
     req['Accept'] = 'application/json'
     req['User-Agent'] = 'Ruby'
+    req['Host'] = 'localhost:6467'
 
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }
     content = res.body
     obj = Oj.load(content, mode: :strict)
-
     expect = {
-      "HTTP_Accept" => "application/json",
-      "HTTP_Accept-Encoding" => "*",
-      "HTTP_User-Agent" => "Ruby",
+      "HTTP_ACCEPT" => "application/json",
+      "HTTP_ACCEPT_ENCODING" => "*",
+      "HTTP_USER_AGENT" => "Ruby",
+      "HTTP_HOST" => "localhost:6467",
       "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj