agoo 2.5.5 → 2.5.6

data/ext/agoo/request.h

@@ -10,7 +10,7 @@
 #include "req.h"
 
 extern void	request_init(VALUE mod);
-extern VALUE	request_wrap(Req req);
-extern VALUE	request_env(Req req, VALUE self);
+extern VALUE	request_wrap(agooReq req);
+extern VALUE	request_env(agooReq req, VALUE self);
 
 #endif // AGOO_REQUEST_H

data/ext/agoo/res.c

@@ -1,45 +1,67 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "con.h"
 #include "debug.h"
 #include "res.h"
 
-Res
-res_create(Con con) {
-    Res	res = (Res)malloc(sizeof(struct _Res));
+agooRes
+agoo_res_create(agooCon con) {
+    agooRes	res = NULL;
 
-    if (NULL != res) {
+    pthread_mutex_lock(&con->loop->lock);
+    if (NULL != (res = con->loop->res_head)) {
+	con->loop->res_head = res->next;
+	if (NULL == con->loop->res_head) {
+	    con->loop->res_tail = NULL;
+	}
+    }
+    pthread_mutex_unlock(&con->loop->lock);
+
+    if (NULL == res) {
+	if (NULL == (res = (agooRes)malloc(sizeof(struct _agooRes)))) {
+	    return NULL;
+	}
 	DEBUG_ALLOC(mem_res, res)
-	res->next = NULL;
-	atomic_init(&res->message, NULL);
-	res->con = con;
-	res->con_kind = CON_HTTP;
-	res->close = false;
-	res->ping = false;
-	res->pong = false;
     }
+    res->next = NULL;
+    atomic_init(&res->message, NULL);
+    res->con = con;
+    res->con_kind = AGOO_CON_HTTP;
+    res->close = false;
+    res->ping = false;
+    res->pong = false;
+
     return res;
 }
 
 void
-res_destroy(Res res) {
+agoo_res_destroy(agooRes res) {
     if (NULL != res) {
-	Text	message = res_message(res);
+	agooText	message = agoo_res_message(res);
 
 	if (NULL != message) {
-	    text_release(message);
+	    agoo_text_release(message);
+	}
+
+	res->next = NULL;
+	pthread_mutex_lock(&res->con->loop->lock);
+	if (NULL == res->con->loop->res_tail) {
+	    res->con->loop->res_head = res;
+	} else {
+	    res->con->loop->res_tail->next = res;
 	}
-	DEBUG_FREE(mem_res, res)
-	free(res);
+	res->con->loop->res_tail = res;
+	pthread_mutex_unlock(&res->con->loop->lock);
     }
 }
 
 void
-res_set_message(Res res, Text t) {
+agoo_res_set_message(agooRes res, agooText t) {
     if (NULL != t) {
-	text_ref(t);
+	agoo_text_ref(t);
     }
     atomic_store(&res->message, t);
 }

data/ext/agoo/res.h

@@ -3,30 +3,30 @@
 #ifndef AGOO_RES_H
 #define AGOO_RES_H
 
-#include <stdatomic.h>
 #include <stdbool.h>
 
-#include "text.h"
+#include "atomic.h"
 #include "con.h"
+#include "text.h"
 
-struct _Con;
+struct _agooCon;
 
-typedef struct _Res {
-    struct _Res		*next;
-    struct _Con		*con;
-    _Atomic(Text)	message;
-    ConKind		con_kind;
+typedef struct _agooRes {
+    struct _agooRes	*next;
+    struct _agooCon	*con;
+    _Atomic(agooText)	message;
+    agooConKind		con_kind;
     bool		close;
     bool		ping;
     bool		pong;
-} *Res;
+} *agooRes;
 
-extern Res	res_create(struct _Con *con);
-extern void	res_destroy(Res res);
-extern void	res_set_message(Res res, Text t);
+extern agooRes	agoo_res_create(struct _agooCon *con);
+extern void	agoo_res_destroy(agooRes res);
+extern void	agoo_res_set_message(agooRes res, agooText t);
 
-static inline Text
-res_message(Res res) {
+static inline agooText
+agoo_res_message(agooRes res) {
     return atomic_load(&res->message);
 }
 

data/ext/agoo/response.c

@@ -9,11 +9,11 @@
 #include "response.h"
 
 int
-response_len(Response res) {
+agoo_response_len(agooResponse res) {
     char	buf[256];
-    const char *msg = http_code_message(res->code);
+    const char *msg = agoo_http_code_message(res->code);
     int		len = snprintf(buf, sizeof(buf), "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", res->code, msg, res->blen);
-    Header	h;
+    agooHeader	h;
 
     for (h = res->headers; NULL != h; h = h->next) {
 	len += h->len;
@@ -25,9 +25,9 @@ response_len(Response res) {
 }
 
 void
-response_fill(Response res, char *buf) {
-    Header	h;
-    const char *msg = http_code_message(res->code);
+agoo_response_fill(agooResponse res, char *buf) {
+    agooHeader	h;
+    const char *msg = agoo_http_code_message(res->code);
 
     buf += sprintf(buf, "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", res->code, msg, res->blen);
 

data/ext/agoo/response.h

@@ -3,26 +3,26 @@
 #ifndef AGOO_RESPONSE_H
 #define AGOO_RESPONSE_H
 
-#include <stdatomic.h>
 #include <stdbool.h>
 
+#include "atomic.h"
 #include "server.h"
 #include "text.h"
 
-typedef struct _Header {
-    struct _Header	*next;
+typedef struct _agooHeader {
+    struct _agooHeader	*next;
     int			len;
     char		text[8];
-} *Header;
+} *agooHeader;
 
-typedef struct _Response {
+typedef struct _agooResponse {
     int		code;
-    Header	headers;
+    agooHeader	headers;
     int		blen;
     char	*body;
-} *Response;
+} *agooResponse;
 
-extern int	response_len(Response res);
-extern void	response_fill(Response res, char *buf);
+extern int	agoo_response_len(agooResponse res);
+extern void	agoo_response_fill(agooResponse res, char *buf);
 
 #endif // AGOO_RESPONSE_H

data/ext/agoo/rhook.c

@@ -53,9 +53,9 @@ resolve_classpath(const char *name, size_t len) {
     return resolve_classname(clas, class_name);
 }
 
-Hook
-rhook_create(Method method, const char *pattern, VALUE handler, Queue q) {
-    Hook	hook = hook_create(method, pattern, NULL, RACK_HOOK, q);
+agooHook
+rhook_create(agooMethod method, const char *pattern, VALUE handler, agooQueue q) {
+    agooHook	hook = agoo_hook_create(method, pattern, NULL, RACK_HOOK, q);
 
     if (NULL != hook) {
 	if (T_STRING == rb_type(handler)) {

data/ext/agoo/rhook.h

@@ -8,7 +8,7 @@
 #include "hook.h"
 #include "method.h"
 
-extern Hook	rhook_create(Method method, const char *pattern, VALUE handler, Queue q);
+extern agooHook	rhook_create(agooMethod method, const char *pattern, VALUE handler, agooQueue q);
 extern VALUE	resolve_classpath(const char *name, size_t len);
 
 #endif // AGOO_RHOOK_H

data/ext/agoo/rlog.c

@@ -14,6 +14,7 @@
 
 #include "debug.h"
 #include "dtime.h"
+#include "log.h"
 #include "rlog.h"
 
 static VALUE	log_mod = Qundef;
@@ -52,14 +53,14 @@ rlog_configure(VALUE self, VALUE options) {
 
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("dir"))))) {
 	    rb_check_type(v, T_STRING);
-	    strncpy(the_log.dir, StringValuePtr(v), sizeof(the_log.dir));
-	    the_log.dir[sizeof(the_log.dir) - 1] = '\0';
+	    strncpy(agoo_log.dir, StringValuePtr(v), sizeof(agoo_log.dir));
+	    agoo_log.dir[sizeof(agoo_log.dir) - 1] = '\0';
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("max_files"))))) {
 	    int	max = FIX2INT(v);
 
 	    if (1 <= max || max < 100) {
-		the_log.max_files = max;
+		agoo_log.max_files = max;
 	    } else {
 		rb_raise(rb_eArgError, "max_files must be between 1 and 100.");
 	    }
@@ -68,23 +69,23 @@ rlog_configure(VALUE self, VALUE options) {
 	    int	max = FIX2INT(v);
 
 	    if (1 <= max) {
-		the_log.max_size = max;
+		agoo_log.max_size = max;
 	    } else {
 		rb_raise(rb_eArgError, "max_size must be 1 or more.");
 	    }
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("console"))))) {
-	    the_log.console = (Qtrue == v);
+	    agoo_log.console = (Qtrue == v);
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("classic"))))) {
-	    the_log.classic = (Qtrue == v);
+	    agoo_log.classic = (Qtrue == v);
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("colorize"))))) {
-	    the_log.colorize = (Qtrue == v);
+	    agoo_log.colorize = (Qtrue == v);
 	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("states"))))) {
 	    if (T_HASH == rb_type(v)) {
-		LogCat	cat = the_log.cats;
+		agooLogCat	cat = agoo_log.cats;
 		VALUE	cv;
 		
 		for (; NULL != cat; cat = cat->next) {
@@ -101,15 +102,15 @@ rlog_configure(VALUE self, VALUE options) {
 	    }
 	}
     }
-    if (NULL != the_log.file) {
-	fclose(the_log.file);
-	the_log.file = NULL;
+    if (NULL != agoo_log.file) {
+	fclose(agoo_log.file);
+	agoo_log.file = NULL;
     }
-    if ('\0' != *the_log.dir) {
-	if (0 != mkdir(the_log.dir, 0770) && EEXIST != errno) {
-	    rb_raise(rb_eIOError, "Failed to create '%s'.", the_log.dir);
+    if ('\0' != *agoo_log.dir) {
+	if (0 != mkdir(agoo_log.dir, 0770) && EEXIST != errno) {
+	    rb_raise(rb_eIOError, "Failed to create '%s'.", agoo_log.dir);
 	}
-	open_log_file();
+	agoo_log_open_file();
     }
     return Qnil;
 }
@@ -122,7 +123,7 @@ rlog_configure(VALUE self, VALUE options) {
  */
 static VALUE
 rlog_shutdown(VALUE self) {
-    log_close();
+    agoo_log_close();
     return Qnil;
 }
 
@@ -134,7 +135,7 @@ rlog_shutdown(VALUE self) {
  */
 static VALUE
 rlog_errorp(VALUE self) {
-    return error_cat.on ? Qtrue : Qfalse;
+    return agoo_error_cat.on ? Qtrue : Qfalse;
 }
 
 /* Document-method: warn?
@@ -145,7 +146,7 @@ rlog_errorp(VALUE self) {
  */
 static VALUE
 rlog_warnp(VALUE self) {
-    return warn_cat.on ? Qtrue : Qfalse;
+    return agoo_warn_cat.on ? Qtrue : Qfalse;
 }
 
 /* Document-method: info?
@@ -156,7 +157,7 @@ rlog_warnp(VALUE self) {
  */
 static VALUE
 rlog_infop(VALUE self) {
-    return info_cat.on ? Qtrue : Qfalse;
+    return agoo_info_cat.on ? Qtrue : Qfalse;
 }
 
 /* Document-method: debug?
@@ -167,7 +168,7 @@ rlog_infop(VALUE self) {
  */
 static VALUE
 rlog_debugp(VALUE self) {
-    return debug_cat.on ? Qtrue : Qfalse;
+    return agoo_debug_cat.on ? Qtrue : Qfalse;
 }
 
 /* Document-method: error
@@ -178,7 +179,7 @@ rlog_debugp(VALUE self) {
  */
 static VALUE
 rlog_error(VALUE self, VALUE msg) {
-    log_cat(&error_cat, "%s", StringValuePtr(msg));
+    agoo_log_cat(&agoo_error_cat, "%s", StringValuePtr(msg));
     return Qnil;
 }
 
@@ -190,7 +191,7 @@ rlog_error(VALUE self, VALUE msg) {
  */
 static VALUE
 rlog_warn(VALUE self, VALUE msg) {
-    log_cat(&warn_cat, "%s", StringValuePtr(msg));
+    agoo_log_cat(&agoo_warn_cat, "%s", StringValuePtr(msg));
     return Qnil;
 }
 
@@ -202,7 +203,7 @@ rlog_warn(VALUE self, VALUE msg) {
  */
 static VALUE
 rlog_info(VALUE self, VALUE msg) {
-    log_cat(&info_cat, "%s", StringValuePtr(msg));
+    agoo_log_cat(&agoo_info_cat, "%s", StringValuePtr(msg));
     return Qnil;
 }
 
@@ -214,7 +215,7 @@ rlog_info(VALUE self, VALUE msg) {
  */
 static VALUE
 rlog_debug(VALUE self, VALUE msg) {
-    log_cat(&debug_cat, "%s", StringValuePtr(msg));
+    agoo_log_cat(&agoo_debug_cat, "%s", StringValuePtr(msg));
     return Qnil;
 }
 
@@ -226,7 +227,7 @@ rlog_debug(VALUE self, VALUE msg) {
  */
 static VALUE
 rlog_color_get(VALUE self, VALUE label) {
-    LogCat	cat = log_cat_find(StringValuePtr(label));
+    agooLogCat	cat = agoo_log_cat_find(StringValuePtr(label));
 
     if (NULL == cat) {
 	return Qnil;
@@ -246,8 +247,8 @@ static VALUE
 rlog_color_set(VALUE self, VALUE label, VALUE color) {
     const char	*label_str = StringValuePtr(label);
     const char	*color_name = StringValuePtr(color);
-    LogCat	cat = log_cat_find(label_str);
-    Color	c = find_color(color_name);
+    agooLogCat	cat = agoo_log_cat_find(label_str);
+    agooColor	c = find_color(color_name);
 
     if (NULL == cat) {
 	rb_raise(rb_eArgError, "%s is not a valid category.", label_str);
@@ -269,7 +270,7 @@ rlog_color_set(VALUE self, VALUE label, VALUE color) {
  */
 static VALUE
 rlog_on_get(VALUE self, VALUE label) {
-    LogCat	cat = log_cat_find(StringValuePtr(label));
+    agooLogCat	cat = agoo_log_cat_find(StringValuePtr(label));
 
     if (NULL == cat) {
 	return Qfalse;
@@ -286,7 +287,7 @@ rlog_on_get(VALUE self, VALUE label) {
 static VALUE
 rlog_on_set(VALUE self, VALUE label, VALUE state) {
     const char	*label_str = StringValuePtr(label);
-    LogCat	cat = log_cat_find(label_str);
+    agooLogCat	cat = agoo_log_cat_find(label_str);
 
     if (NULL == cat) {
 	rb_raise(rb_eArgError, "%s is not a valid category.", label_str);
@@ -305,12 +306,12 @@ rlog_on_set(VALUE self, VALUE label, VALUE state) {
 static VALUE
 rlog_log(VALUE self, VALUE label, VALUE msg) {
     const char	*label_str = StringValuePtr(label);
-    LogCat	cat = log_cat_find(label_str);
+    agooLogCat	cat = agoo_log_cat_find(label_str);
 
     if (NULL == cat) {
 	rb_raise(rb_eArgError, "%s is not a valid category.", label_str);
     }
-    log_cat(cat, "%s", StringValuePtr(msg));
+    agoo_log_cat(cat, "%s", StringValuePtr(msg));
     
     return Qnil;
 }
@@ -326,7 +327,7 @@ static VALUE
 rlog_flush(VALUE self, VALUE to) {
     double	timeout = NUM2DBL(to);
     
-    if (!log_flush(timeout)) {
+    if (!agoo_log_flush(timeout)) {
 	rb_raise(rb_eStandardError, "timed out waiting for log flush.");
     }
     return Qnil;
@@ -340,7 +341,7 @@ rlog_flush(VALUE self, VALUE to) {
  */
 static VALUE
 rlog_rotate(VALUE self) {
-    log_rotate();
+    agoo_log_rotate();
     return Qnil;
 }
 
@@ -352,7 +353,7 @@ rlog_rotate(VALUE self) {
  */
 static VALUE
 rlog_console(VALUE self, VALUE on) {
-    the_log.console = (Qtrue == on);
+    agoo_log.console = (Qtrue == on);
     return Qnil;
 }
 
@@ -364,7 +365,7 @@ rlog_console(VALUE self, VALUE on) {
  */
 static VALUE
 rlog_classic(VALUE self) {
-    the_log.classic = true;
+    agoo_log.classic = true;
     return Qnil;
 }
 
@@ -376,7 +377,7 @@ rlog_classic(VALUE self) {
  */
 static VALUE
 rlog_json(VALUE self) {
-    the_log.classic = false;
+    agoo_log.classic = false;
     return Qnil;
 }
 
@@ -391,7 +392,7 @@ rlog_max_size(VALUE self, VALUE rmax) {
     int	max = FIX2INT(rmax);
 
     if (1 <= max) {
-	the_log.max_size = max;
+	agoo_log.max_size = max;
     } else {
 	rb_raise(rb_eArgError, "max_size must be 1 or more.");
     }
@@ -409,7 +410,7 @@ rlog_max_files(VALUE self, VALUE rmax) {
     int	max = FIX2INT(rmax);
 
     if (1 <= max || max < 100) {
-	the_log.max_files = max;
+	agoo_log.max_files = max;
     } else {
 	rb_raise(rb_eArgError, "max_files must be between 1 and 100.");
     }
@@ -417,7 +418,7 @@ rlog_max_files(VALUE self, VALUE rmax) {
 }
 
 static void
-on_error(Err err) {
+on_error(agooErr err) {
     rb_raise(rb_eStandardError, "%s", err->msg);
 }
 
@@ -429,6 +430,8 @@ on_error(Err err) {
  */
 void
 rlog_init(VALUE mod) {
+    struct _agooErr	err = AGOO_ERR_INIT;
+    
     log_mod = rb_define_module_under(mod, "Log");
 
     rb_define_module_function(log_mod, "configure", rlog_configure, 1);
@@ -463,8 +466,10 @@ rlog_init(VALUE mod) {
     rb_define_module_function(log_mod, "max_size=", rlog_max_size, 1);
     rb_define_module_function(log_mod, "max_files=", rlog_max_files, 1);
 
-    the_log.on_error = on_error;
+    agoo_log.on_error = on_error;
     
-    log_init("agoo");
-    log_start(false);
+    agoo_log_init("agoo");
+    if (AGOO_ERR_OK != agoo_log_start(&err, false)) {
+	rb_raise(rb_eStandardError, "%s", err.msg);
+    }
 }