agoo 2.5.5 → 2.5.6

data/ext/agoo/rserver.h

@@ -7,13 +7,13 @@
 
 #define MAX_WORKERS	32
 
-typedef struct _RServer {
+typedef struct _rServer {
     int		worker_cnt;
     int		worker_pids[MAX_WORKERS];
     VALUE	*eval_threads; // Qnil terminated
 } *RServer;
 
-extern struct _RServer	the_rserver;
+extern struct _rServer	the_rserver;
 
 extern void	server_init(VALUE mod);
 extern VALUE	rserver_shutdown(VALUE self);

data/ext/agoo/rupgraded.c

@@ -22,16 +22,16 @@ static VALUE	websocket_sym;
 static ID	on_open_id = 0;
 static ID	to_s_id = 0;
 
-static Upgraded
+static agooUpgraded
 get_upgraded(VALUE self) {
-    Upgraded	up = NULL;
+    agooUpgraded	up = NULL;
 
-    if (the_server.active) {
-	pthread_mutex_lock(&the_server.up_lock);
+    if (agoo_server.active) {
+	pthread_mutex_lock(&agoo_server.up_lock);
 	if (NULL != (up = DATA_PTR(self))) {
 	    atomic_fetch_add(&up->ref_cnt, 1);
 	}
-	pthread_mutex_unlock(&the_server.up_lock);
+	pthread_mutex_unlock(&agoo_server.up_lock);
     }
     return up;
 }
@@ -68,10 +68,10 @@ extract_subject(VALUE subject, int *slen) {
  */
 static VALUE
 rup_write(VALUE self, VALUE msg) {
-    Upgraded	up = get_upgraded(self);
-    const char	*message;
-    size_t	mlen;
-    bool	bin = false;
+    agooUpgraded	up = get_upgraded(self);
+    const char		*message;
+    size_t		mlen;
+    bool		bin = false;
 
     if (NULL == up) {
 	return Qfalse;
@@ -88,7 +88,7 @@ rup_write(VALUE self, VALUE msg) {
 	message = StringValuePtr(rs);
 	mlen = RSTRING_LEN(rs);
     }
-    return upgraded_write(up, message, mlen, bin, false) ? Qtrue : Qfalse;
+    return agoo_upgraded_write(up, message, mlen, bin, false) ? Qtrue : Qfalse;
 }
 
 /* Document-method: subscribe
@@ -104,12 +104,12 @@ rup_write(VALUE self, VALUE msg) {
  */
 static VALUE
 rup_subscribe(VALUE self, VALUE subject) {
-    Upgraded	up;
-    int		slen;
-    const char	*subj = extract_subject(subject, &slen);
+    agooUpgraded	up;
+    int			slen;
+    const char		*subj = extract_subject(subject, &slen);
 
     if (NULL != (up = get_upgraded(self))) {
-	upgraded_subscribe(up, subj, slen, false);
+	agoo_upgraded_subscribe(up, subj, slen, false);
     }
     return Qnil;
 }
@@ -125,15 +125,15 @@ rup_subscribe(VALUE self, VALUE subject) {
  */
 static VALUE
 rup_unsubscribe(int argc, VALUE *argv, VALUE self) {
-    Upgraded	up;
-    const char	*subject = NULL;
-    int		slen = 0;
+    agooUpgraded	up;
+    const char		*subject = NULL;
+    int			slen = 0;
 
     if (0 < argc) {
 	subject = extract_subject(argv[0], &slen);
     }
     if (NULL != (up = get_upgraded(self))) {
-	upgraded_unsubscribe(up, subject, slen, false);
+	agoo_upgraded_unsubscribe(up, subject, slen, false);
     }
     return Qnil;
 }
@@ -146,10 +146,10 @@ rup_unsubscribe(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 rup_close(VALUE self) {
-    Upgraded	up = get_upgraded(self);
+    agooUpgraded	up = get_upgraded(self);
 
     if (NULL != up) {
-	upgraded_close(up, false);
+	agoo_upgraded_close(up, false);
     }
     return Qnil;
 }
@@ -163,11 +163,11 @@ rup_close(VALUE self) {
  */
 static VALUE
 rup_pending(VALUE self) {
-    Upgraded	up = get_upgraded(self);
-    int		pending = -1;
+    agooUpgraded	up = get_upgraded(self);
+    int			pending = -1;
     
     if (NULL != up) {
-	pending = upgraded_pending(up);
+	pending = agoo_upgraded_pending(up);
 	atomic_fetch_sub(&up->ref_cnt, 1);
     }
     return INT2NUM(pending);
@@ -181,11 +181,11 @@ rup_pending(VALUE self) {
  */
 static VALUE
 rup_open(VALUE self) {
-    Upgraded	up = get_upgraded(self);
-    int		pending = -1;
+    agooUpgraded	up = get_upgraded(self);
+    int			pending = -1;
     
     if (NULL != up) {
-	pending = atomic_load(&up->pending);
+	pending = (int)(long)atomic_load(&up->pending);
 	atomic_fetch_sub(&up->ref_cnt, 1);
     }
     return 0 <= pending ? Qtrue : Qfalse;
@@ -202,43 +202,43 @@ static VALUE
 rup_protocol(VALUE self) {
     VALUE	pro = Qnil;
 
-    if (the_server.active) {
-	Upgraded	up;
+    if (agoo_server.active) {
+	agooUpgraded	up;
 	
-	pthread_mutex_lock(&the_server.up_lock);
+	pthread_mutex_lock(&agoo_server.up_lock);
 	if (NULL != (up = DATA_PTR(self)) && NULL != up->con) {
 	    switch (up->con->bind->kind) {
-	    case CON_WS:
+	    case AGOO_CON_WS:
 		pro = websocket_sym;
 		break;
-	    case CON_SSE:
+	    case AGOO_CON_SSE:
 		pro = sse_sym;
 		break;
 	    default:
 		break;
 	    }
 	}
-	pthread_mutex_unlock(&the_server.up_lock);
+	pthread_mutex_unlock(&agoo_server.up_lock);
     }
     return pro;
 }
 
 static void
-on_destroy(Upgraded up) {
+on_destroy(agooUpgraded up) {
     if (Qnil != (VALUE)up->wrap) {
 	DATA_PTR((VALUE)up->wrap) = NULL;
 	up->wrap = (void*)Qnil;
     }
 }
 
-Upgraded
-rupgraded_create(Con c, VALUE obj, VALUE env) {
-    Upgraded	up;
+agooUpgraded
+rupgraded_create(agooCon c, VALUE obj, VALUE env) {
+    agooUpgraded	up;
 
-    if (!the_server.active) {
+    if (!agoo_server.active) {
 	rb_raise(rb_eIOError, "Server shutdown.");
     }
-    if (NULL != (up = upgraded_create(c, (void*)obj, (void*)env))) {
+    if (NULL != (up = agoo_upgraded_create(c, (void*)obj, (void*)env))) {
 	up->on_empty = rb_respond_to(obj, rb_intern("on_drained"));
 	up->on_close = rb_respond_to(obj, rb_intern("on_close"));
 	up->on_shut = rb_respond_to(obj, rb_intern("on_shutdown"));
@@ -248,7 +248,7 @@ rupgraded_create(Con c, VALUE obj, VALUE env) {
 
 	up->wrap = (void*)Data_Wrap_Struct(upgraded_class, NULL, NULL, up);
 
-	server_add_upgraded(up);
+	agoo_server_add_upgraded(up);
 	
 	if (rb_respond_to(obj, on_open_id)) {
 	    rb_funcall(obj, on_open_id, 1, (VALUE)up->wrap);
@@ -265,11 +265,11 @@ extern VALUE	ragoo_publish(VALUE self, VALUE subject, VALUE message);
  * call-seq: env()
  *
  * Returns the environment passed to the call method that initiated the
- * Upgraded Object creation.
+ * agooUpgraded Object creation.
  */
 static VALUE
 env(VALUE self) {
-    Upgraded	up = get_upgraded(self);
+    agooUpgraded	up = get_upgraded(self);
 
     if (NULL != up) {
 	return (VALUE)up->env;

data/ext/agoo/rupgraded.h

@@ -7,10 +7,10 @@
 
 #include "upgraded.h"
 
-struct _Con;
+struct _agooCon;
 
-extern void	upgraded_init(VALUE mod);
-extern Upgraded	rupgraded_create(struct _Con *c, VALUE obj, VALUE env);
+extern void		upgraded_init(VALUE mod);
+extern agooUpgraded	rupgraded_create(struct _agooCon *c, VALUE obj, VALUE env);
 
 extern const char*	extract_subject(VALUE subject, int *slen);
 

data/ext/agoo/sdl.c

@@ -9,56 +9,56 @@
 #include "sdl.h"
 
 static int
-extract_name(Err err, Doc doc, const char *key, int klen, char *name, size_t max) {
+extract_name(agooErr err, agooDoc doc, const char *key, int klen, char *name, size_t max) {
     const char	*start;
     size_t	nlen;
 
     if (0 != strncmp(doc->cur, key, klen)) {
-	return doc_err(doc, err, "Expected %s key word", key);
+	return agoo_doc_err(doc, err, "Expected %s key word", key);
     }
     doc->cur += klen;
-    if (0 == doc_skip_white(doc)) {
-	return doc_err(doc, err, "Expected %s key word", key);
+    if (0 == agoo_doc_skip_white(doc)) {
+	return agoo_doc_err(doc, err, "Expected %s key word", key);
     }
     start = doc->cur;
-    doc_read_token(doc);
+    agoo_doc_read_token(doc);
     if (doc->cur == start) {
-	return doc_err(doc, err, "Name not provided");
+	return agoo_doc_err(doc, err, "Name not provided");
     }
     nlen = doc->cur - start;
     if (max <= nlen) {
-	return doc_err(doc, err, "Name too long");
+	return agoo_doc_err(doc, err, "Name too long");
     }
     strncpy(name, start, nlen);
     name[nlen] = '\0';
     
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static int
-make_scalar(Err err, Doc doc, const char *desc, int len) {
+make_scalar(agooErr err, agooDoc doc, const char *desc, int len) {
     char	name[256];
 
-    if (ERR_OK != extract_name(err, doc, "scalar", 6, name, sizeof(name))) {
+    if (AGOO_ERR_OK != extract_name(err, doc, "scalar", 6, name, sizeof(name))) {
 	return err->code;
     }
     gql_scalar_create(err, name, desc, len, false);
     
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static int
-make_enum(Err err, Doc doc, const char *desc, int len) {
+make_enum(agooErr err, agooDoc doc, const char *desc, int len) {
     char	name[256];
     const char	*start;
     gqlType	type;
     
-    if (ERR_OK != extract_name(err, doc, "enum", 4, name, sizeof(name))) {
+    if (AGOO_ERR_OK != extract_name(err, doc, "enum", 4, name, sizeof(name))) {
 	return err->code;
     }
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     if ('{' != *doc->cur) {
-	return doc_err(doc, err, "Expected '{'");
+	return agoo_doc_err(doc, err, "Expected '{'");
     }
     doc->cur++;
 
@@ -66,60 +66,60 @@ make_enum(Err err, Doc doc, const char *desc, int len) {
 	return err->code;
     }
     while (doc->cur < doc->end) {
-	doc_skip_white(doc);
+	agoo_doc_skip_white(doc);
 	start = doc->cur;
-	doc_read_token(doc);
+	agoo_doc_read_token(doc);
 	if (doc->cur == start) {
 	    if ('}' == *doc->cur) {
 		doc->cur++;
 		break;
 	    }
-	    return doc_err(doc, err, "Invalid Enum value");
+	    return agoo_doc_err(doc, err, "Invalid Enum value");
 	}
-	if (ERR_OK != gql_enum_add(err, type, start, (int)(doc->cur - start))) {
+	if (AGOO_ERR_OK != gql_enum_add(err, type, start, (int)(doc->cur - start))) {
 	    return err->code;
 	}
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static int
-make_union(Err err, Doc doc, const char *desc, int len) {
+make_union(agooErr err, agooDoc doc, const char *desc, int len) {
     char	name[256];
     const char	*start;
     gqlType	type;
     
-    if (ERR_OK != extract_name(err, doc, "union", 5, name, sizeof(name))) {
+    if (AGOO_ERR_OK != extract_name(err, doc, "union", 5, name, sizeof(name))) {
 	return err->code;
     }
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     if ('=' != *doc->cur) {
-	return doc_err(doc, err, "Expected '='");
+	return agoo_doc_err(doc, err, "Expected '='");
     }
     doc->cur++;
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
 
     if (NULL == (type = gql_union_create(err, name, desc, len, false))) {
 	return err->code;
     }
     while (doc->cur < doc->end) {
-	doc_skip_white(doc);
+	agoo_doc_skip_white(doc);
 	start = doc->cur;
-	doc_read_token(doc);
-	if (ERR_OK != gql_union_add(err, type, start, (int)(doc->cur - start))) {
+	agoo_doc_read_token(doc);
+	if (AGOO_ERR_OK != gql_union_add(err, type, start, (int)(doc->cur - start))) {
 	    return err->code;
 	}
-	doc_skip_white(doc);
+	agoo_doc_skip_white(doc);
 	if ('|' != *doc->cur) {
 	    break;
 	}
 	doc->cur++; // skip |
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static int
-make_arg(Err err, Doc doc, gqlDir dir) {
+make_arg(agooErr err, agooDoc doc, gqlDir dir) {
     char	name[256];
     char	type_name[256];
     const char	*start;
@@ -129,10 +129,10 @@ make_arg(Err err, Doc doc, gqlDir dir) {
     bool	required = false;
     gqlValue	dv = NULL;
     
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     if ('"' == *doc->cur) {
 	desc = doc->cur + 1;
-	if (ERR_OK != doc_read_string(err, doc)) {
+	if (AGOO_ERR_OK != agoo_doc_read_string(err, doc)) {
 	    return err->code;
 	}
 	if ('"' == *desc) { // must be a """
@@ -142,81 +142,81 @@ make_arg(Err err, Doc doc, gqlDir dir) {
 	    desc_end = doc->cur - 1;
 	}
     }
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     start = doc->cur;
-    doc_read_token(doc);
+    agoo_doc_read_token(doc);
     if (doc->cur == start) {
-	return doc_err(doc, err, "Argument name not provided");
+	return agoo_doc_err(doc, err, "Argument name not provided");
     }
     if (':' != *doc->cur) {
-	return doc_err(doc, err, "Expected ':'");
+	return agoo_doc_err(doc, err, "Expected ':'");
     }
     nlen = doc->cur - start;
     if (sizeof(name) <= nlen) {
-	return doc_err(doc, err, "Name too long");
+	return agoo_doc_err(doc, err, "Name too long");
     }
     strncpy(name, start, nlen);
     name[nlen] = '\0';
     doc->cur++;
 
     // read type
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     start = doc->cur;
-    doc_read_token(doc);
+    agoo_doc_read_token(doc);
     if (doc->cur == start) {
-	return doc_err(doc, err, "Argument type not provided");
+	return agoo_doc_err(doc, err, "Argument type not provided");
     }
     nlen = doc->cur - start;
     if (sizeof(type_name) <= nlen) {
-	return doc_err(doc, err, "Type name too long");
+	return agoo_doc_err(doc, err, "Type name too long");
     }
     strncpy(type_name, start, nlen);
     type_name[nlen] = '\0';
 
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     if ('!' == *doc->cur) {
 	required = true;
     } else if ('=' == *doc->cur) {
-	if (NULL == (dv = doc_read_value(err, doc))) {
+	if (NULL == (dv = agoo_doc_read_value(err, doc))) {
 	    return err->code;
 	}
     }
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     if ('@' == *doc->cur) {
 	// TBD directive
     }
     if (NULL == gql_dir_arg(err, dir, name, type_name, desc, (int)(desc_end - desc), dv, required)) {
 	return err->code;
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 static int
-make_directive(Err err, Doc doc, const char *desc, int len) {
+make_directive(agooErr err, agooDoc doc, const char *desc, int len) {
     char	name[256];
     const char	*start;
     gqlDir	dir;
     size_t	nlen;
 
     if (0 != strncmp(doc->cur, "directive", 9)) {
-	return doc_err(doc, err, "Expected directive key word");
+	return agoo_doc_err(doc, err, "Expected directive key word");
     }
     doc->cur += 9;
-    if (0 == doc_skip_white(doc)) {
-	return doc_err(doc, err, "Expected directive key word");
+    if (0 == agoo_doc_skip_white(doc)) {
+	return agoo_doc_err(doc, err, "Expected directive key word");
     }
     if ('@' != *doc->cur) {
-	return doc_err(doc, err, "Expected '@'");
+	return agoo_doc_err(doc, err, "Expected '@'");
     }
     doc->cur++;
     start = doc->cur;
-    doc_read_token(doc);
+    agoo_doc_read_token(doc);
     if (doc->cur == start) {
-	return doc_err(doc, err, "Name not provided");
+	return agoo_doc_err(doc, err, "Name not provided");
     }
     nlen = doc->cur - start;
     if (sizeof(name) <= nlen) {
-	return doc_err(doc, err, "Name too long");
+	return agoo_doc_err(doc, err, "Name too long");
     }
     strncpy(name, start, nlen);
     name[nlen] = '\0';
@@ -225,53 +225,53 @@ make_directive(Err err, Doc doc, const char *desc, int len) {
     }
     if ('(' == *doc->cur) {
 	while (doc->cur < doc->end) {
-	    if (ERR_OK != make_arg(err, doc, dir)) {
+	    if (AGOO_ERR_OK != make_arg(err, doc, dir)) {
 		return err->code;
 	    }
-	    doc_skip_white(doc);
+	    agoo_doc_skip_white(doc);
 	    if (')' == *doc->cur) {
 		doc->cur++;
 		break;
 	    }
 	}
     }
-    doc_skip_white(doc);
+    agoo_doc_skip_white(doc);
     start = doc->cur;
-    doc_read_token(doc);
+    agoo_doc_read_token(doc);
 
     if (2 != doc->cur - start || 0 != strncmp(start, "on", 2)) {
-	return doc_err(doc, err, "Expected 'on'");
+	return agoo_doc_err(doc, err, "Expected 'on'");
     }
     while (doc->cur < doc->end) {
-	doc_skip_white(doc);
+	agoo_doc_skip_white(doc);
 	start = doc->cur;
-	doc_read_token(doc);
-	if (ERR_OK != gql_directive_on(err, dir, start, (int)(doc->cur - start))) {
+	agoo_doc_read_token(doc);
+	if (AGOO_ERR_OK != gql_directive_on(err, dir, start, (int)(doc->cur - start))) {
 	    return err->code;
 	}
-	doc_skip_white(doc);
+	agoo_doc_skip_white(doc);
 	if ('|' != *doc->cur) {
 	    break;
 	}
 	doc->cur++; // skip |
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }
 
 int
-sdl_parse(Err err, const char *str, int len) {
-    struct _Doc	doc;
-    const char	*desc = NULL;
-    const char	*desc_end = NULL;
+sdl_parse(agooErr err, const char *str, int len) {
+    struct _agooDoc	doc;
+    const char		*desc = NULL;
+    const char		*desc_end = NULL;
     
-    doc_init(&doc, str, len);
+    agoo_doc_init(&doc, str, len);
 
     while (doc.cur < doc.end) {
-	doc_next_token(&doc);
+	agoo_doc_next_token(&doc);
 	switch (*doc.cur) {
 	case '"':
 	    desc = doc.cur + 1;
-	    if (ERR_OK != doc_read_string(err, &doc)) {
+	    if (AGOO_ERR_OK != agoo_doc_read_string(err, &doc)) {
 		return err->code;
 	    }
 	    if ('"' == *desc) { // must be a """
@@ -282,14 +282,14 @@ sdl_parse(Err err, const char *str, int len) {
 	    }
 	    break;
 	case 's': // scalar
-	    if (ERR_OK != make_scalar(err, &doc, desc, (int)(desc_end - desc))) {
+	    if (AGOO_ERR_OK != make_scalar(err, &doc, desc, (int)(desc_end - desc))) {
 		return err->code;
 	    }
 	    break;
 	case 'e': // enum, and extend interface or type
 	    if (4 < (doc.end - doc.cur)) {
 		if ('n' == doc.cur[1]) {
-		    if (ERR_OK != make_enum(err, &doc, desc, (int)(desc_end - desc))) {
+		    if (AGOO_ERR_OK != make_enum(err, &doc, desc, (int)(desc_end - desc))) {
 			return err->code;
 		    }
 		    break;
@@ -298,14 +298,14 @@ sdl_parse(Err err, const char *str, int len) {
 		    break;
 		}
 	    }
-	    return doc_err(&doc, err, "Unknown directive");
+	    return agoo_doc_err(&doc, err, "Unknown directive");
 	case 'u': // union
-	    if (ERR_OK != make_union(err, &doc, desc, (int)(desc_end - desc))) {
+	    if (AGOO_ERR_OK != make_union(err, &doc, desc, (int)(desc_end - desc))) {
 		return err->code;
 	    }
 	    break;
 	case 'd': // directive
-	    if (ERR_OK != make_directive(err, &doc, desc, (int)(desc_end - desc))) {
+	    if (AGOO_ERR_OK != make_directive(err, &doc, desc, (int)(desc_end - desc))) {
 		return err->code;
 	    }
 	    break;
@@ -321,14 +321,14 @@ sdl_parse(Err err, const char *str, int len) {
 		    break;
 		}
 	    }
-	    return doc_err(&doc, err, "Unknown directive");
+	    return agoo_doc_err(&doc, err, "Unknown directive");
 	case 'f': // fragment
 	    break;
 	case '\0':
-	    return ERR_OK;
+	    return AGOO_ERR_OK;
 	default:
-	    return doc_err(&doc, err, "Unknown directive");
+	    return agoo_doc_err(&doc, err, "Unknown directive");
 	}
     }
-    return ERR_OK;
+    return AGOO_ERR_OK;
 }