[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - Remove superflous information which is only u...
From:       Martin_Kersten <commits+mk=cwi.nl () monetdb ! org>
Date:       2021-05-28 7:37:15
Message-ID: hg.7b868e596a2a.1622187435.-7512121813876574003 () monetdb-vm0 ! spin-off ! cwi ! nl
[Download RAW message or body]

Changeset: 7b868e596a2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b868e596a2a
Modified Files:
	monetdb5/mal/mal.h
	monetdb5/mal/mal_instruction.c
	monetdb5/optimizer/opt_dataflow.c
	monetdb5/optimizer/opt_mitosis.c
Branch: default
Log Message:

Remove superflous information which is only used in mitosis


diffs (54 lines):

diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -195,7 +195,6 @@ typedef struct MALBLK {
 	lng runtime;			/* average execution time of block in ticks */
 	int calls;				/* number of calls */
 	lng optimize;			/* total optimizer time */
-	int activeClients;		/* load during mitosis optimization */
 } *MalBlkPtr, MalBlkRecord;
 
 #define STACKINCR   128
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -133,7 +133,6 @@ newMalBlk(int elements)
 	mb->calls = 0;
 	mb->optimize = 0;
 	mb->stmt = NULL;
-	mb->activeClients = 1;
 	if (newMalBlkStmt(mb, elements) < 0) {
 		GDKfree(mb->var);
 		GDKfree(mb->stmt);
@@ -273,7 +272,6 @@ copyMalBlk(MalBlkPtr old)
 		return NULL;
 	}
 
-	mb->activeClients = 1;
 	mb->vsize = old->vsize;
 	mb->vtop = old->vtop;
 	mb->vid = old->vid;
diff --git a/monetdb5/optimizer/opt_dataflow.c b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -363,7 +363,7 @@ OPTdataflowImplementation(Client cntxt, 
 	str msg = MAL_SUCCEED;
 
 	/* don't use dataflow on single processor systems */
-	if (GDKnr_threads <= 1)
+	if (GDKnr_threads <= 1 || cntxt->workerlimit == 1)
 		return MAL_SUCCEED;
 
 	if ( optimizerIsApplied(mb,"dataflow"))
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -143,7 +143,7 @@ OPTmitosisImplementation(Client cntxt, M
 	 * because all user together are responsible for resource contentions
 	 */
 	cntxt->idle = 0; // this one is definitely not idle
-	activeClients = mb->activeClients = MCactiveClients();
+	activeClients = MCactiveClients();
 
 /* This code was used to experiment with block sizes, mis-using the memorylimit  variable
 	if (cntxt->memorylimit){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]