zmq 2.0.7 → 2.0.7.1

data/Makefile

@@ -4,18 +4,18 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/include/ruby1.9-1.9.1
-hdrdir = /opt/local/include/ruby1.9-1.9.1
-arch_hdrdir = /opt/local/include/ruby1.9-1.9.1/$(arch)
+topdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1
+hdrdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1
+arch_hdrdir = /usr/local/Cellar/ruby/1.9.1-p378/include/ruby-1.9.1/$(arch)
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/opt/local
+prefix = $(DESTDIR)/usr/local/Cellar/ruby/1.9.1-p378
 exec_prefix = $(prefix)
 vendorhdrdir = $(rubyhdrdir)/vendor_ruby
 sitehdrdir = $(rubyhdrdir)/site_ruby
 rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)
 vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby
-sitedir = $(libdir)/$(RUBY_INSTALL_NAME)/site_ruby
-mandir = $(DESTDIR)/opt/local/share/man
+sitedir = $(DESTDIR)/Library/Ruby/Site
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
 psdir = $(docdir)
@@ -41,8 +41,8 @@ sitearchdir = $(sitelibdir)/$(sitearch)
 vendorlibdir = $(vendordir)/$(ruby_version)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = /usr/bin/gcc-4.2
-CXX = /usr/bin/g++-4.2
+CC = /usr/bin/cc
+CXX = /usr/bin/c++
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
@@ -55,12 +55,12 @@ cflags   = $(optflags) $(debugflags) $(warnflags)
 optflags = -O2
 debugflags = -g
 warnflags = -Wall -Wno-parentheses
-CFLAGS   =  -fno-common -O2 -arch x86_64 $(cflags)  -fno-common -pipe -fno-common 
+CFLAGS   =  -fno-common -O3 -march=core2 -msse4.1 -w -pipe $(cflags)  -fno-common -pipe -fno-common 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) -O2 -arch x86_64 $(cxxflags)
-ldflags  = -L. -L/opt/local/lib -L/usr/local/lib
+CPPFLAGS =  -I/usr/local/Cellar/readline/6.0/include -I/usr/local/Cellar/readline/6.0/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) -O3 -march=core2 -msse4.1 -w -pipe $(cxxflags)
+ldflags  = -L. -L/usr/local/Cellar/readline/6.0/lib -L/usr/local/Cellar/readline/6.0/lib
 dldflags = 
 archflag = 
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
@@ -69,12 +69,12 @@ LDSHAREDXX = $(LDSHARED)
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby1.9
-RUBY_SO_NAME = ruby1.9
-arch = i386-darwin10
-sitearch = i386-darwin10
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i386-darwin10.3.0
+sitearch = i386-darwin10.3.0
 ruby_version = 1.9.1
-ruby = /opt/local/bin/ruby1.9
+ruby = /usr/local/Cellar/ruby/1.9.1-p378/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf

data/rbzmq.c

@@ -268,72 +268,57 @@ static VALUE zmq_poll_blocking (void* args_)
 
 #endif
 
-/*
- * call-seq:
- *   ZMQ.select(in, out=[], err=[], timeout=nil) -> [in, out, err] | nil
- *
- * Like IO.select, but also works with 0MQ sockets.
- */
-static VALUE module_select (int argc_, VALUE* argv_, VALUE self_)
+struct select_arg {
+    VALUE readset;
+    VALUE writeset;
+    VALUE errset;
+    long timeout_usec;
+    zmq_pollitem_t *items;
+};
+
+static VALUE internal_select(VALUE argval)
 {
-    VALUE readset, writeset, errset, timeout;
-    rb_scan_args (argc_, argv_, "13", &readset, &writeset, &errset, &timeout);
+    struct select_arg *arg = (struct select_arg *)argval;
 
-    long timeout_usec;
     int rc, nitems, i;
-    zmq_pollitem_t *items, *item;
-
-    if (!NIL_P (readset)) Check_Type (readset, T_ARRAY);
-    if (!NIL_P (writeset)) Check_Type (writeset, T_ARRAY);
-    if (!NIL_P (errset)) Check_Type (errset, T_ARRAY);
-    
-    if (NIL_P (timeout))
-        timeout_usec = -1;
-    else
-        timeout_usec = (long)(NUM2DBL (timeout) * 1000000);
-    
-    /* Conservative estimate for nitems before we traverse the lists. */
-    nitems = (NIL_P (readset) ? 0 : RARRAY_LEN (readset)) +
-             (NIL_P (writeset) ? 0 : RARRAY_LEN (writeset)) +
-             (NIL_P (errset) ? 0 : RARRAY_LEN (errset));
-    items = (zmq_pollitem_t*)ruby_xmalloc(sizeof(zmq_pollitem_t) * nitems);
+    zmq_pollitem_t *item;
 
     struct poll_state ps;
     ps.nitems = 0;
-    ps.items = items;
+    ps.items = arg->items;
     ps.io_objects = rb_ary_new ();
 
-    if (!NIL_P (readset)) {
+    if (!NIL_P (arg->readset)) {
         ps.event = ZMQ_POLLIN;
-        rb_iterate(rb_each, readset, (iterfunc)poll_add_item, (VALUE)&ps);
+        rb_iterate(rb_each, arg->readset, (iterfunc)poll_add_item, (VALUE)&ps);
     }
 
-    if (!NIL_P (writeset)) {
+    if (!NIL_P (arg->writeset)) {
         ps.event = ZMQ_POLLOUT;
-        rb_iterate(rb_each, writeset, (iterfunc)poll_add_item, (VALUE)&ps);
+        rb_iterate(rb_each, arg->writeset, (iterfunc)poll_add_item, (VALUE)&ps);
     }
 
-    if (!NIL_P (errset)) {
+    if (!NIL_P (arg->errset)) {
         ps.event = ZMQ_POLLERR;
-        rb_iterate(rb_each, errset, (iterfunc)poll_add_item, (VALUE)&ps);
+        rb_iterate(rb_each, arg->errset, (iterfunc)poll_add_item, (VALUE)&ps);
     }
     
     /* Reset nitems to the actual number of zmq_pollitem_t records we're sending. */
     nitems = ps.nitems;
 
 #ifdef HAVE_RUBY_INTERN_H
-    if (timeout_usec != 0) {
+    if (arg->timeout_usec != 0) {
         struct zmq_poll_args poll_args;
-        poll_args.items = items;
-        poll_args.nitems = nitems;
-        poll_args.timeout_usec = timeout_usec;
+        poll_args.items = ps.items;
+        poll_args.nitems = ps.nitems;
+        poll_args.timeout_usec = arg->timeout_usec;
 
         rb_thread_blocking_region (zmq_poll_blocking, (void*)&poll_args, NULL, NULL);
         rc = poll_args.rc;
     }
     else
 #endif
-        rc = zmq_poll (items, nitems, timeout_usec);
+        rc = zmq_poll (ps.items, ps.nitems, arg->timeout_usec);
     
     if (rc == -1) {
         rb_raise(rb_eRuntimeError, "%s", zmq_strerror (zmq_errno ()));
@@ -346,7 +331,7 @@ static VALUE module_select (int argc_, VALUE* argv_, VALUE self_)
     VALUE write_active = rb_ary_new ();
     VALUE err_active = rb_ary_new ();
     
-    for (i = 0, item = &items[0]; i < nitems; i++, item++) {
+    for (i = 0, item = &ps.items[0]; i < nitems; i++, item++) {
         if (item->revents != 0) {
             VALUE io = RARRAY_PTR (ps.io_objects)[i];
             
@@ -359,11 +344,56 @@ static VALUE module_select (int argc_, VALUE* argv_, VALUE self_)
         }
     }
     
-    ruby_xfree (items);
-    
     return rb_ary_new3 (3, read_active, write_active, err_active);
 }
 
+static VALUE module_select_internal(VALUE readset, VALUE writeset, VALUE errset, long timeout_usec)
+{
+    int nitems;
+    struct select_arg arg;
+
+    /* Conservative estimate for nitems before we traverse the lists. */
+    nitems = (NIL_P (readset) ? 0 : RARRAY_LEN (readset)) +
+             (NIL_P (writeset) ? 0 : RARRAY_LEN (writeset)) +
+             (NIL_P (errset) ? 0 : RARRAY_LEN (errset));
+    arg.items = (zmq_pollitem_t*)ruby_xmalloc(sizeof(zmq_pollitem_t) * nitems);
+
+    arg.readset = readset;
+    arg.writeset = writeset;
+    arg.errset = errset;
+    arg.timeout_usec = timeout_usec;
+
+#ifdef HAVE_RUBY_INTERN_H
+    return rb_ensure(internal_select, (VALUE)&arg, (void (*)())ruby_xfree, (VALUE)arg.items);
+#else
+    return rb_ensure(internal_select, (VALUE)&arg, (VALUE (*)())ruby_xfree, (VALUE)arg.items);
+#endif
+}
+
+/*
+ * call-seq:
+ *   ZMQ.select(in, out=[], err=[], timeout=nil) -> [in, out, err] | nil
+ *
+ * Like IO.select, but also works with 0MQ sockets.
+ */
+static VALUE module_select (int argc_, VALUE* argv_, VALUE self_)
+{
+    VALUE readset, writeset, errset, timeout;
+    rb_scan_args (argc_, argv_, "13", &readset, &writeset, &errset, &timeout);
+
+    long timeout_usec;
+
+    if (!NIL_P (readset)) Check_Type (readset, T_ARRAY);
+    if (!NIL_P (writeset)) Check_Type (writeset, T_ARRAY);
+    if (!NIL_P (errset)) Check_Type (errset, T_ARRAY);
+    
+    if (NIL_P (timeout))
+        timeout_usec = -1;
+    else
+        timeout_usec = (long)(NUM2DBL (timeout) * 1000000);
+
+    return module_select_internal(readset, writeset, errset, timeout_usec);
+}
 
 static void socket_free (void *s)
 {

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: zmq
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 113
   prerelease: false
   segments: 
   - 2
   - 0
   - 7
-  version: 2.0.7
+  - 1
+  version: 2.0.7.1
 platform: ruby
 authors: 
 - Martin Sustrik
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -07:00
+date: 2010-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: []