Changeset: 44a57565c7f7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44a57565c7f7
Modified Files:
monetdb5/mal/mal_resource.c
Branch: leftmart
Log Message:
merge default
diffs (12 lines):
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -194,7 +194,7 @@ MALresourceFairness(lng usec)
clk = clk > FAIRNESS_THRESHOLD? FAIRNESS_THRESHOLD:clk;
/* always keep one running to avoid all waiting */
- while (clk > DELAYUNIT && users > 1 && mal_running > (size_t)
GDKnr_threads && rss > MEMORY_THRESHOLD) {
+ while (clk > DELAYUNIT && users > 1 && mal_running > GDKnr_threads &&
rss > MEMORY_THRESHOLD) {
if ( delayed++ == 0){
PARDEBUG mnstr_printf(GDKstdout, "#delay
initial ["LLFMT"] memory "SZFMT"[%f]\n", clk, rss, MEMORY_THRESHOLD );
PARDEBUG mnstr_flush(GDKstdout);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
