Changeset: e4490ff7f8aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4490ff7f8aa
Modified Files:
monetdb5/mal/mal_interpreter.c
monetdb5/modules/mal/mal_weld.c
Branch: mal-weld
Log Message:
TODO better place to print \n
diffs (39 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -347,6 +347,12 @@ str runMAL(Client cntxt, MalBlkPtr mb, M
if (stk->cmd && env && stk->cmd != 'f')
stk->cmd = env->cmd;
ret = runMALsequence(cntxt, mb, 1, 0, stk, env, 0);
+ for (i = 0; i < mb->stop; i++) {
+ if (getModuleId(mb->stmt[i]) != NULL &&
strcmp(getModuleId(mb->stmt[i]), "weld") == 0) {
+ fprintf(stderr, "\n");
+ break;
+ }
+ }
/* pass the new debug mode to the caller */
if (stk->cmd && env && stk->cmd != 'f')
diff --git a/monetdb5/modules/mal/mal_weld.c b/monetdb5/modules/mal/mal_weld.c
--- a/monetdb5/modules/mal/mal_weld.c
+++ b/monetdb5/modules/mal/mal_weld.c
@@ -28,8 +28,6 @@
*(TYPE *)(*ADDR) = *(TYPE *)VALUE; /* set */
\
*ADDR += sizeof(TYPE); /* increase */
-MalBlkPtr oldMb = NULL; /* Keep track of new MAL programs so that we print the
compilation times on a separate line */
-
struct weldMinMax {
char i8min, i8max;
int i32min, i32max;
@@ -260,10 +258,6 @@ WeldRun(Client cntxt, MalBlkPtr mb, MalS
throw(MAL, "weld.run", PROGRAM_GENERAL ": %s",
weld_error_message(e));
}
long elapsed = getTimeNowMs() - start;
- if (oldMb != mb) {
- oldMb = mb;
- fprintf(stderr, "\n");
- }
fprintf(stderr, "%ld,", elapsed);
/* Prepare the input for Weld. We're building an array that has the
layout of a struct */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
