agoo 2.5.1 → 2.5.2

data/ext/agoo/request.h

@@ -7,43 +7,10 @@
 
 #include <ruby.h>
 
-#include "hook.h"
-#include "res.h"
-#include "types.h"
+#include "req.h"
 
-struct _Server;
-struct _Upgraded;
-
-typedef enum {
-    UP_NONE	= '\0',
-    UP_WS	= 'W',
-    UP_SSE	= 'S',
-} Upgrade;
-
-typedef struct _Str {
-    char		*start;
-    unsigned int	len;
-} *Str;
-
-typedef struct _Req {
-    Method		method;
-    Upgrade		upgrade;
-    struct _Upgraded	*up;
-    struct _Str		path;
-    struct _Str		query;
-    struct _Str		header;
-    struct _Str		body;
-    Hook		hook;
-    VALUE		env;
-    Res			res;
-    size_t		mlen;   // allocated msg length
-    char		msg[8]; // expanded to be full message
-} *Req;
-
-extern Req	request_create(size_t mlen);
 extern void	request_init(VALUE mod);
 extern VALUE	request_wrap(Req req);
 extern VALUE	request_env(Req req, VALUE self);
-extern void	request_destroy(Req req);
 
 #endif // __AGOO_REQUEST_H__

data/ext/agoo/res.h

@@ -6,10 +6,8 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-#include <ruby.h>
-
 #include "text.h"
-#include "types.h"
+#include "con.h"
 
 struct _Con;
 

data/ext/agoo/response.c

@@ -1,19 +1,18 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "debug.h"
 #include "http.h"
 #include "response.h"
-#include "text.h"
 
-static VALUE	res_class = Qundef;
-
-static int
+int
 response_len(Response res) {
-    char	c;
+    char	buf[256];
     const char *msg = http_code_message(res->code);
-    int		len = snprintf(&c, 1, "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", res->code, msg, res->blen);
+    int		len = snprintf(buf, sizeof(buf), "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", res->code, msg, res->blen);
     Header	h;
 
     for (h = res->headers; NULL != h; h = h->next) {
@@ -25,7 +24,7 @@ response_len(Response res) {
     return len;
 }
 
-static void
+void
 response_fill(Response res, char *buf) {
     Header	h;
     const char *msg = http_code_message(res->code);
@@ -44,244 +43,3 @@ response_fill(Response res, char *buf) {
     }
     *buf = '\0';
 }
-
-static void
-response_free(void *ptr) {
-    Response	res = (Response)ptr;
-    Header	h;
-
-    while (NULL != (h = res->headers)) {
-	res->headers = h->next;
-	DEBUG_FREE(mem_header, h);
-	xfree(h);
-    }
-    DEBUG_FREE(mem_res_body, res->body);
-    DEBUG_FREE(mem_response, ptr);
-    free(res->body); // allocated with strdup
-    xfree(ptr);
-}
-
-VALUE
-response_new( ) {
-    Response	res = ALLOC(struct _Response);
-
-    DEBUG_ALLOC(mem_response, res)
-    memset(res, 0, sizeof(struct _Response));
-    res->code = 200;
-    
-    return Data_Wrap_Struct(res_class, NULL, response_free, res);
-}
-
-/* Document-method: to_s
- *
- * call-seq: to_s()
- *
- * Returns a string representation of the response.
- */
-static VALUE
-to_s(VALUE self) {
-    Response	res = (Response)DATA_PTR(self);
-    int		len = response_len(res);
-    char	*s = ALLOC_N(char, len + 1);
-
-    DEBUG_ALLOC(mem_to_s, s)
-    response_fill(res, s);
-    
-    return rb_str_new(s, len);
-}
-
-/* Document-method: content
- *
- * call-seq: content()
- *
- * alias for _body_
- */
-
-/* Document-method: body
- *
- * call-seq: body()
- *
- * Gets the HTTP body for the response.
- */
-static VALUE
-body_get(VALUE self) {
-    Response	res = (Response)DATA_PTR(self);
-
-    if (NULL == res->body) {
-	return Qnil;
-    }
-    return rb_str_new(res->body, res->blen);
-}
-
-/* Document-method: content=
- *
- * call-seq: content=(str)
- *
- * alias for _body=_
- */
-
-/* Document-method: body=
- *
- * call-seq: body=(str)
- *
- * Sets the HTTP body for the response.
- */
-static VALUE
-body_set(VALUE self, VALUE val) {
-    Response	res = (Response)DATA_PTR(self);
-
-    if (T_STRING == rb_type(val)) {
-	res->body = strdup(StringValuePtr(val));
-	DEBUG_ALLOC(mem_res_body, res->body)
-	res->blen = (int)RSTRING_LEN(val);
-    } else {
-	rb_raise(rb_eArgError, "Expected a string");
-	// TBD use Oj to encode val
-    }
-    return Qnil;
-}
-
-/* Document-method: code
- *
- * call-seq: code()
- *
- * Gets the HTTP status code for the response.
- */
-static VALUE
-code_get(VALUE self) {
-    return INT2NUM(((Response)DATA_PTR(self))->code);
-}
-
-/* Document-method: code=
- *
- * call-seq: code=(value)
- *
- * Sets the HTTP status code for the response.
- */
-static VALUE
-code_set(VALUE self, VALUE val) {
-    int	code = NUM2INT(val);
-
-    if (100 <= code && code < 600) {
-	((Response)DATA_PTR(self))->code = code;
-    } else {
-	rb_raise(rb_eArgError, "%d is not a valid HTTP status code.", code);
-    }
-    return Qnil;
-}
-
-/* Document-method: []
- *
- * call-seq: [](key)
- *
- * Gets a header element associated with the _key_.
- */
-static VALUE
-head_get(VALUE self, VALUE key) {
-    Response	res = (Response)DATA_PTR(self);
-    Header	h;
-    const char	*ks = StringValuePtr(key);
-    int		klen = (int)RSTRING_LEN(key);
-    
-    for (h = res->headers; NULL != h; h = h->next) {
-	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
-	    return rb_str_new(h->text + klen + 2, h->len - klen - 4);
-	}
-    }
-    return Qnil;
-}
-
-/* Document-method: []=
- *
- * call-seq: []=(key, value)
- *
- * Sets a header element with the _key_ and _value_ provided.
- */
-static VALUE
-head_set(VALUE self, VALUE key, VALUE val) {
-    Response	res = (Response)DATA_PTR(self);
-    Header	h;
-    Header	prev = NULL;
-    const char	*ks = StringValuePtr(key);
-    const char	*vs;
-    int		klen = (int)RSTRING_LEN(key);
-    int		vlen;
-    int		hlen;
-
-    for (h = res->headers; NULL != h; h = h->next) {
-	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
-	    if (NULL == prev) {
-		res->headers = h->next;
-	    } else {
-		prev->next = h->next;
-	    }
-	    DEBUG_FREE(mem_header, h);
-	    xfree(h);
-	    break;
-	}
-	prev = h;
-    }
-    if (T_STRING != rb_type(val)) {
-	val = rb_funcall(val, rb_intern("to_s"), 0);
-    }
-    vs = StringValuePtr(val);
-    vlen = (int)RSTRING_LEN(val);
-
-    if (the_server.pedantic) {
-	struct _Err	err = ERR_INIT;
-
-	if (ERR_OK != http_header_ok(&err, ks, klen, vs, vlen)) {
-	    rb_raise(rb_eArgError, "%s", err.msg);
-	}
-    }
-    hlen = klen + vlen + 4;
-    h = (Header)ALLOC_N(char, sizeof(struct _Header) - 8 + hlen + 1);
-    DEBUG_ALLOC(mem_header, h)
-
-    h->next = NULL;
-    h->len = hlen;
-    strncpy(h->text, ks, klen);
-    strcpy(h->text + klen, ": ");
-    strncpy(h->text + klen + 2, vs, vlen);
-    strcpy(h->text + klen + 2 + vlen, "\r\n");
-    if (NULL == res->headers) {
-	res->headers = h;
-    } else {
-	for (prev = res->headers; NULL != prev->next; prev = prev->next) {
-	}
-	prev->next = h;
-    }
-    return Qnil;
-}
-
-Text
-response_text(VALUE self) {
-    Response	res = (Response)DATA_PTR(self);
-    int		len = response_len(res);
-    Text	t = text_allocate(len);
-
-    response_fill(res, t->text);
-    t->len = len;
-
-    return t;
-}
-
-/* Document-class: Agoo::Response
- *
- * A response passed to a handler that responds to the _on_request_
- * method. The expected response is modified by the handler before returning.
- */
-void
-response_init(VALUE mod) {
-    res_class = rb_define_class_under(mod, "Response", rb_cObject);
-
-    rb_define_method(res_class, "to_s", to_s, 0);
-    rb_define_method(res_class, "body", body_get, 0);
-    rb_define_method(res_class, "body=", body_set, 1);
-    rb_define_method(res_class, "content", body_get, 0);
-    rb_define_method(res_class, "content=", body_set, 1);
-    rb_define_method(res_class, "code", code_get, 0);
-    rb_define_method(res_class, "code=", code_set, 1);
-    rb_define_method(res_class, "[]", head_get, 1);
-    rb_define_method(res_class, "[]=", head_set, 2);
-}

data/ext/agoo/response.h

@@ -6,8 +6,6 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 
-#include <ruby.h>
-
 #include "server.h"
 #include "text.h"
 
@@ -24,9 +22,7 @@ typedef struct _Response {
     char	*body;
 } *Response;
 
-extern void	response_init(VALUE mod);
-
-extern VALUE	response_new();
-extern Text	response_text(VALUE self);
+extern int	response_len(Response res);
+extern void	response_fill(Response res, char *buf);
 
 #endif // __AGOO_RESPONSE_H__

data/ext/agoo/rlog.c

@@ -465,5 +465,6 @@ rlog_init(VALUE mod) {
 
     the_log.on_error = on_error;
     
-    log_init();
+    log_init("agoo");
+    log_start(false);
 }

data/ext/agoo/rresponse.c

@@ -0,0 +1,252 @@
+// Copyright (c) 2018, Peter Ohler, All rights reserved.
+
+#include <stdlib.h>
+
+#include "debug.h"
+#include "http.h"
+#include "response.h"
+#include "rresponse.h"
+#include "text.h"
+
+static VALUE	res_class = Qundef;
+
+static void
+response_free(void *ptr) {
+    Response	res = (Response)ptr;
+    Header	h;
+
+    while (NULL != (h = res->headers)) {
+	res->headers = h->next;
+	DEBUG_FREE(mem_header, h);
+	xfree(h);
+    }
+    DEBUG_FREE(mem_res_body, res->body);
+    DEBUG_FREE(mem_response, ptr);
+    free(res->body); // allocated with strdup
+    xfree(ptr);
+}
+
+VALUE
+response_new( ) {
+    Response	res = ALLOC(struct _Response);
+
+    DEBUG_ALLOC(mem_response, res)
+    memset(res, 0, sizeof(struct _Response));
+    res->code = 200;
+    
+    return Data_Wrap_Struct(res_class, NULL, response_free, res);
+}
+
+/* Document-method: to_s
+ *
+ * call-seq: to_s()
+ *
+ * Returns a string representation of the response.
+ */
+static VALUE
+to_s(VALUE self) {
+    Response	res = (Response)DATA_PTR(self);
+    int		len = response_len(res);
+    char	*s = ALLOC_N(char, len + 1);
+
+    DEBUG_ALLOC(mem_to_s, s)
+    response_fill(res, s);
+    
+    return rb_str_new(s, len);
+}
+
+/* Document-method: content
+ *
+ * call-seq: content()
+ *
+ * alias for _body_
+ */
+
+/* Document-method: body
+ *
+ * call-seq: body()
+ *
+ * Gets the HTTP body for the response.
+ */
+static VALUE
+body_get(VALUE self) {
+    Response	res = (Response)DATA_PTR(self);
+
+    if (NULL == res->body) {
+	return Qnil;
+    }
+    return rb_str_new(res->body, res->blen);
+}
+
+/* Document-method: content=
+ *
+ * call-seq: content=(str)
+ *
+ * alias for _body=_
+ */
+
+/* Document-method: body=
+ *
+ * call-seq: body=(str)
+ *
+ * Sets the HTTP body for the response.
+ */
+static VALUE
+body_set(VALUE self, VALUE val) {
+    Response	res = (Response)DATA_PTR(self);
+
+    if (T_STRING == rb_type(val)) {
+	res->body = strdup(StringValuePtr(val));
+	DEBUG_ALLOC(mem_res_body, res->body)
+	res->blen = (int)RSTRING_LEN(val);
+    } else {
+	rb_raise(rb_eArgError, "Expected a string");
+	// TBD use Oj to encode val
+    }
+    return Qnil;
+}
+
+/* Document-method: code
+ *
+ * call-seq: code()
+ *
+ * Gets the HTTP status code for the response.
+ */
+static VALUE
+code_get(VALUE self) {
+    return INT2NUM(((Response)DATA_PTR(self))->code);
+}
+
+/* Document-method: code=
+ *
+ * call-seq: code=(value)
+ *
+ * Sets the HTTP status code for the response.
+ */
+static VALUE
+code_set(VALUE self, VALUE val) {
+    int	code = NUM2INT(val);
+
+    if (100 <= code && code < 600) {
+	((Response)DATA_PTR(self))->code = code;
+    } else {
+	rb_raise(rb_eArgError, "%d is not a valid HTTP status code.", code);
+    }
+    return Qnil;
+}
+
+/* Document-method: []
+ *
+ * call-seq: [](key)
+ *
+ * Gets a header element associated with the _key_.
+ */
+static VALUE
+head_get(VALUE self, VALUE key) {
+    Response	res = (Response)DATA_PTR(self);
+    Header	h;
+    const char	*ks = StringValuePtr(key);
+    int		klen = (int)RSTRING_LEN(key);
+    
+    for (h = res->headers; NULL != h; h = h->next) {
+	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
+	    return rb_str_new(h->text + klen + 2, h->len - klen - 4);
+	}
+    }
+    return Qnil;
+}
+
+/* Document-method: []=
+ *
+ * call-seq: []=(key, value)
+ *
+ * Sets a header element with the _key_ and _value_ provided.
+ */
+static VALUE
+head_set(VALUE self, VALUE key, VALUE val) {
+    Response	res = (Response)DATA_PTR(self);
+    Header	h;
+    Header	prev = NULL;
+    const char	*ks = StringValuePtr(key);
+    const char	*vs;
+    int		klen = (int)RSTRING_LEN(key);
+    int		vlen;
+    int		hlen;
+
+    for (h = res->headers; NULL != h; h = h->next) {
+	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
+	    if (NULL == prev) {
+		res->headers = h->next;
+	    } else {
+		prev->next = h->next;
+	    }
+	    DEBUG_FREE(mem_header, h);
+	    xfree(h);
+	    break;
+	}
+	prev = h;
+    }
+    if (T_STRING != rb_type(val)) {
+	val = rb_funcall(val, rb_intern("to_s"), 0);
+    }
+    vs = StringValuePtr(val);
+    vlen = (int)RSTRING_LEN(val);
+
+    if (the_server.pedantic) {
+	struct _Err	err = ERR_INIT;
+
+	if (ERR_OK != http_header_ok(&err, ks, klen, vs, vlen)) {
+	    rb_raise(rb_eArgError, "%s", err.msg);
+	}
+    }
+    hlen = klen + vlen + 4;
+    h = (Header)ALLOC_N(char, sizeof(struct _Header) - 8 + hlen + 1);
+    DEBUG_ALLOC(mem_header, h)
+
+    h->next = NULL;
+    h->len = hlen;
+    strncpy(h->text, ks, klen);
+    strcpy(h->text + klen, ": ");
+    strncpy(h->text + klen + 2, vs, vlen);
+    strcpy(h->text + klen + 2 + vlen, "\r\n");
+    if (NULL == res->headers) {
+	res->headers = h;
+    } else {
+	for (prev = res->headers; NULL != prev->next; prev = prev->next) {
+	}
+	prev->next = h;
+    }
+    return Qnil;
+}
+
+Text
+response_text(VALUE self) {
+    Response	res = (Response)DATA_PTR(self);
+    int		len = response_len(res);
+    Text	t = text_allocate(len);
+
+    response_fill(res, t->text);
+    t->len = len;
+
+    return t;
+}
+
+/* Document-class: Agoo::Response
+ *
+ * A response passed to a handler that responds to the _on_request_
+ * method. The expected response is modified by the handler before returning.
+ */
+void
+response_init(VALUE mod) {
+    res_class = rb_define_class_under(mod, "Response", rb_cObject);
+
+    rb_define_method(res_class, "to_s", to_s, 0);
+    rb_define_method(res_class, "body", body_get, 0);
+    rb_define_method(res_class, "body=", body_set, 1);
+    rb_define_method(res_class, "content", body_get, 0);
+    rb_define_method(res_class, "content=", body_set, 1);
+    rb_define_method(res_class, "code", code_get, 0);
+    rb_define_method(res_class, "code=", code_set, 1);
+    rb_define_method(res_class, "[]", head_get, 1);
+    rb_define_method(res_class, "[]=", head_set, 2);
+}