MonetDB: Jul2015 - When exiting, exit.

[Sjoerd Mullender]

Changeset: e7474ae2fc10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7474ae2fc10
Modified Files:
        sql/storage/store.c
Branch: Jul2015
Log Message:

When exiting, exit.

This fixes bug 3975.


diffs (25 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1632,7 +1632,11 @@ store_manager(void)
                                return;
                }
                MT_lock_set(&bs_lock, "store_manager");
-               if (GDKexiting() || logger_funcs.changes() < 1000000) {
+               if (GDKexiting()) {
+                       MT_lock_unset(&bs_lock, "store_manager");
+                       return;
+               }
+               if (logger_funcs.changes() < 1000000) {
                        MT_lock_unset(&bs_lock, "store_manager");
                        continue;
                }
@@ -1640,7 +1644,7 @@ store_manager(void)
                        MT_lock_unset(&bs_lock, "store_manager");
                        MT_sleep_ms(50);
                        if (GDKexiting())
-                               continue;
+                               return;
                        MT_lock_set(&bs_lock, "store_manager");
                }
                logging = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list