Changeset: c61332b63eb4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c61332b63eb4
Modified Files:
cmake/monetdb-defines.cmake
gdk/gdk.h
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (42 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -316,7 +316,7 @@ macro(monetdb_configure_misc)
if(NOT DEFINED PYTHON3_LIBDIR)
# Used for installing testing python module (don't pass a location, else
we need to strip this again)
- execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import sysconfig;
print(sysconfig.get_path('purelib', vars={'base': ''})[1:])"
+ execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import sysconfig;
print((sysconfig.get_path('purelib', vars={'base':''}, scheme='rpm_prefix') if
'rpm_prefix' in sysconfig.get_scheme_names() else sysconfig.get_path('purelib',
vars={'base':''}))[1:])"
RESULT_VARIABLE PY3_LIBDIR_CODE
OUTPUT_VARIABLE PYTHON3_SITEDIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2306,17 +2306,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]
