Changeset: 77627d2790ca for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/77627d2790ca Modified Files: gdk/ChangeLog.Jan2022 gdk/gdk.h Branch: Jan2022 Log Message:
Use timeout mechanism also for exit. diffs (42 lines): diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022 --- a/gdk/ChangeLog.Jan2022 +++ b/gdk/ChangeLog.Jan2022 @@ -1,3 +1,7 @@ # ChangeLog file for GDK # This file is updated with Maddlog +* Tue May 10 2022 Sjoerd Mullender <[email protected]> +- When exiting, long running instructions are aborted using the same + mechanism that is used for query timeouts. + diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -2336,20 +2336,19 @@ gdk_export BAT *BATsample_with_seed(BAT #define GDK_CHECK_TIMEOUT_BODY(timeoffset, callback) \ do { \ - if (timeoffset && GDKusec() > timeoffset) { \ + if (GDKexiting() || \ + (timeoffset && GDKusec() > timeoffset)) { \ callback; \ } \ } while (0) #define GDK_CHECK_TIMEOUT(timeoffset, counter, callback) \ do { \ - if (timeoffset) { \ - if (counter > CHECK_QRY_TIMEOUT_STEP) { \ - GDK_CHECK_TIMEOUT_BODY(timeoffset, callback); \ - counter = 0; \ - } else { \ - counter++; \ - } \ + if (counter > CHECK_QRY_TIMEOUT_STEP) { \ + GDK_CHECK_TIMEOUT_BODY(timeoffset, callback); \ + counter = 0; \ + } else { \ + counter++; \ } \ } while (0) _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
