Merge pull request #1608 from bluca/zsys_shutdown

Problem: atexit does not work when building a Windows DLL
zeromq · Jan 20, 2017 · 4af97ee · 4af97ee
2 parents d08c201 + d77bfc5
commit 4af97ee
Show file tree

Hide file tree

Showing 37 changed files with 445 additions and 123 deletions.
diff --git a/README.md b/README.md
diff --git a/include/zsys.h b/include/zsys.h
@@ -35,7 +35,8 @@ CZMQ_EXPORT void *
 //  Optionally shut down the CZMQ zsys layer; this normally happens automatically
 //  when the process exits; however this call lets you force a shutdown
 //  earlier, avoiding any potential problems with atexit() ordering, especially
-//  with Windows dlls.
+//  with Windows DLL builds, where atexit() does not work and zsys_shutdown has
+//  to be called manually.
 CZMQ_EXPORT void
     zsys_shutdown (void);
 

diff --git a/src/czmq_selftest.c b/src/czmq_selftest.c
@@ -202,10 +202,6 @@ main (int argc, char **argv)
     else
         test_runall (verbose);
 
-#if defined (__WINDOWS__)
-    zsys_shutdown();
-#endif
-
     return 0;
 }
 /*

diff --git a/src/test_zgossip.c b/src/test_zgossip.c
@@ -178,5 +178,9 @@ main (int argn, char *argv [])
 
     printf ("(100%%) OK\n");
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
     return 0;
 }
diff --git a/src/zactor.c b/src/zactor.c
@@ -284,6 +284,10 @@ zactor_test (bool verbose)
     assert (streq (string, "This is a string"));
     free (string);
     zactor_destroy (&actor);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zarmour.c b/src/zarmour.c
@@ -931,6 +931,10 @@ zarmour_test (bool verbose)
 #endif
 
     zarmour_destroy (&self);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zauth.c b/src/zauth.c
@@ -755,7 +755,12 @@ zauth_test (bool verbose)
     assert (dir);
     zdir_remove (dir, true);
     zdir_destroy (&dir);
-    //  @end
 #endif
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
+    //  @end
     printf ("OK\n");
 }
diff --git a/src/zbeacon.c b/src/zbeacon.c
@@ -476,6 +476,10 @@ zbeacon_test (bool verbose)
     zactor_destroy (&node1);
     zactor_destroy (&node2);
     zactor_destroy (&node3);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zcert.c b/src/zcert.c
@@ -485,6 +485,10 @@ zcert_test (bool verbose)
     assert (dir);
     zdir_remove (dir, true);
     zdir_destroy (&dir);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zcertstore.c b/src/zcertstore.c
@@ -348,6 +348,10 @@ zcertstore_test (bool verbose)
     assert (dir);
     zdir_remove (dir, true);
     zdir_destroy (&dir);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zchunk.c b/src/zchunk.c
@@ -599,6 +599,10 @@ zchunk_test (bool verbose)
     assert (memcmp (zchunk_data (chunk), "ghij", 4) == 0);
     zchunk_destroy (&copy);
     zchunk_destroy (&chunk);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zclock.c b/src/zclock.c
@@ -227,6 +227,10 @@ zclock_test (bool verbose)
     if (verbose)
         puts (timestr);
     free (timestr);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zconfig.c b/src/zconfig.c
@@ -1025,6 +1025,10 @@ zconfig_test (bool verbose)
     assert (dir);
     zdir_remove (dir, true);
     zdir_destroy (&dir);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zdigest.c b/src/zdigest.c
@@ -153,6 +153,10 @@ zdigest_test (bool verbose)
                    "DEB23807D4FE025E900FE9A9C7D8410C3DDE9671"));
     zdigest_destroy (&digest);
     free (buffer);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zdir.c b/src/zdir.c
@@ -1044,6 +1044,10 @@ zdir_test (bool verbose)
     zdir_t *testdir = zdir_new ("zdir-test-dir", NULL);
     zdir_remove (testdir, true);
     zdir_destroy (&testdir);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zdir_patch.c b/src/zdir_patch.c
@@ -204,6 +204,10 @@ zdir_patch_test (bool verbose)
     assert (streq (zfile_filename (file, "."), "bilbo"));
     assert (streq (zdir_patch_vpath (patch), "/bilbo"));
     zdir_patch_destroy (&patch);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zfile.c b/src/zfile.c
@@ -736,9 +736,14 @@ zfile_test (bool verbose)
     assert (zchunk_streq (chunk, "6789"));
     zchunk_destroy (&chunk);
     zfile_remove (file);
-    //  @end
     zfile_close (file);
     zfile_destroy (&file);
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
+    //  @end
+
     printf ("OK\n");
 }
diff --git a/src/zframe.c b/src/zframe.c
@@ -732,6 +732,10 @@ zframe_test (bool verbose)
     zsock_destroy (&radio);
 #endif
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zgossip.c b/src/zgossip.c
@@ -520,6 +520,10 @@ zgossip_test (bool verbose)
     zactor_destroy (&alpha);
     zactor_destroy (&beta);
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zgossip_msg.c b/src/zgossip_msg.c
@@ -678,6 +678,10 @@ zgossip_msg_test (bool verbose)
     zgossip_msg_destroy (&self);
     zsock_destroy (&input);
     zsock_destroy (&output);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zhash.c b/src/zhash.c
@@ -946,6 +946,10 @@ zhash_test (bool verbose)
     assert (streq ((char *) zhash_lookup (hash, "key1"), "This is a string"));
     assert (streq ((char *) zhash_lookup (hash, "key2"), "Ring a ding ding"));
     zhash_destroy (&hash);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zhashx.c b/src/zhashx.c
@@ -1302,6 +1302,10 @@ zhashx_test (bool verbose)
     assert (streq ((char *) zhashx_lookup (hash, "key1"), "This is a string"));
     assert (streq ((char *) zhashx_lookup (hash, "key2"), "Ring a ding ding"));
     zhashx_destroy (&hash);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/ziflist.c b/src/ziflist.c
@@ -385,6 +385,10 @@ ziflist_test (bool verbose)
     ziflist_reload (iflist);
     assert (items == ziflist_size (iflist));
     ziflist_destroy (&iflist);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zlist.c b/src/zlist.c
@@ -624,6 +624,10 @@ zlist_test (bool verbose)
 
     zlist_destroy (&list);
     assert (list == NULL);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zlistx.c b/src/zlistx.c
@@ -743,6 +743,10 @@ zlistx_test (bool verbose)
 
     zlistx_purge (list);
     zlistx_destroy (&list);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zloop.c b/src/zloop.c
@@ -947,6 +947,10 @@ zloop_test (bool verbose)
 
     zsock_destroy (&input);
     zsock_destroy (&output);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zmonitor.c b/src/zmonitor.c
@@ -392,6 +392,10 @@ zmonitor_test (bool verbose)
     zsock_destroy (&client);
     zsock_destroy (&server);
 #endif
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zmsg.c b/src/zmsg.c
@@ -1240,6 +1240,10 @@ zmsg_test (bool verbose)
     zframe_destroy (&frame);
     zmsg_destroy (&msg);
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zpoller.c b/src/zpoller.c
@@ -387,6 +387,10 @@ zpoller_test (bool verbose)
     zsock_destroy (&client);
     zsock_destroy (&server);
 #endif
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zproxy.c b/src/zproxy.c
@@ -547,11 +547,11 @@ zproxy_test (bool verbose)
     proxy = zactor_new (zproxy, NULL);
     assert (proxy);
 
-#ifdef  WIN32
+#ifdef  WIN32
 	sink = zsock_new_sub(">inproc://backend", "whatever");
-#else
-	sink = zsock_new_sub (">ipc://backend", "whatever");
-#endif //  WIN32
+#else
+	sink = zsock_new_sub (">ipc://backend", "whatever");
+#endif //  WIN32
 	assert (sink);
 
 #ifdef WIN32
@@ -731,6 +731,10 @@ zproxy_test (bool verbose)
     zsys_file_delete (TESTDIR "/mycert.txt");
     zsys_dir_delete (TESTDIR);
 #endif
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 }
diff --git a/src/zrex.c b/src/zrex.c
@@ -300,6 +300,10 @@ zrex_test (bool verbose)
     assert (streq (zrex_hit (rex, 1), "CURVE"));
     assert (streq (mechanism, "CURVE"));
     zrex_destroy (&rex);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
 
     //  @end
     printf ("OK\n");

diff --git a/src/zsock.c b/src/zsock.c
@@ -2184,4 +2184,8 @@ zsock_test (bool verbose)
     //  @end
     printf ("OK\n");
     zsock_option_test (verbose);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
 }
diff --git a/src/zstr.c b/src/zstr.c
@@ -386,6 +386,10 @@ zstr_test (bool verbose)
     zsock_destroy (&client);
     zsock_destroy (&server);
 #endif
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
 
     printf ("OK\n");

diff --git a/src/zsys.c b/src/zsys.c
@@ -1881,5 +1881,9 @@ zsys_test (bool verbose)
     zsys_set_max_msgsz (-1);
     assert (zsys_max_msgsz () == 2000);
 
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
+
     printf ("OK\n");
 }
diff --git a/src/ztimerset.c b/src/ztimerset.c
@@ -217,6 +217,10 @@ ztimerset_test (bool verbose)
     assert (timeout2 > timeout);
 
     ztimerset_destroy (&self);
+
+#if defined (__WINDOWS__)
+    zsys_shutdown();
+#endif
     //  @end
     printf ("OK\n");
 #endif