rb-wartslib 0.9.13 → 0.9.14

data/CHANGES

@@ -1,3 +1,9 @@
+version 0.9.14, 2008-03-17
+  * fixed to compile under Linux
+  * fixed to handle traces with a NULL source address; scamper can sometimes
+    write out traces with a NULL source address when a serious error occurs
+    (stop reason == 6, ERROR)
+
 version 0.9.13, 2008-02-01
   * fixed Warts::File#open to handle paths with spaces and other special
     characters

data/docs/index.html

@@ -78,7 +78,7 @@ Although you can use this extension to write out trace data to warts files,
 you can't use this extension itself to create completely new traces in
 memory--that is, you can only write out traces you've read in from a file.
 Furthermore, any read-in data is immutable, with a few careful exceptions,
-because the principle purpose of this extension is to support the analysis
+because the principal purpose of this extension is to support the analysis
 of existing data rather than the creation of new data.  The ability to
 write out (unmodified) traces is still useful for filtering out traces and
 for re-organizing traces into a different set of files (for example, into

data/docs/reference.html

@@ -377,17 +377,17 @@ timestamp.
 
 <h3>Instance Methods</h3>
 
-<h4 class="method_sig"><a name="Trace_src_cmp_method"></a><span class="method_name">src_cmp</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_src_cmp_method"></a><span class="method_name">src_cmp</span>(<span class="method_argument">other_trace</span>)</h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_dest_cmp_method"></a><span class="method_name">dest_cmp</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_dest_cmp_method"></a><span class="method_name">dest_cmp</span>(<span class="method_argument">other_trace</span>)</h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_cycle=_method"></a><span class="method_name">cycle=</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_cycle=_method"></a><span class="method_name">cycle=</span>(<span class="method_argument">cycle</span>)</h4>
 
 <p class="method_desc">
 </p>
@@ -402,37 +402,37 @@ timestamp.
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_find_dest_response_method"></a><span class="method_name">find_dest_response</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_find_dest_response_method"></a><span class="method_name">find_dest_response</span></h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_complete?_method"></a><span class="method_name">complete?</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_complete?_method"></a><span class="method_name">complete?</span></h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_each_hop_method"></a><span class="method_name">each_hop</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_each_hop_method"></a><span class="method_name">each_hop</span></h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_each_response_method"></a><span class="method_name">each_response</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_each_response_method"></a><span class="method_name">each_response</span>(<span class="method_argument">hop_index</span>)</h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_each_hop_and_response_method"></a><span class="method_name">each_hop_and_response</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_each_hop_and_response_method"></a><span class="method_name">each_hop_and_response</span></h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_dest_responded?_method"></a><span class="method_name">dest_responded?</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_dest_responded?_method"></a><span class="method_name">dest_responded?</span></h4>
 
 <p class="method_desc">
 </p>
 
-<h4 class="method_sig"><a name="Trace_each_method"></a><span class="method_name">each</span>(<span class="method_argument">hop_index</span>, <span class="method_argument">response_index</span><code class="method_default">=0</code>)</h4>
+<h4 class="method_sig"><a name="Trace_each_method"></a><span class="method_name">each</span></h4>
 
 <p class="method_desc">
 </p>

data/ext/scaddr.c

@@ -18,12 +18,12 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: scaddr.c,v 1.9 2007/11/29 01:42:07 youngh Exp $
+** $Id: scaddr.c,v 1.10 2008/02/08 23:46:56 youngh Exp $
 **/
 
 #include "ruby.h"
 
-#if defined(__HAVE_STDINT_H__)
+#if defined(HAVE_STDINT_H)
 #include <stdint.h>
 #endif
 

data/ext/scext.c

@@ -19,12 +19,12 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: scext.c,v 1.24 2008/01/25 01:15:46 youngh Exp $
+** $Id: scext.c,v 1.26 2008/02/08 23:46:56 youngh Exp $
 **/
 
 #include "ruby.h"
 
-#if defined(__HAVE_STDINT_H__)
+#if defined(HAVE_STDINT_H)
 #include <stdint.h>
 #endif
 
@@ -42,7 +42,7 @@ void Init_wartslibext(void)
 {
   mWarts = rb_define_module("Warts");
 
-  rb_define_const(mWarts, "WARTS_LIB_VERSION", rb_str_new2("0.9.13"));
+  rb_define_const(mWarts, "WARTS_LIB_VERSION", rb_str_new2("0.9.14"));
   rb_define_const(mWarts, "SCAMPER_VERSION", rb_str_new2(SCAMPER_VERSION));
 
   rb_define_const(mWarts, "LIST",        INT2FIX(SCAMPER_FILE_OBJ_LIST));

data/ext/scfile.c

@@ -18,22 +18,22 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: scfile.c,v 1.33 2008/01/25 01:15:20 youngh Exp $
+** $Id: scfile.c,v 1.35 2008/02/08 23:46:56 youngh Exp $
 **/
 
 #include <unistd.h>
 #include <string.h>
 #include <strings.h>
 
+#if defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
 #include "ruby.h"
 
 #include "scfile.h"
 #include "scaddr.h"
 
-#if defined(__HAVE_STDINT_H__)
-#include <stdint.h>
-#endif
-
 #include "scamper_list.h"
 #include "scamper_addr.h"
 #include "scamper_trace.h"

data/ext/sclist.c

@@ -18,14 +18,14 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: sclist.c,v 1.10 2007/11/29 01:42:07 youngh Exp $
+** $Id: sclist.c,v 1.11 2008/02/08 23:46:56 youngh Exp $
 **/
 
 #include <stdlib.h>
 #include <string.h>
 #include "ruby.h"
 
-#if defined(__HAVE_STDINT_H__)
+#if defined(HAVE_STDINT_H)
 #include <stdint.h>
 #endif
 

data/ext/sctrace.c

@@ -27,12 +27,12 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: sctrace.c,v 1.59 2008/01/25 00:17:32 youngh Exp $
+** $Id: sctrace.c,v 1.61 2008/02/14 00:00:48 youngh Exp $
 **/
 
 #include "ruby.h"
 
-#if defined(__HAVE_STDINT_H__)
+#if defined(HAVE_STDINT_H)
 #include <stdint.h>
 #endif
 
@@ -406,13 +406,19 @@ static VALUE sctrace_init(VALUE self)
 }
 
 
+/*
+** NOTE: scamper can sometimes write out traces with a NULL source address.
+**       This seems to happen when a serious error occurs (stop reason == 6,
+**       ERROR).  We tolerate this by return nil for the src address.
+*/
 static VALUE sctrace_src(VALUE self)
 {
   scamper_trace_t *trace;
   char buf[128];
 
   Data_Get_Struct(self, scamper_trace_t, trace);
-  return rb_str_new2(scamper_addr_tostr(trace->src, buf, 128));
+  return (trace->src ? rb_str_new2(scamper_addr_tostr(trace->src, buf, 128))
+	  : Qnil);
 }
 
 
@@ -426,6 +432,12 @@ static VALUE sctrace_dest(VALUE self)
 }
 
 
+/*
+** NOTE: scamper can sometimes write out traces with a NULL source address.
+**       See sctrace_src().  For comparison purposes, a NULL source address
+**       is considered less than any other address except for another NULL
+**       source address.  Two NULL addresses are equal.
+*/
 static VALUE sctrace_src_cmp(VALUE self, VALUE other)
 {
   scamper_trace_t *self_trace;
@@ -442,7 +454,19 @@ static VALUE sctrace_src_cmp(VALUE self, VALUE other)
 
   Data_Get_Struct(self, scamper_trace_t, self_trace);
   Data_Get_Struct(other, scamper_trace_t, other_trace);
-  return INT2FIX(scamper_addr_cmp(self_trace->src, other_trace->src));
+ 
+  if (self_trace->src && other_trace->src) {
+    return INT2FIX(scamper_addr_cmp(self_trace->src, other_trace->src));
+  }
+  else if (self_trace->src) {
+    return INT2FIX(1);
+  }
+  else if (other_trace->src) {
+    return INT2FIX(-1);
+  }
+  else {
+    return INT2FIX(0);
+  }
 }
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rb-wartslib
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
-date: 2008-02-01 00:00:00 -08:00
+  version: 0.9.14
+date: 2008-03-17 00:00:00 -07:00
 summary: Ruby extension for reading/writing warts files
 require_paths: 
 - lib