Changeset: cc2f871ea8bd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc2f871ea8bd
Modified Files:
sql/backends/monet5/UDF/cudf/udf.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/pyapi.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Match types and format strings.
Use (U)LLFMT for (u)lng and %lld/%llu for (unsigned) long long.
diffs (130 lines):
diff --git a/sql/backends/monet5/UDF/cudf/udf.c
b/sql/backends/monet5/UDF/cudf/udf.c
--- a/sql/backends/monet5/UDF/cudf/udf.c
+++ b/sql/backends/monet5/UDF/cudf/udf.c
@@ -187,13 +187,7 @@ UDFBATreverse(bat *ret, const bat *arg)
#ifdef HAVE_HGE
#define UI lng
-#ifdef HAVE_LONG_LONG
-#define UU unsigned long long
-#else
-#ifdef HAVE___INT64
-#define UU unsigned __int64
-#endif
-#endif
+#define UU ulng
#define UO hge
#include "udf_impl.h"
#undef UI
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -434,7 +434,7 @@ convert_and_append(BAT* b, const char* t
NP_COL_BAT_STR_LOOP(b, unsigned long, "%lu");
\
break;
\
case NPY_ULONGLONG:
\
- NP_COL_BAT_STR_LOOP(b, unsigned long long, ULLFMT);
\
+ NP_COL_BAT_STR_LOOP(b, ulng, ULLFMT);
\
break;
\
case NPY_FLOAT16:
\
case NPY_FLOAT:
\
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c
b/sql/backends/monet5/UDF/pyapi/pyapi.c
--- a/sql/backends/monet5/UDF/pyapi/pyapi.c
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.c
@@ -435,7 +435,7 @@ static str PyAPIeval(Client cntxt, MalBl
errno = 0;
msg = createException(
MAL, "waitpid",
- SQLSTATE(PY000) "Error calling
waitpid(%llu, &status, WNOHANG): %s",
+ SQLSTATE(PY000) "Error calling
waitpid(" ULLFMT ", &status, WNOHANG): %s",
pid, err);
break;
}
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -51,7 +51,7 @@ terminateProcess(pid_t pid, char *dbname
if (er != NULL) {
if (lock)
pthread_mutex_unlock(&fork_lock);
- Mfprintf(stderr, "cannot terminate process " LLFMT ": %s\n",
+ Mfprintf(stderr, "cannot terminate process %lld: %s\n",
(long long int)pid, er);
free(er);
free(dbname);
@@ -61,7 +61,7 @@ terminateProcess(pid_t pid, char *dbname
if (stats == NULL) {
if (lock)
pthread_mutex_unlock(&fork_lock);
- Mfprintf(stderr, "strange, process " LLFMT " serves database
'%s' "
+ Mfprintf(stderr, "strange, process %lld serves database '%s' "
"which does not exist\n", (long long int)pid,
dbname);
free(dbname);
return;
@@ -75,7 +75,7 @@ terminateProcess(pid_t pid, char *dbname
if (lock)
pthread_mutex_unlock(&fork_lock);
Mfprintf(stderr, "cannot shut down database '%s',
mserver "
- "(pid " LLFMT ") has crashed\n",
+ "(pid %lld) has crashed\n",
dbname, (long long int)pid);
msab_freeStatus(&stats);
free(dbname);
@@ -123,7 +123,7 @@ terminateProcess(pid_t pid, char *dbname
}
/* ok, once we get here, we'll be shutting down the server */
- Mfprintf(stdout, "sending process " LLFMT " (database '%s') the "
+ Mfprintf(stdout, "sending process %lld (database '%s') the "
"TERM signal\n", (long long int)pid, dbname);
kill(pid, SIGTERM);
kv = findConfKey(_mero_props, "exittimeout");
@@ -167,7 +167,7 @@ terminateProcess(pid_t pid, char *dbname
}
}
}
- Mfprintf(stderr, "timeout of %s seconds expired, sending process " LLFMT
+ Mfprintf(stderr, "timeout of %s seconds expired, sending process %lld"
" (database '%s') the KILL signal\n",
kv->val, (long long int)pid, dbname);
kill(pid, SIGKILL);
diff --git a/tools/merovingian/daemon/handlers.c
b/tools/merovingian/daemon/handlers.c
--- a/tools/merovingian/daemon/handlers.c
+++ b/tools/merovingian/daemon/handlers.c
@@ -156,13 +156,13 @@ void reinitialize(void)
#if O_CLOEXEC == 0
fcntl(t, F_SETFD, FD_CLOEXEC);
#endif
- Mfprintf(_mero_logfile, "%s END merovingian[" LLFMT "]: "
+ Mfprintf(_mero_logfile, "%s END merovingian[%lld]: "
"caught SIGHUP, closing logfile\n",
mytime, (long long int)_mero_topdp->next->pid);
fflush(_mero_logfile);
_mero_topdp->out = _mero_topdp->err = t;
_mero_logfile = fdopen(t, "a");
- Mfprintf(_mero_logfile, "%s BEG merovingian[" LLFMT "]: "
+ Mfprintf(_mero_logfile, "%s BEG merovingian[%lld]: "
"reopening logfile\n",
mytime, (long long int)_mero_topdp->next->pid);
}
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -150,7 +150,7 @@ logFD(int fd, char *type, char *dbname,
strftime(mytime, sizeof(mytime), "%Y-%m-%d %H:%M:%S", tmp);
while ((p = strchr(q, '\n')) != NULL) {
if (writeident == 1)
- fprintf(stream, "%s %s %s[" LLFMT "]: ",
+ fprintf(stream, "%s %s %s[%lld]: ",
mytime, type, dbname, pid);
*p = '\0';
fprintf(stream, "%s\n", q);
@@ -159,7 +159,7 @@ logFD(int fd, char *type, char *dbname,
}
if ((int)(q - buf) < len) {
if (writeident == 1)
- fprintf(stream, "%s %s %s[" LLFMT "]: ",
+ fprintf(stream, "%s %s %s[%lld]: ",
mytime, type, dbname, pid);
writeident = 0;
fprintf(stream, "%s\n", q);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
