Merge pull request #98 from hintjens/master

Removed HWM on parent side of pipe for zthread_new

Author: methodmissing

src/zctx.c

@@ -64,7 +64,6 @@ struct _zctx_t {
     bool main;                  //  TRUE if we're the main thread
     int iothreads;              //  Number of IO threads, default 1
     int linger;                 //  Linger timeout, default 0
-    int hwm;                    //  HWM, default 1
 };
 
 
@@ -101,7 +100,6 @@ zctx_new (void)
     }
     self->iothreads = 1;
     self->main = TRUE;
-    self->hwm = 1;
 
 #if defined (__UNIX__)
     //  Install signal handler for SIGINT and SIGTERM
@@ -189,23 +187,22 @@ zctx_set_linger (zctx_t *self, int linger)
 
 
 //  --------------------------------------------------------------------------
-//  Configure HWM value. This is used in zthread_fork
+//  Deprecated method, does nothing - to be removed after 2013/05/14
 
 void
 zctx_set_hwm (zctx_t *self, int hwm)
 {
     assert (self);
-    self->hwm = hwm;
 }
 
 //  --------------------------------------------------------------------------
-//  Get HWM value. This is used in zthread_fork
+//  Deprecated method, does nothing - to be removed after 2013/05/14
 
 int
 zctx_hwm (zctx_t *self)
 {
     assert (self);
-    return self->hwm;
+    return 0;
 }
 
 //  --------------------------------------------------------------------------

src/zthread.c

@@ -176,10 +176,8 @@ zthread_fork (zctx_t *ctx, zthread_attached_fn *thread_fn, void *args)
     shim_t *shim = NULL;
     //  Create our end of the pipe
     void *pipe = zsocket_new (ctx, ZMQ_PAIR);
-    if (pipe) {
-        zsocket_set_hwm (pipe, zctx_hwm (ctx));
+    if (pipe)
         zsocket_bind (pipe, "inproc://zctx-pipe-%p", pipe);
-    }
     else
         return NULL;