lwes 0.2.3 → 0.3.0

data/ChangeLog

@@ -1,3 +1,10 @@
+Version 0.3.0 (erik-s-chang)
+  * attempt memory allocation failure handling by invoking Ruby GC
+  * corner-case fixes for copying TypeDB and Emitter objects
+  * for folks without LWES libraries separately installed:
+    - backport ESF error handling fix (r344)
+    - backport empty events in ESFs fix (inherited fields only) (r307)
+
 Version 0.2.3 (erik-s-chang)
   * hopefully fix installation/build problems under OSX
 

data/ext/lwes/emitter.c

@@ -7,6 +7,12 @@ static ID id_new;
 /* the underlying struct for LWES::Emitter */
 struct _rb_lwes_emitter {
 	struct lwes_emitter *emitter;
+	LWES_CONST_SHORT_STRING address;
+	LWES_CONST_SHORT_STRING iface;
+	LWES_U_INT_32 port;
+	LWES_BOOLEAN emit_heartbeat;
+	LWES_INT_16 freq;
+	LWES_U_INT_32 ttl;
 };
 
 /* gets the _rb_lwes_emitter struct pointer from self */
@@ -26,7 +32,26 @@ static void rle_free(void *ptr)
 
 	if (rle->emitter)
 		lwes_emitter_destroy(rle->emitter);
-	rle->emitter = NULL;
+	xfree(ptr);
+}
+
+static struct lwes_event *
+lwesrb_event_create(struct lwes_event_type_db *db, VALUE name)
+{
+	int gc_retry = 1;
+	const char *event_name = RSTRING_PTR(name);
+	struct lwes_event *event;
+
+retry:
+	event = lwes_event_create(db, event_name);
+	if (!event) {
+		if (--gc_retry == 0) {
+			rb_gc();
+			goto retry;
+		}
+		rb_raise(rb_eRuntimeError, "failed to create lwes_event");
+	}
+	return event;
 }
 
 /* called by the GC when object is allocated */
@@ -49,18 +74,20 @@ static VALUE rle_alloc(VALUE klass)
 static VALUE event_hash_iter_i(VALUE kv, VALUE memo)
 {
 	VALUE *tmp;
-	VALUE v;
+	VALUE val;
 	struct lwes_event *event = (struct lwes_event *)memo;
 	LWES_CONST_SHORT_STRING name;
 	int rv = 0;
+	int gc_retry = 1;
 
 	assert(TYPE(kv) == T_ARRAY &&
 	       "hash iteration not giving key-value pairs");
 	tmp = RARRAY_PTR(kv);
 	name = RSTRING_PTR(rb_obj_as_string(tmp[0]));
+	val = tmp[1];
 
-	v = tmp[1];
-	switch (TYPE(v)) {
+retry:
+	switch (TYPE(val)) {
 	case T_TRUE:
 		rv = lwes_event_set_BOOLEAN(event, name, TRUE);
 		break;
@@ -68,20 +95,26 @@ static VALUE event_hash_iter_i(VALUE kv, VALUE memo)
 		rv = lwes_event_set_BOOLEAN(event, name, FALSE);
 		break;
 	case T_ARRAY:
-		rv = lwesrb_event_set_numeric(event, name, v);
+		rv = lwesrb_event_set_numeric(event, name, val);
 		break;
 	case T_STRING:
-		rv = lwes_event_set_STRING(event, name, RSTRING_PTR(v));
+		rv = lwes_event_set_STRING(event, name, RSTRING_PTR(val));
 		break;
 	}
-	if (rv > 0)
+	if (rv > 0) {
 		return Qnil;
-	if (rv == 0)
+	} else if (rv == 0) {
 		rb_raise(rb_eArgError, "unhandled type %s=%s for event=%s",
-	                 name, RSTRING_PTR(rb_inspect(v)), event->eventName);
-	/* rv < 0 */
-	rb_raise(rb_eRuntimeError, "failed to set %s=%s for event=%s",
-		 name, RSTRING_PTR(rb_inspect(v)), event->eventName);
+	                 name, RSTRING_PTR(rb_inspect(val)), event->eventName);
+	} else {
+		/* looking at the lwes source code, -3 is allocation errors */
+		if (rv == -3 && --gc_retry == 0) {
+			rb_gc();
+			goto retry;
+		}
+		rb_raise(rb_eRuntimeError, "failed to set %s=%s for event=%s",
+			 name, RSTRING_PTR(rb_inspect(val)), event->eventName);
+	}
 	return Qfalse;
 }
 
@@ -99,31 +132,50 @@ static VALUE _emit_hash(VALUE _tmp)
 	return _event;
 }
 
-static int set_field(
+static void
+set_field(
 	struct lwes_event *event,
 	LWES_CONST_SHORT_STRING name,
 	LWES_TYPE type,
 	VALUE val)
 {
+	int gc_retry = 1;
+	int rv;
+
+retry:
 	switch (type) {
 	case LWES_TYPE_BOOLEAN:
 		if (val == Qfalse)
-			return lwes_event_set_BOOLEAN(event, name, FALSE);
+			rv = lwes_event_set_BOOLEAN(event, name, FALSE);
 		else if (val == Qtrue)
-			return lwes_event_set_BOOLEAN(event, name, TRUE);
+			rv = lwes_event_set_BOOLEAN(event, name, TRUE);
 		else
 			rb_raise(rb_eTypeError, "non-boolean set for %s: %s",
 			         name, RSTRING_PTR(rb_inspect(val)));
+		break;
 	case LWES_TYPE_STRING:
 		if (TYPE(val) != T_STRING)
 			rb_raise(rb_eTypeError, "non-String set for %s: %s",
 			         name, RSTRING_PTR(rb_inspect(val)));
-		return lwes_event_set_STRING(event, name, RSTRING_PTR(val));
+		rv = lwes_event_set_STRING(event, name, RSTRING_PTR(val));
+		break;
 	default:
-		return lwesrb_event_set_num(event, name, type, val);
+		rv = lwesrb_event_set_num(event, name, type, val);
 	}
+	if (rv > 0) {
+		return;
+	} else {
+		if (rv == -3 && --gc_retry == 0) {
+			rb_gc();
+			goto retry;
+		}
+		rb_raise(rb_eRuntimeError,
+			 "failed to set %s=%s for event=%s (error: %d)",
+			 name, RSTRING_PTR(rb_inspect(val)),
+			 event->eventName, rv);
+	}
+
 	assert(0 && "you should never get here (set_field)");
-	return -1;
 }
 
 static VALUE _emit_struct(VALUE _argv)
@@ -144,7 +196,6 @@ static VALUE _emit_struct(VALUE _argv)
 		/* inner: [ :field_sym, "field_name", type ] */
 		VALUE *inner = RARRAY_PTR(*tmp);
 		VALUE val = rb_struct_aref(_event, inner[0]);
-		int rv;
 		LWES_CONST_SHORT_STRING name;
 		LWES_TYPE type;
 
@@ -153,14 +204,7 @@ static VALUE _emit_struct(VALUE _argv)
 
 		name = RSTRING_PTR(inner[1]);
 		type = NUM2INT(inner[2]);
-		rv = set_field(event, name, type, val);
-		if (rv > 0)
-			continue;
-
-		rb_raise(rb_eRuntimeError,
-		         "failed to set %s=%s for event=%s (error: %d)",
-		         name, RSTRING_PTR(rb_inspect(val)),
-			 event->eventName, rv);
+		set_field(event, name, type, val);
 	}
 
 	if (lwes_emitter_emit(_rle(self)->emitter, event) < 0)
@@ -182,10 +226,7 @@ static VALUE _destroy_event(VALUE _event)
 static VALUE emit_hash(VALUE self, VALUE name, VALUE _event)
 {
 	VALUE tmp[3];
-	struct lwes_event *event = lwes_event_create(NULL, RSTRING_PTR(name));
-
-	if (!event)
-		rb_raise(rb_eRuntimeError, "failed to create lwes_event");
+	struct lwes_event *event = lwesrb_event_create(NULL, name);
 
 	tmp[0] = self;
 	tmp[1] = _event;
@@ -219,9 +260,7 @@ static VALUE emit_struct(VALUE self, VALUE _event)
 		         "could not get class NAME or TYPE_LIST from: %s",
 		         RSTRING_PTR(rb_inspect(_event)));
 
-	event = lwes_event_create(db, RSTRING_PTR(name));
-	if (!event)
-		rb_raise(rb_eRuntimeError, "failed to create lwes_event");
+	event = lwesrb_event_create(db, name);
 
 	argv[0] = self;
 	argv[1] = _event;
@@ -311,21 +350,61 @@ static VALUE emitter_emit(int argc, VALUE *argv, VALUE self)
  */
 static VALUE emitter_close(VALUE self)
 {
-	rle_free(_rle(self));
+	struct _rb_lwes_emitter *rle = _rle(self);
+
+	if (rle->emitter)
+		lwes_emitter_destroy(rle->emitter);
+	rle->emitter = NULL;
 
 	return Qnil;
 }
 
+static void lwesrb_emitter_create(struct _rb_lwes_emitter *rle)
+{
+	int gc_retry = 1;
+retry:
+	if (rle->ttl == UINT32_MAX)
+		rle->emitter = lwes_emitter_create(
+		         rle->address, rle->iface, rle->port,
+			 rle->emit_heartbeat, rle->freq);
+	else
+		rle->emitter = lwes_emitter_create_with_ttl(
+		         rle->address, rle->iface, rle->port,
+			 rle->emit_heartbeat, rle->freq, rle->ttl);
+
+	if (!rle->emitter) {
+		if (--gc_retry == 0) {
+			rb_gc();
+			goto retry;
+		}
+		rb_raise(rb_eRuntimeError, "failed to create LWES emitter");
+	}
+}
+
+/* :nodoc: */
+static VALUE init_copy(VALUE dest, VALUE obj)
+{
+	struct _rb_lwes_emitter *dst = _rle(dest);
+	struct _rb_lwes_emitter *src = _rle(obj);
+
+	memcpy(dst, src, sizeof(*dst));
+	lwesrb_emitter_create(dst);
+
+	assert(dst->emitter && dst->emitter != src->emitter &&
+	       "emitter not a copy");
+
+	return dest;
+}
+
 /* should only used internally by #initialize */
 static VALUE _create(VALUE self, VALUE options)
 {
 	struct _rb_lwes_emitter *rle = _rle(self);
 	VALUE address, iface, port, heartbeat, ttl;
-	LWES_CONST_SHORT_STRING _address, _iface;
-	LWES_U_INT_32 _port; /* odd, uint16 would be enough here */
-	LWES_BOOLEAN _emit_heartbeat = FALSE;
-	LWES_INT_16 _freq = 0;
-	LWES_U_INT_32 _ttl = UINT32_MAX; /* nobody sets a ttl this long, right? */
+
+	rle->emit_heartbeat = FALSE;
+	rle->freq = 0;
+	rle->ttl = UINT32_MAX; /* nobody sets a ttl this long, right? */
 
 	if (rle->emitter)
 		rb_raise(rb_eRuntimeError, "already created lwes_emitter");
@@ -335,15 +414,15 @@ static VALUE _create(VALUE self, VALUE options)
 	address = rb_hash_aref(options, ID2SYM(rb_intern("address")));
 	if (TYPE(address) != T_STRING)
 		rb_raise(rb_eTypeError, ":address must be a string");
-	_address = RSTRING_PTR(address);
+	rle->address = RSTRING_PTR(address);
 
 	iface = rb_hash_aref(options, ID2SYM(rb_intern("iface")));
 	switch (TYPE(iface)) {
 	case T_NIL:
-		_iface = NULL;
+		rle->iface = NULL;
 		break;
 	case T_STRING:
-		_iface = RSTRING_PTR(iface);
+		rle->iface = RSTRING_PTR(iface);
 		break;
 	default:
 		rb_raise(rb_eTypeError, ":iface must be a String or nil");
@@ -352,15 +431,15 @@ static VALUE _create(VALUE self, VALUE options)
 	port = rb_hash_aref(options, ID2SYM(rb_intern("port")));
 	if (TYPE(port) != T_FIXNUM)
 		rb_raise(rb_eTypeError, ":port must be a Fixnum");
-	_port = NUM2UINT(port);
+	rle->port = NUM2UINT(port);
 
 	heartbeat = rb_hash_aref(options, ID2SYM(rb_intern("heartbeat")));
 	if (TYPE(heartbeat) == T_FIXNUM) {
 		int tmp = NUM2INT(heartbeat);
 		if (tmp > INT16_MAX)
 			rb_raise(rb_eArgError,":heartbeat > INT16_MAX seconds");
-		_emit_heartbeat = TRUE;
-		_freq = (LWES_INT_16)tmp;
+		rle->emit_heartbeat = TRUE;
+		rle->freq = (LWES_INT_16)tmp;
 	} else if (NIL_P(heartbeat)) { /* do nothing, use defaults */
 	} else
 		rb_raise(rb_eTypeError, ":heartbeat must be a Fixnum or nil");
@@ -370,20 +449,12 @@ static VALUE _create(VALUE self, VALUE options)
 		unsigned LONG_LONG tmp = NUM2ULL(ttl);
 		if (tmp >= UINT32_MAX)
 			rb_raise(rb_eArgError, ":ttl >= UINT32_MAX seconds");
-		_ttl = (LWES_U_INT_32)tmp;
+		rle->ttl = (LWES_U_INT_32)tmp;
 	} else if (NIL_P(ttl)) { /* do nothing, no ttl */
 	} else
 		rb_raise(rb_eTypeError, ":ttl must be a Fixnum or nil");
 
-	if (_ttl == UINT32_MAX)
-		rle->emitter = lwes_emitter_create(
-		         _address, _iface, _port, _emit_heartbeat, _freq);
-	else
-		rle->emitter = lwes_emitter_create_with_ttl(
-		         _address, _iface, _port, _emit_heartbeat, _freq, _ttl);
-
-	if (!rle->emitter)
-		rb_raise(rb_eRuntimeError, "failed to create LWES emitter");
+	lwesrb_emitter_create(rle);
 
 	return self;
 }
@@ -398,6 +469,7 @@ void lwesrb_init_emitter(void)
 	rb_define_method(cLWES_Emitter, "emit", emitter_emit, -1);
 	rb_define_method(cLWES_Emitter, "_create", _create, 1);
 	rb_define_method(cLWES_Emitter, "close", emitter_close, 0);
+	rb_define_method(cLWES_Emitter, "initialize_copy", init_copy, 1);
 	rb_define_alloc_func(cLWES_Emitter, rle_alloc);
 	LWESRB_MKID(TYPE_DB);
 	LWESRB_MKID(TYPE_LIST);

data/ext/lwes/extconf.rb

@@ -6,6 +6,7 @@ dir_config('lwes')
 pwd = File.expand_path(File.dirname(__FILE__))
 v = '0.22.3'
 dir = "lwes-#{v}"
+diff = "#{pwd}/#{dir}.diff"
 inst = "#{pwd}/.inst"
 tgz = "#{dir}.tar.gz"
 url = "http://sourceforge.net/projects/lwes/files/lwes-c/#{v}/#{tgz}/download"
@@ -37,6 +38,7 @@ unless have_library('lwes') && have_header('lwes.h')
       FileUtils.rm_rf(dir)
       system('tar', 'zxf', tgz) or abort "tar failed with #{$?}"
       Dir.chdir(dir) do
+        system("patch", "-p1", "-i", diff) or abort "patch failed: #{$?}"
         args = %w(--disable-shared
                   --disable-hardcore
                   --with-pic

data/ext/lwes/lwes-0.22.3.diff

@@ -0,0 +1,287 @@
+backport of several things from lwes trunk
+
+* ESF error handling (r344)
+* empty events in ESFs (inherited fields only) (r307)
+
+https://lwes.svn.sourceforge.net/svnroot/lwes/lwes/trunk
+
+diff -rup a/src/lwes_esf_parser_y.y b/src/lwes_esf_parser_y.y
+--- a/src/lwes_esf_parser_y.y
++++ b/src/lwes_esf_parser_y.y
+@@ -63,8 +63,10 @@ eventname: EVENTWORD  {
+   
+     ;
+ 
+-attributelist: attribute
+-    |   attributelist attribute
++attributelist:
++      /* empty */
++    | attribute
++    | attributelist attribute
+     ;
+ 
+ attribute: type attributename ';'
+@@ -221,6 +223,7 @@ lwes_parse_esf
+   else
+   {
+     fprintf (stderr,"ERROR: No such file : \"%s\"\n",filename);
++    state.errors++;
+   }
+ 
+   if (state.errors)
+diff -rup a/src/lwes_event_type_db.c b/src/lwes_event_type_db.c
+--- a/src/lwes_event_type_db.c
++++ b/src/lwes_event_type_db.c
+@@ -36,7 +36,11 @@ lwes_event_type_db_create
+       db->events = lwes_hash_create ();
+       if (db->events != NULL)
+         {
+-          lwes_parse_esf (db, db->esf_filename);
++          if (lwes_parse_esf (db, db->esf_filename) != 0)
++            {
++              free (db);
++              db = NULL;
++            }
+         }
+       else
+         {
+diff -rup a/src/lwes_esf_parser_y.c b/src/lwes_esf_parser_y.c
+--- a/src/lwes_esf_parser_y.c
++++ b/src/lwes_esf_parser_y.c
+@@ -387,7 +387,7 @@ union yyalloc
+ /* YYNNTS -- Number of nonterminals.  */
+ #define YYNNTS  8
+ /* YYNRULES -- Number of rules.  */
+-#define YYNRULES  23
++#define YYNRULES  24
+ /* YYNRULES -- Number of states.  */
+ #define YYNSTATES  32
+ 
+@@ -435,9 +435,9 @@ static const yytype_uint8 yytranslate[] =
+    YYRHS.  */
+ static const yytype_uint8 yyprhs[] =
+ {
+-       0,     0,     3,     5,     8,    13,    16,    19,    21,    23,
+-      26,    30,    35,    40,    42,    44,    46,    48,    50,    52,
+-      54,    56,    58,    60
++       0,     0,     3,     5,     8,    13,    16,    19,    21,    22,
++      24,    27,    31,    36,    41,    43,    45,    47,    49,    51,
++      53,    55,    57,    59,    61
+ };
+ 
+ /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+@@ -445,19 +445,19 @@ static const yytype_int8 yyrhs[] =
+ {
+       18,     0,    -1,    19,    -1,    18,    19,    -1,    20,    14,
+       21,    15,    -1,     1,    16,    -1,     1,    15,    -1,    12,
+-      -1,    22,    -1,    21,    22,    -1,    24,    23,    16,    -1,
+-      24,    23,     1,    16,    -1,    24,    23,     1,    15,    -1,
+-      13,    -1,     3,    -1,     4,    -1,     5,    -1,     6,    -1,
+-      10,    -1,    11,    -1,     7,    -1,     8,    -1,     9,    -1,
+-      13,    -1
++      -1,    -1,    22,    -1,    21,    22,    -1,    24,    23,    16,
++      -1,    24,    23,     1,    16,    -1,    24,    23,     1,    15,
++      -1,    13,    -1,     3,    -1,     4,    -1,     5,    -1,     6,
++      -1,    10,    -1,    11,    -1,     7,    -1,     8,    -1,     9,
++      -1,    13,    -1
+ };
+ 
+ /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+ static const yytype_uint8 yyrline[] =
+ {
+-       0,    35,    35,    36,    39,    47,    48,    51,    66,    67,
+-      70,    71,    72,    75,    93,   104,   115,   125,   135,   145,
+-     155,   165,   175,   185
++       0,    35,    35,    36,    39,    47,    48,    51,    66,    68,
++      69,    72,    73,    74,    77,    95,   106,   117,   127,   137,
++     147,   157,   167,   177,   187
+ };
+ #endif
+ 
+@@ -488,16 +488,16 @@ static const yytype_uint16 yytoknum[] =
+ static const yytype_uint8 yyr1[] =
+ {
+        0,    17,    18,    18,    19,    19,    19,    20,    21,    21,
+-      22,    22,    22,    23,    24,    24,    24,    24,    24,    24,
+-      24,    24,    24,    24
++      21,    22,    22,    22,    23,    24,    24,    24,    24,    24,
++      24,    24,    24,    24,    24
+ };
+ 
+ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+ static const yytype_uint8 yyr2[] =
+ {
+-       0,     2,     1,     2,     4,     2,     2,     1,     1,     2,
+-       3,     4,     4,     1,     1,     1,     1,     1,     1,     1,
+-       1,     1,     1,     1
++       0,     2,     1,     2,     4,     2,     2,     1,     0,     1,
++       2,     3,     4,     4,     1,     1,     1,     1,     1,     1,
++       1,     1,     1,     1,     1
+ };
+ 
+ /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+@@ -506,9 +506,9 @@ static const yytype_uint8 yyr2[] =
+ static const yytype_uint8 yydefact[] =
+ {
+        0,     0,     7,     0,     2,     0,     6,     5,     1,     3,
+-       0,    14,    15,    16,    17,    20,    21,    22,    18,    19,
+-      23,     0,     8,     0,     4,     9,    13,     0,     0,    10,
+-      12,    11
++       8,    15,    16,    17,    18,    21,    22,    23,    19,    20,
++      24,     0,     9,     0,     4,    10,    14,     0,     0,    11,
++      13,    12
+ };
+ 
+ /* YYDEFGOTO[NTERM-NUM].  */
+@@ -1414,18 +1414,18 @@ yyreduce:
+                       }
+     break;
+ 
+-  case 11:
+-#line 71 "lwes_esf_parser_y.y"
++  case 12:
++#line 73 "lwes_esf_parser_y.y"
+     { lweserror("Did you forget a ';'?"); }
+     break;
+ 
+-  case 12:
+-#line 72 "lwes_esf_parser_y.y"
++  case 13:
++#line 74 "lwes_esf_parser_y.y"
+     { lweserror("Did you forget a semi-colon?"); }
+     break;
+ 
+-  case 13:
+-#line 75 "lwes_esf_parser_y.y"
++  case 14:
++#line 77 "lwes_esf_parser_y.y"
+     {
+         if (((struct lwes_parser_state *) param)->lastType != NULL)
+         {
+@@ -1444,8 +1444,8 @@ yyreduce:
+                              }
+     break;
+ 
+-  case 14:
+-#line 93 "lwes_esf_parser_y.y"
++  case 15:
++#line 95 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1459,8 +1459,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 15:
+-#line 104 "lwes_esf_parser_y.y"
++  case 16:
++#line 106 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1474,8 +1474,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 16:
+-#line 115 "lwes_esf_parser_y.y"
++  case 17:
++#line 117 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1488,8 +1488,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 17:
+-#line 125 "lwes_esf_parser_y.y"
++  case 18:
++#line 127 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1502,8 +1502,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 18:
+-#line 135 "lwes_esf_parser_y.y"
++  case 19:
++#line 137 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1516,8 +1516,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 19:
+-#line 145 "lwes_esf_parser_y.y"
++  case 20:
++#line 147 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1530,8 +1530,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 20:
+-#line 155 "lwes_esf_parser_y.y"
++  case 21:
++#line 157 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1544,8 +1544,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 21:
+-#line 165 "lwes_esf_parser_y.y"
++  case 22:
++#line 167 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1558,8 +1558,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 22:
+-#line 175 "lwes_esf_parser_y.y"
++  case 23:
++#line 177 "lwes_esf_parser_y.y"
+     {
+           /* allocate a string, and copy the type value into it */
+           ((struct lwes_parser_state *) param)->lastType = strdup(lweslval);
+@@ -1572,8 +1572,8 @@ yyreduce:
+                  }
+     break;
+ 
+-  case 23:
+-#line 185 "lwes_esf_parser_y.y"
++  case 24:
++#line 187 "lwes_esf_parser_y.y"
+     { char buffer[256];
+                       sprintf(buffer,"unknown type '%s'",lweslval); 
+                       lweserror(buffer);
+@@ -1797,7 +1797,7 @@ yyreturn:
+ }
+ 
+ 
+-#line 192 "lwes_esf_parser_y.y"
++#line 194 "lwes_esf_parser_y.y"
+ 
+ 
+ extern FILE *lwesin;
+@@ -1830,6 +1830,7 @@ lwes_parse_esf
+   else
+   {
+     fprintf (stderr,"ERROR: No such file : \"%s\"\n",filename);
++    state.errors++;
+   }
+ 
+   if (state.errors)

data/ext/lwes/type_db.c

@@ -12,7 +12,7 @@ static void tdb_free(void *ptr)
 
 	if (tdb->db)
 		lwes_event_type_db_destroy(tdb->db);
-	tdb->db = NULL;
+	xfree(ptr);
 }
 
 static VALUE tdb_alloc(VALUE klass)
@@ -25,6 +25,7 @@ static VALUE tdb_alloc(VALUE klass)
 static VALUE tdb_init(VALUE self, VALUE path)
 {
 	struct _tdb *tdb;
+	int gc_retry = 1;
 
 	if (TYPE(path) != T_STRING)
 		rb_raise(rb_eArgError, "path must be a string");
@@ -32,12 +33,17 @@ static VALUE tdb_init(VALUE self, VALUE path)
 	Data_Get_Struct(self, struct _tdb, tdb);
 	if (tdb->db)
 		rb_raise(rb_eRuntimeError, "ESF already initialized");
-
+retry:
 	tdb->db = lwes_event_type_db_create(RSTRING_PTR(path));
-	if (!tdb->db)
+	if (!tdb->db) {
+		if (--gc_retry == 0) {
+			rb_gc();
+			goto retry;
+		}
 		rb_raise(rb_eRuntimeError,
 		         "failed to create type DB for LWES file %s",
 		         RSTRING_PTR(path));
+	}
 
 	return Qnil;
 }

data/lib/lwes/type_db.rb

@@ -21,5 +21,15 @@ module LWES
       end
     end
 
+    # :stopdoc:
+    # avoid GC mis-free-ing nuked objects
+    def dup
+      self
+    end
+
+    def clone
+      self
+    end
+
   end
 end

data/lib/lwes.rb

@@ -1,6 +1,6 @@
 module LWES
-  # version of our library, currently 0.2.3
-  VERSION = "0.2.3"
+  # version of our library, currently 0.3.0
+  VERSION = "0.3.0"
 
   autoload :TypeDB, "lwes/type_db"
   autoload :Struct, "lwes/struct"

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}
@@ -23,6 +23,7 @@ examples/demo.rb
 examples/my_events.esf
 ext/lwes/emitter.c
 ext/lwes/extconf.rb
+ext/lwes/lwes-0.22.3.diff
 ext/lwes/lwes.c
 ext/lwes/lwes_ruby.h
 ext/lwes/numeric.c
@@ -42,5 +43,6 @@ test/unit/test_emitter.rb
 test/unit/test_struct.rb
 test/unit/test_type_db.rb
 )
+  s.rubyforge_project = 'lwes'
   s.test_files = s.files.grep(%r{\Atest/unit/test_})
 end

data/test/unit/test_emit_struct.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require "#{File.expand_path(File.dirname(__FILE__))}/../test_helper"
 
 class InvalidStruct1 < Struct.new(:invalid)
   TYPE_DB = []

data/test/unit/test_emitter.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require "#{File.expand_path(File.dirname(__FILE__))}/../test_helper"
 require 'ipaddr'
 
 class TestEmitter < Test::Unit::TestCase
@@ -20,6 +20,20 @@ class TestEmitter < Test::Unit::TestCase
     assert_instance_of LWES::Emitter, LWES::Emitter.new(@options)
   end
 
+  def test_dup
+    orig = LWES::Emitter.new(@options)
+    duped = orig.dup
+    assert_instance_of LWES::Emitter, duped
+    assert duped.object_id != orig.object_id
+  end
+
+  def test_clone
+    orig = LWES::Emitter.new(@options)
+    cloned = orig.clone
+    assert_instance_of LWES::Emitter, cloned
+    assert cloned.object_id != orig.object_id
+  end
+
   def test_initialize_with_heartbeat
     heartbeat = @options.merge(:heartbeat => 30)
     assert_instance_of LWES::Emitter, LWES::Emitter.new(heartbeat)

data/test/unit/test_struct.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require "#{File.expand_path(File.dirname(__FILE__))}/../test_helper"
 
 module Dummy
 end

data/test/unit/test_type_db.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require "#{File.expand_path(File.dirname(__FILE__))}/../test_helper"
 require 'tempfile'
 
 module Abcde

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lwes
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +00:00
+date: 2010-04-15 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - examples/my_events.esf
 - ext/lwes/emitter.c
 - ext/lwes/extconf.rb
+- ext/lwes/lwes-0.22.3.diff
 - ext/lwes/lwes.c
 - ext/lwes/lwes_ruby.h
 - ext/lwes/numeric.c
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: lwes
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3