Changeset: 9a1b535f9c76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9a1b535f9c76
Modified Files:
gdk/gdk.h
Branch: Jan2022
Log Message:
Use different message for "timeout" due to exit.
diffs (30 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2323,17 +2323,18 @@ gdk_export BAT *BATsample_with_seed(BAT
#define CHECK_QRY_TIMEOUT_MASK (CHECK_QRY_TIMEOUT_STEP - 1)
#define TIMEOUT_MSG "Timeout was reached!"
+#define EXITING_MSG "Server is exiting!"
-#define TIMEOUT_HANDLER(rtpe) \
- do { \
- GDKerror(TIMEOUT_MSG); \
- return rtpe; \
+#define TIMEOUT_HANDLER(rtpe) \
+ do { \
+ GDKerror("%s\n", GDKexiting() ? EXITING_MSG : TIMEOUT_MSG); \
+ return rtpe; \
} while(0)
-#define GOTO_LABEL_TIMEOUT_HANDLER(label) \
- do { \
- GDKerror(TIMEOUT_MSG); \
- goto label; \
+#define GOTO_LABEL_TIMEOUT_HANDLER(label) \
+ do { \
+ GDKerror("%s\n", GDKexiting() ? EXITING_MSG : TIMEOUT_MSG); \
+ goto label; \
} while(0)
#define GDK_CHECK_TIMEOUT_BODY(timeoffset, callback) \
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
