Changeset: 48e8ef58b3c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/48e8ef58b3c3
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
Branch: scatter
Log Message:
fix memory to lng
diffs (36 lines):
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -194,7 +194,7 @@ typedef struct MALBLK {
/* During the run we keep track on the maximum number of concurrent
threads and memory claim */
int workers;
- int memory;
+ lng memory;
lng starttime; /* track when the query started, for
resource management */
lng runtime; /* average execution time of block in
ticks */
int calls; /* number of calls */
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -270,7 +270,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
if (!GDKembedded())
QRYqueue[qhead].username = GDKstrdup(cntxt->username);
QRYqueue[qhead].idx = cntxt->idx;
- QRYqueue[qhead].memory = (int) (stk->memory / LL_CONSTANT(1048576)); /*
Convert to MB */
+ QRYqueue[qhead].memory = (lng) (stk->memory / LL_CONSTANT(1048576)); /*
Convert to MB */
QRYqueue[qhead].workers = (int) 1; /* this is the first one */
QRYqueue[qhead].status = "running";
QRYqueue[qhead].cntxt = cntxt;
diff --git a/monetdb5/mal/mal_runtime.h b/monetdb5/mal/mal_runtime.h
--- a/monetdb5/mal/mal_runtime.h
+++ b/monetdb5/mal/mal_runtime.h
@@ -34,7 +34,7 @@ typedef struct QRYQUEUE{
str username;
int idx;
int workers;
- int memory;
+ lng memory;
lng ticks;
time_t start;
time_t finished;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
