agoo 2.0.5 → 2.1.0

data/ext/agoo/upgraded.h

@@ -7,7 +7,33 @@
 
 #include <ruby.h>
 
+struct _Con;
+struct _Subject;
+
+typedef struct _Upgraded {
+    struct _Upgraded	*next;
+    struct _Upgraded	*prev;
+    struct _Con		*con;
+    VALUE		handler;
+    VALUE		wrap;
+    atomic_int		pending;
+    atomic_int		ref_cnt;
+    struct _Subject	*subjects;
+    bool		on_empty;
+    bool		on_close;
+    bool		on_shut;
+    bool		on_msg;
+} *Upgraded;
+
 extern void	upgraded_init(VALUE mod);
-extern void	upgraded_extend(uint64_t cid, VALUE obj);
+extern Upgraded	upgraded_create(struct _Con *c, VALUE obj);
+extern void	upgraded_release(Upgraded up);
+extern void	upgraded_release_con(Upgraded up);
+
+extern void	upgraded_ref(Upgraded up);
+
+extern void	upgraded_add_subject(Upgraded up, struct _Subject *subject);
+extern void	upgraded_del_subject(Upgraded up, struct _Subject *subject);
+extern bool	upgraded_match(Upgraded up, const char *subject);
 
 #endif // __AGOO_UPGRADED_H__

data/ext/agoo/websocket.c

@@ -167,7 +167,7 @@ ws_create_req(Con c, long mlen) {
 	log_cat(&error_cat, "Out of memory attempting to allocate request.");
 	return true;
     }
-    if (NULL == c->slot || Qnil == c->slot->handler) {
+    if (NULL == c->up || Qnil == c->up->handler) {
 	return true;
     }
     memset(c->req, 0, sizeof(struct _Req));
@@ -183,11 +183,11 @@ ws_create_req(Con c, long mlen) {
     c->req->mlen = mlen;
     c->req->method = (WS_OP_BIN == op) ? ON_BIN : ON_MSG;
     c->req->upgrade = UP_NONE;
-    c->req->cid = c->id;
+    c->req->up = c->up;
     c->req->res = NULL;
     c->req->handler_type = PUSH_HOOK;
-    if (c->slot->on_msg) {
-	c->req->handler = c->slot->handler;
+    if (c->up->on_msg) {
+	c->req->handler = c->up->handler;
     } else {
 	c->req->handler = Qnil;
     }
@@ -196,13 +196,14 @@ ws_create_req(Con c, long mlen) {
 
 void
 ws_req_close(Con c) {
-    if (NULL != c->slot && Qnil != c->slot->handler && c->slot->on_close) {
+    if (NULL != c->up && Qnil != c->up->handler && c->up->on_close) {
 	Req	req = request_create(0);
 	    
-	req->cid = c->id;
+	req->up = c->up;
 	req->method = ON_CLOSE;
 	req->handler_type = PUSH_HOOK;
-	req->handler = c->slot->handler;
+	req->handler = c->up->handler;
+	atomic_fetch_add(&c->up->ref_cnt, 1);
 	queue_push(&the_server.eval_queue, (void*)req);
     }
 }
@@ -211,7 +212,7 @@ void
 ws_ping(Con c) {
     Res	res;
     
-    if (NULL == (res = res_create())) {
+    if (NULL == (res = res_create(c))) {
 	log_cat(&error_cat, "Memory allocation of response failed on connection %llu.", c->id);
     } else {
 	DEBUG_ALLOC(mem_res, res)
@@ -231,7 +232,7 @@ void
 ws_pong(Con c) {
     Res	res;
     
-    if (NULL == (res = res_create())) {
+    if (NULL == (res = res_create(c))) {
 	log_cat(&error_cat, "Memory allocation of response failed on connection %llu.", c->id);
     } else {
 	DEBUG_ALLOC(mem_res, res)

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.0.5'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -48,8 +48,6 @@ files:
 - ext/agoo/agoo.c
 - ext/agoo/base64.c
 - ext/agoo/base64.h
-- ext/agoo/ccache.c
-- ext/agoo/ccache.h
 - ext/agoo/con.c
 - ext/agoo/con.h
 - ext/agoo/debug.c
@@ -90,8 +88,8 @@ files:
 - ext/agoo/sse.h
 - ext/agoo/sub.c
 - ext/agoo/sub.h
-- ext/agoo/subscription.c
-- ext/agoo/subscription.h
+- ext/agoo/subject.c
+- ext/agoo/subject.h
 - ext/agoo/text.c
 - ext/agoo/text.h
 - ext/agoo/types.h

data/ext/agoo/ccache.c

@@ -1,301 +0,0 @@
-// Copyright (c) 2018, Peter Ohler, All rights reserved.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include "ccache.h"
-#include "con.h"
-#include "debug.h"
-
-static void
-cc_mark(void *ptr) {
-    if (NULL != ptr) {
-	CCache	cc = (CCache)ptr;
-	CSlot	slot;
-	CSlot	*bp = cc->buckets;
-	CSlot	*end = bp + CC_BUCKET_SIZE;
-
-	if (Qnil != cc->wrap) {
-	    rb_gc_mark(cc->wrap);
-	}
-	pthread_mutex_lock(&cc->lock);
-	for (bp = cc->buckets; bp < end; bp++) {
-	    for (slot = *bp; NULL != slot; slot = slot->next) {
-		if (Qnil != slot->handler) {
-		    rb_gc_mark(slot->handler);
-		}
-	    }
-	}
-	pthread_mutex_unlock(&cc->lock);
-    }
-}
-
-
-void
-cc_init(CCache cc) {
-    memset(cc, 0, sizeof(struct _CCache));
-    pthread_mutex_init(&cc->lock, 0);
-    cc->wrap = Data_Wrap_Struct(rb_cObject, cc_mark, NULL, cc);
-}
-
-void
-cc_cleanup(CCache cc) {
-    CSlot	*sp = cc->buckets;
-    CSlot	s;
-    CSlot	n;
-    int		i;
-    
-    for (i = CC_BUCKET_SIZE; 0 < i; i--, sp++) {
-	for (s = *sp; NULL != s; s = n) {
-	    n = s->next;
-	    DEBUG_FREE(mem_cslot, s);
-	    free(s);
-	}
-	*sp = NULL;
-    }
-}
-
-CSlot
-cc_set_con(CCache cc, Con con) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & con->id);
-    CSlot	slot;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (con->id == slot->cid) {
-	    slot->con = con;
-	    break;
-	}
-    }
-    if (NULL == slot) {
-	if (NULL != (slot = (CSlot)malloc(sizeof(struct _CSlot)))) {
-	    DEBUG_ALLOC(mem_cslot, slot);
-	    slot->cid = con->id;
-	    slot->con = con;
-	    slot->handler = Qnil;
-	    slot->on_empty = false;
-	    slot->on_close = false;
-	    slot->on_shut = false;
-	    slot->on_msg = false;
-	    atomic_init(&slot->pending, 0);
-	    atomic_init(&slot->ref_cnt, 1);
-	    slot->next = *bucket;
-	    *bucket = slot;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-
-    return slot;
-}
-
-void
-cc_set_handler(CCache cc, uint64_t cid, VALUE handler, bool on_empty, bool on_close, bool on_shut, bool on_msg) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    slot->handler = handler;
-	    break;
-	}
-    }
-    if (NULL == slot) {
-	// TBD is is faster to lock twice or allocate while locked?
-	if (NULL != (slot = (CSlot)malloc(sizeof(struct _CSlot)))) {
-	    DEBUG_ALLOC(mem_cslot, slot);
-	    slot->cid = cid;
-	    slot->con = NULL;
-	    slot->handler = handler;
-	    slot->on_empty = on_empty;
-	    slot->on_close = on_close;
-	    slot->on_shut = on_shut;
-	    slot->on_msg = on_msg;
-	    atomic_init(&slot->pending, 0);
-	    atomic_init(&slot->ref_cnt, 1);
-	    slot->next = *bucket;
-	    slot->on_empty = on_empty;
-	    slot->on_close = on_close;
-	    slot->on_shut = on_shut;
-	    slot->on_msg = on_msg;
-	    *bucket = slot;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-}
-
-void
-cc_remove(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    CSlot	prev = NULL;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    if (NULL == prev) {
-		*bucket = slot->next;
-	    } else {
-		prev->next = slot->next;
-	    }
-	    break;
-	}
-	prev = slot;
-    }
-    pthread_mutex_unlock(&cc->lock);
-    if (NULL != slot) {
-	DEBUG_FREE(mem_cslot, slot)
-	free(slot);
-    }
-}
-
-void
-cc_remove_con(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    CSlot	prev = NULL;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    if (atomic_fetch_sub(&slot->ref_cnt, 1) <= 1) {
-		if (NULL == prev) {
-		    *bucket = slot->next;
-		} else {
-		    prev->next = slot->next;
-		}
-	    } else {
-		atomic_store(&slot->pending, -1);
-		slot = NULL;
-	    }
-	    break;
-	}
-	prev = slot;
-    }
-    pthread_mutex_unlock(&cc->lock);
-    if (NULL != slot) {
-	DEBUG_FREE(mem_cslot, slot)
-	free(slot);
-    }
-}
-
-VALUE
-cc_ref_dec(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    VALUE	handler = Qnil;
-    CSlot	prev = NULL;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    int	rcnt = atomic_fetch_sub(&slot->ref_cnt, 1);
-
-	    handler = slot->handler;
-	    if (rcnt <= 1) {
-		if (NULL == prev) {
-		    *bucket = slot->next;
-		} else {
-		    prev->next = slot->next;
-		}
-	    } else {
-		slot = NULL;
-	    }
-	    break;
-	}
-	prev = slot;
-    }
-    pthread_mutex_unlock(&cc->lock);
-    if (NULL != slot) {
-	DEBUG_FREE(mem_cslot, slot)
-	free(slot);
-    }
-    return handler;
-}
-
-Con
-cc_get_con(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    Con		con = NULL;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    con = slot->con;
-	    break;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-
-    return con;
-}
-
-VALUE
-cc_get_handler(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    VALUE	handler = Qnil;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    handler = slot->handler;
-	    break;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-
-    return handler;
-}
-
-int
-cc_get_pending(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-    int		pending = -1;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    pending = atomic_load(&slot->pending);
-	    break;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-
-    return pending;
-}
-
-CSlot
-cc_get_slot(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    break;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-
-    return slot;
-}
-
-void
-cc_pending_inc(CCache cc, uint64_t cid) {
-    CSlot	*bucket = cc->buckets + (CC_BUCKET_MASK & cid);
-    CSlot	slot;
-
-    pthread_mutex_lock(&cc->lock);
-    for (slot = *bucket; NULL != slot; slot = slot->next) {
-	if (cid == slot->cid) {
-	    atomic_fetch_add(&slot->pending, 1);
-	    break;
-	}
-    }
-    pthread_mutex_unlock(&cc->lock);
-}

data/ext/agoo/ccache.h

@@ -1,53 +0,0 @@
-// Copyright (c) 2018, Peter Ohler, All rights reserved.
-
-#ifndef __AGOO_CCACHE_H__
-#define __AGOO_CCACHE_H__
-
-#include <pthread.h>
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <ruby.h>
-
-#define CC_BUCKET_SIZE	1024
-#define CC_BUCKET_MASK	1023
-
-struct _Con;
-
-typedef struct _CSlot {
-    struct _CSlot	*next;
-    uint64_t		cid;
-    struct _Con		*con;
-    VALUE		handler;
-    atomic_int		pending;
-    atomic_int		ref_cnt;
-    bool		on_empty;
-    bool		on_close;
-    bool		on_shut;
-    bool		on_msg;
-} *CSlot;
-
-typedef struct _CCache {
-    CSlot		buckets[CC_BUCKET_SIZE];
-    pthread_mutex_t	lock;
-    VALUE		wrap;
-} *CCache;
-
-extern void		cc_init(CCache cc);
-extern void		cc_cleanup(CCache cc);
-extern CSlot		cc_set_con(CCache cc, struct _Con *con);
-extern void		cc_set_handler(CCache cc, uint64_t cid, VALUE handler, bool on_empty, bool on_close, bool on_shut, bool on_msg);
-extern void		cc_remove(CCache cc, uint64_t cid);
-
-extern void		cc_remove_con(CCache cc, uint64_t cid);
-extern VALUE		cc_ref_dec(CCache cc, uint64_t cid);
-
-extern struct _Con*	cc_get_con(CCache cc, uint64_t cid);
-extern VALUE		cc_get_handler(CCache cc, uint64_t cid);
-extern int		cc_get_pending(CCache cc, uint64_t cid);
-extern CSlot		cc_get_slot(CCache cc, uint64_t cid);
-
-extern void		cc_pending_inc(CCache cc, uint64_t cid);
-
-#endif /* __AGOO_CCACHE_H__ */