Changeset: bb7e5c5cb1ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb7e5c5cb1ce
Modified Files:
gdk/gdk_utils.c
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
avoid double properties
diffs (29 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1360,7 +1360,11 @@ GDKusec(void)
return (lng) (f.QuadPart / 10);
#elif defined(HAVE_CLOCK_GETTIME)
struct timespec ts;
- clock_gettime(CLOCK_REALTIME, &ts);
+#undef CLOCK_REALTIME_COARSE
+#ifdef CLOCK_REALTIME_COARSE
+ if (clock_gettime(CLOCK_REALTIME_COARSE, &ts) < 0)
+#endif
+ (void) clock_gettime(CLOCK_REALTIME, &ts);
return (lng) (ts.tv_sec * LL_CONSTANT(1000000) + ts.tv_nsec / 1000);
#elif defined(HAVE_GETTIMEOFDAY)
struct timeval tv;
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -254,9 +254,6 @@ This information can be used to determin
logadd(",\"nonil\":%d",
d->tnonil);
logadd(",\"nil\":%d", d->tnil);
logadd(",\"key\":%d", d->tkey);
- logadd(",\"hash\":%d", d->thash
!= NULL);
- logadd(",\"imprints\":%d",
d->timprints != NULL);
- logadd(",\"orderidx\":%d",
d->torderidx != NULL);
cv =
VALformat(&stk->stk[getArg(pci,j)]);
c = strchr(cv, '>');
*c = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
