agoo 1.2.2 → 2.0.0

data/ext/agoo/log.h

@@ -49,7 +49,6 @@ typedef struct _Log	*Log;
 
 typedef struct _LogCat {
     struct _LogCat	*next;
-    Log			log;
     char		label[32];
     Color		color;
     int			level;
@@ -91,13 +90,27 @@ struct _Log {
     int			wsock;
 };
 
-extern int	log_init(Err err, Log log, VALUE cfg);
-extern void	log_close(Log log);
-extern bool	log_flush(Log log, double timeout);
+extern struct _Log	the_log;
+extern struct _LogCat	fatal_cat;
+extern struct _LogCat	error_cat;
+extern struct _LogCat	warn_cat;
+extern struct _LogCat	info_cat;
+extern struct _LogCat	debug_cat;
+extern struct _LogCat	con_cat;
+extern struct _LogCat	req_cat;
+extern struct _LogCat	resp_cat;
+extern struct _LogCat	eval_cat;
+extern struct _LogCat	push_cat;
 
-extern void	log_cat_reg(Log log, LogCat cat, const char *label, LogLevel level, const char *color, bool on);
-extern void	log_cat_on(Log log, const char *label, bool on);
-extern LogCat	log_cat_find(Log log, const char *label);
+extern void	log_init(VALUE mod);
+
+extern void	log_close();
+extern bool	log_flush(double timeout);
+extern void	log_rotate();
+
+extern void	log_cat_reg(LogCat cat, const char *label, LogLevel level, const char *color, bool on);
+extern void	log_cat_on(const char *label, bool on);
+extern LogCat	log_cat_find(const char *label);
 
 // Function to call to make a log entry.
 extern void	log_cat(LogCat cat, const char *fmt, ...);

data/ext/agoo/page.c

@@ -159,7 +159,7 @@ mime_set(Cache cache, const char *key, const char *value) {
 	    ((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
 	    if (h == (int64_t)s->hash && len == s->klen &&
 		((0 <= len && len <= MAX_KEY_UNIQ) || 0 == strcmp(s->key, key))) {
-		DEBUG_FREE(mem_mime_slot)
+		DEBUG_FREE(mem_mime_slot, s->value)
 		free(s->value);
 		s->value = strdup(value);
 		return;
@@ -169,7 +169,7 @@ mime_set(Cache cache, const char *key, const char *value) {
     if (NULL == (s = (MimeSlot)malloc(sizeof(struct _MimeSlot)))) {
 	rb_raise(rb_eArgError, "out of memory adding %s", key);
     }
-    DEBUG_ALLOC(mem_mime_slot)
+    DEBUG_ALLOC(mem_mime_slot, s)
     s->hash = h;
     s->klen = len;
     if (NULL == key) {
@@ -209,7 +209,7 @@ cache_set(Cache cache, const char *key, int klen, Page value) {
     if (NULL == (s = (Slot)malloc(sizeof(struct _Slot)))) {
 	return value;
     }
-    DEBUG_ALLOC(mem_page_slot)
+    DEBUG_ALLOC(mem_page_slot, s)
     s->hash = h;
     s->klen = len;
     if (NULL == key) {
@@ -235,7 +235,7 @@ cache_init(Cache cache) {
 }
 
 void
-cache_destroy(Cache cache) {
+cache_cleanup(Cache cache) {
     Slot	*sp = cache->buckets;
     Slot	s;
     Slot	n;
@@ -247,7 +247,8 @@ cache_destroy(Cache cache) {
     for (i = PAGE_BUCKET_SIZE; 0 < i; i--, sp++) {
 	for (s = *sp; NULL != s; s = n) {
 	    n = s->next;
-	    DEBUG_FREE(mem_page_slot)
+	    DEBUG_FREE(mem_page_slot, s);
+	    page_destroy(s->value);
 	    free(s);
 	}
 	*sp = NULL;
@@ -256,13 +257,11 @@ cache_destroy(Cache cache) {
     for (i = MIME_BUCKET_SIZE; 0 < i; i--, mp++) {
 	for (sm = *mp; NULL != sm; sm = m) {
 	    m = sm->next;
-	    DEBUG_FREE(mem_page_slot)
+	    DEBUG_FREE(mem_mime_slot, sm);
 	    free(sm);
 	}
 	*mp = NULL;
     }
-    //DEBUG_FREE(mem_cache)
-    free(cache);
 }
 
 // The page resp contents point to the page resp msg to save memory and reduce
@@ -272,13 +271,13 @@ page_create(const char *path) {
     Page	p = (Page)malloc(sizeof(struct _Page));
 
     if (NULL != p) {
-	DEBUG_ALLOC(mem_page)
+	DEBUG_ALLOC(mem_page, p)
 	p->resp = NULL;
 	if (NULL == path) {
 	    p->path = NULL;
 	} else {
 	    p->path = strdup(path);
-	    DEBUG_ALLOC(mem_page_path)
+	    DEBUG_ALLOC(mem_page_path, p->path)
 	}
 	p->mtime = 0;
 	p->last_check = 0.0;
@@ -292,8 +291,8 @@ page_destroy(Page p) {
 	text_release(p->resp);
 	p->resp = NULL;
     }
-    DEBUG_FREE(mem_page_path)
-    DEBUG_FREE(mem_page)
+    DEBUG_FREE(mem_page_path, p->path);
+    DEBUG_FREE(mem_page, p);
     free(p->path);
     free(p);
 }
@@ -307,10 +306,10 @@ update_contents(Cache cache, Page p) {
     long	size;
     struct stat	fattr;
     long	msize;
-    char	*msg;
     int		cnt;
     struct stat	fs;
-
+    Text	t;
+    
     for (; '.' != *suffix; suffix--) {
 	if (suffix <= p->path) {
 	    suffix = NULL;
@@ -370,21 +369,19 @@ update_contents(Cache cache, Page p) {
     // Format size plus space for the length, the mime type, and some
     // padding. Then add the content length.
     msize = sizeof(page_fmt) + 60 + size;
-    if (NULL == (msg = (char*)malloc(msize))) {
+    if (NULL == (t = text_allocate((int)msize))) {
 	return false;
     }
-    DEBUG_ALLOC(mem_page_msg)
-    cnt = sprintf(msg, page_fmt, mime, size);
-
+    cnt = sprintf(t->text, page_fmt, mime, size);
     msize = cnt + size;
-    if (size != (long)fread(msg + cnt, 1, size, f)) {
+    if (size != (long)fread(t->text + cnt, 1, size, f)) {
 	fclose(f);
-	DEBUG_FREE(mem_page_msg)
-	free(msg);
+	text_release(t);
 	return false;
     }
     fclose(f);
-    msg[msize] = '\0';
+    t->text[msize] = '\0';
+    t->len = msize;
     if (0 == stat(p->path, &fattr)) {
 	p->mtime = fattr.st_mtime;
     } else {
@@ -394,7 +391,7 @@ update_contents(Cache cache, Page p) {
 	text_release(p->resp);
 	p->resp = NULL;
     }
-    p->resp = text_create(msg, (int)msize);
+    p->resp = t;
     text_ref(p->resp);
     p->last_check = dtime();
 

data/ext/agoo/page.h

@@ -46,6 +46,8 @@ typedef struct _Cache {
 } *Cache;
 
 extern void	cache_init(Cache cache);
+extern void	cache_cleanup(Cache cache);
+
 extern void	page_destroy(Page p);
 extern Page	page_get(Err err, Cache cache, const char *dir, const char *path, int plen);
 extern void	mime_set(Cache cache, const char *key, const char *value);

data/ext/agoo/pub.c

@@ -0,0 +1,111 @@
+// Copyright (c) 2018, Peter Ohler, All rights reserved.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "debug.h"
+#include "pub.h"
+#include "text.h"
+
+Pub
+pub_close(uint64_t cid) {
+    Pub	p = (Pub)malloc(sizeof(struct _Pub));
+
+    if (NULL != p) {
+	DEBUG_ALLOC(mem_pub, p);
+	p->next = NULL;
+	p->kind = PUB_CLOSE;
+	p->cid = cid;
+	p->sid = 0;
+	p->subject = NULL;
+    }
+    return p;
+}
+
+Pub
+pub_subscribe(uint64_t cid, uint64_t sid, const char *subject) {
+    Pub	p = (Pub)malloc(sizeof(struct _Pub));
+
+    if (NULL != p) {
+	DEBUG_ALLOC(mem_pub, p);
+	p->next = NULL;
+	p->kind = PUB_SUB;
+	p->cid = cid;
+	p->sid = sid;
+	p->subject = strdup(subject);
+    }
+    return p;
+}
+
+Pub
+pub_unsubscribe(uint64_t cid, uint64_t sid) {
+    Pub	p = (Pub)malloc(sizeof(struct _Pub));
+
+    if (NULL != p) {
+	DEBUG_ALLOC(mem_pub, p);
+	p->next = NULL;
+	p->kind = PUB_UN;
+	p->cid = cid;
+	p->sid = sid;
+	p->subject = NULL;
+    }
+    return p;
+}
+
+Pub
+pub_publish(char *subject, const char *message, size_t mlen, bool bin) {
+    Pub	p = (Pub)malloc(sizeof(struct _Pub));
+
+    if (NULL != p) {
+	DEBUG_ALLOC(mem_pub, p);
+	p->next = NULL;
+	p->kind = PUB_MSG;
+	p->cid = 0;
+	p->subject = strdup(subject);
+	// Allocate an extra 24 bytes so the message can be expanded in place
+	// if a WebSocket or SSE write.
+	p->msg = text_allocate((int)mlen + 24);
+	p->msg = text_append(text_allocate((int)mlen + 16), message, (int)mlen);
+	text_ref(p->msg);
+    }
+    return p;
+}
+
+Pub
+pub_write(uint64_t cid, const char *message, size_t mlen, bool bin) {
+    // Allocate an extra 16 bytes so the message can be expanded in place if a
+    // WebSocket write.
+    Pub	p = (Pub)malloc(sizeof(struct _Pub));
+
+    if (NULL != p) {
+	DEBUG_ALLOC(mem_pub, p);
+	p->next = NULL;
+	p->kind = PUB_WRITE;
+	p->cid = cid;
+	p->subject = NULL;
+	// Allocate an extra 16 bytes so the message can be expanded in place
+	// if a WebSocket write.
+	p->msg = text_append(text_allocate((int)mlen + 16), message, (int)mlen);
+	p->msg->bin = bin;
+	text_ref(p->msg);
+    }
+    return p;
+}
+
+void
+pub_destroy(Pub pub) {
+    switch (pub->kind) {
+    case PUB_MSG:
+    case PUB_WRITE:
+	if (NULL != pub->msg) {
+	    text_release(pub->msg);
+	}
+	break;
+    default:
+	break;
+    }
+    DEBUG_FREE(mem_pub, pub);
+    free(pub);
+}
+

data/ext/agoo/pub.h

@@ -0,0 +1,40 @@
+// Copyright (c) 2018, Peter Ohler, All rights reserved.
+
+#ifndef __AGOO_PUB_H__
+#define __AGOO_PUB_H__
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct _Text;
+
+typedef enum {
+    PUB_SUB	= 'S',
+    PUB_CLOSE	= 'C',
+    PUB_UN	= 'U',
+    PUB_MSG	= 'M',
+    PUB_WRITE	= 'W',
+} PubKind;
+
+// Generated by extened handlers and placed on the pub_queue to be pulled off
+// in the con_loop.
+typedef struct _Pub {
+    struct _Pub		*next;
+    PubKind		kind;
+    uint64_t		cid;
+    char		*subject;
+    union {
+	uint64_t	sid;
+	struct _Text	*msg;
+    };
+} *Pub;
+
+extern Pub	pub_close(uint64_t cid);
+extern Pub	pub_subscribe(uint64_t cid, uint64_t sid, const char *subject);
+extern Pub	pub_unsubscribe(uint64_t cid, uint64_t sid);
+extern Pub	pub_publish(char *subject, const char *message, size_t mlen, bool bin);
+extern Pub	pub_write(uint64_t cid, const char *message, size_t mlen, bool bin);
+extern void	pub_destroy(Pub pub);
+
+#endif // __AGOO_PUB_H__

data/ext/agoo/queue.c

@@ -35,7 +35,7 @@ queue_multi_init(Queue q, size_t qsize, bool multi_push, bool multi_pop) {
 	qsize = 4;
     }
     q->q = (QItem*)malloc(sizeof(QItem) * qsize);
-    DEBUG_ALLOC(mem_qitem)
+    DEBUG_ALLOC(mem_qitem, q->q)
     q->end = q->q + qsize;
 
     memset(q->q, 0, sizeof(QItem) * qsize);
@@ -53,7 +53,7 @@ queue_multi_init(Queue q, size_t qsize, bool multi_push, bool multi_pop) {
 
 void
 queue_cleanup(Queue q) {
-    DEBUG_FREE(mem_qitem)
+    DEBUG_FREE(mem_qitem, q->q)
     free(q->q);
     q->q = NULL;
     q->end = NULL;

data/ext/agoo/rack_logger.c

@@ -9,33 +9,19 @@
 
 static VALUE	rl_class = Qundef;
 
-typedef struct _RackLogger {
-    Server	server;
-} *RackLogger;
-
-static void
-rack_logger_free(void *ptr) {
-    DEBUG_FREE(mem_rack_logger)
-    xfree(ptr);
-}
-
 VALUE
-rack_logger_new(Server server) {
-    RackLogger	rl = ALLOC(struct _RackLogger);
-
-    DEBUG_ALLOC(mem_rack_logger)
-    rl->server = server;
-    
-    //return Data_Wrap_Struct(rl_class, NULL, xfree, rl);
-    return Data_Wrap_Struct(rl_class, NULL, rack_logger_free, rl);
+rack_logger_new() {
+    return rb_class_new_instance(0, NULL, rl_class);
 }
 
 static void
-log_message(RackLogger rl, LogLevel level, VALUE message) {
+log_message(LogCat cat, VALUE message) {
     volatile VALUE	rs = rb_funcall(message, rb_intern("to_s"), 0);
     
     rb_check_type(rs, T_STRING);
-
+    if (!the_server.active) {
+	return;
+    }
     if (rb_block_given_p()) {
 	Text		text = text_create(StringValuePtr(rs), (int)RSTRING_LEN(rs));
 	volatile VALUE	x = rb_yield_values(0);
@@ -45,51 +31,13 @@ log_message(RackLogger rl, LogLevel level, VALUE message) {
 	    text = text_append(text, ": ", 2);
 	    text = text_append(text, StringValuePtr(rs), (int)RSTRING_LEN(rs));
 	}
-	switch (level) {
-	case FATAL:
-	    log_cat(&rl->server->error_cat, "%s", text->text);
-	    exit(0);
-	    break;
-	case ERROR:
-	    log_cat(&rl->server->error_cat, "%s", text->text);
-	    break;
-	case WARN:
-	    log_cat(&rl->server->warn_cat, "%s", text->text);
-	    break;
-	case INFO:
-	    log_cat(&rl->server->info_cat, "%s", text->text);
-	    break;
-	case DEBUG:
-	    log_cat(&rl->server->debug_cat, "%s", text->text);
-	    break;
-	default:
-	    break;
-	}
+	log_cat(cat, "%s", text->text);
 	text_release(text);
     } else {
-	switch (level) {
-	case FATAL:
-	    log_cat(&rl->server->error_cat, "%s", StringValuePtr(rs));
-	    exit(0);
-	    break;
-	case ERROR:
-	    log_cat(&rl->server->error_cat, "%s", StringValuePtr(rs));
-	    break;
-	case WARN:
-	    log_cat(&rl->server->warn_cat, "%s", StringValuePtr(rs));
-	    break;
-	case INFO:
-	    log_cat(&rl->server->info_cat, "%s", StringValuePtr(rs));
-	    break;
-	case DEBUG:
-	    log_cat(&rl->server->debug_cat, "%s", StringValuePtr(rs));
-	    break;
-	default:
-	    break;
-	}
+	log_cat(cat, "%s", StringValuePtr(rs));
     }
 }
-    
+
 /* Document-method: debug
  *
  * call-seq: debug(message, &block)
@@ -98,8 +46,7 @@ log_message(RackLogger rl, LogLevel level, VALUE message) {
  */
 static VALUE
 rl_debug(VALUE self, VALUE message) {
-    log_message((RackLogger)DATA_PTR(self), DEBUG, message);
-
+    log_message(&debug_cat, message);
     return Qnil;
 }
 
@@ -111,8 +58,7 @@ rl_debug(VALUE self, VALUE message) {
  */
 static VALUE
 rl_info(VALUE self, VALUE message) {
-    log_message((RackLogger)DATA_PTR(self), INFO, message);
-
+    log_message(&info_cat, message);
     return Qnil;
 }
 
@@ -124,8 +70,7 @@ rl_info(VALUE self, VALUE message) {
  */
 static VALUE
 rl_warn(VALUE self, VALUE message) {
-    log_message((RackLogger)DATA_PTR(self), WARN, message);
-
+    log_message(&warn_cat, message);
     return Qnil;
 }
 
@@ -137,8 +82,7 @@ rl_warn(VALUE self, VALUE message) {
  */
 static VALUE
 rl_error(VALUE self, VALUE message) {
-    log_message((RackLogger)DATA_PTR(self), ERROR, message);
-
+    log_message(&error_cat, message);
     return Qnil;
 }
 
@@ -150,8 +94,8 @@ rl_error(VALUE self, VALUE message) {
  */
 static VALUE
 rl_fatal(VALUE self, VALUE message) {
-    log_message((RackLogger)DATA_PTR(self), FATAL, message);
-
+    log_message(&fatal_cat, message);
+    exit(0);
     return Qnil;
 }