Changeset: 61e182323067 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61e182323067
Modified Files:
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
Branch: default
Log Message:
Re-enable resource management
Avoid needed messages until they really matter.
diffs (46 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
@@ -179,6 +179,7 @@ MALresourceFairness(Client cntxt, MalBlk
lng delay, clk;
int threads;
double factor;
+ int delayed= 0;
threads= GDKnr_threads > 0? GDKnr_threads: 1;
if ( running == 0) // reset workers pool count
@@ -201,8 +202,7 @@ MALresourceFairness(Client cntxt, MalBlk
clk = DELAYUNIT;
}
- if ( 0 && clk >= DELAYUNIT ) {
- mnstr_printf(GDKstdout, "#delay %d initial "LLFMT"n",
cntxt->idx, clk);
+ if ( clk >= DELAYUNIT ) {
while (clk > 0) {
/* always keep one running to avoid all waiting */
if (running < 2)
@@ -215,8 +215,11 @@ MALresourceFairness(Client cntxt, MalBlk
delay = (long) (DELAYUNIT * (factor > 1.0 ? 1.0 :
factor));
delay = (long) (delay * running / threads);
running--;
- if (delay)
+ if (delay) {
+ if ( delayed++ == 0)
+ mnstr_printf(GDKstdout, "#delay
%d initial "LLFMT"n", cntxt->idx, clk);
MT_sleep_ms(delay);
+ }
running++;
clk -= DELAYUNIT;
}
diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -25,7 +25,7 @@
#define TIMESLICE 2000 /* ms */
#define DELAYUNIT 100 /* ms delay in parallel processing decissions */
-//#define USE_MAL_ADMISSION
+#define USE_MAL_ADMISSION
#ifdef USE_MAL_ADMISSION
mal_export int MALadmission(lng argclaim, lng hotclaim);
#endif
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
