Fixes assertion error, when destroing ctx while creating a socket from a different thread: ./src/mutex.hpp:123

ukeller · ukeller · commit 971092e472b5 · 2015-10-02T16:32:36.000+02:00
diff --git a/zmq.hpp b/zmq.hpp
@@ -372,16 +372,14 @@ namespace zmq
 
         inline ~context_t () ZMQ_NOTHROW
         {
-            close();
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
         }
 
         inline void close() ZMQ_NOTHROW
         {
-            if (ptr == NULL)
-                return;
-            int rc = zmq_ctx_destroy (ptr);
+            int rc = zmq_ctx_shutdown (ptr);
             ZMQ_ASSERT (rc == 0);
-            ptr = NULL;
         }
 
         //  Be careful with this, it's probably only useful for

Original file line number	Diff line number	Diff line change
`@@ -372,16 +372,14 @@ namespace zmq`
`372`	`372`
`373`	`373`	`inline ~context_t () ZMQ_NOTHROW`
`374`	`374`	`{`
`375`		`- close();`
	`375`	`+ int rc = zmq_ctx_destroy (ptr);`
	`376`	`+ ZMQ_ASSERT (rc == 0);`
`376`	`377`	`}`
`377`	`378`
`378`	`379`	`inline void close() ZMQ_NOTHROW`
`379`	`380`	`{`
`380`		`- if (ptr == NULL)`
`381`		`- return;`
`382`		`- int rc = zmq_ctx_destroy (ptr);`
	`381`	`+ int rc = zmq_ctx_shutdown (ptr);`
`383`	`382`	`ZMQ_ASSERT (rc == 0);`
`384`		`- ptr = NULL;`
`385`	`383`	`}`
`386`	`384`
`387`	`385`	`// Be careful with this, it's probably only useful for`