Changeset: f6f52896c50c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6f52896c50c
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_private.h
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (65 lines):
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -34,7 +34,6 @@ MT_Lock mal_remoteLock MT_LOCK_INITI
MT_Lock mal_profileLock MT_LOCK_INITIALIZER("mal_profileLock");
MT_Lock mal_copyLock MT_LOCK_INITIALIZER("mal_copyLock");
MT_Lock mal_delayLock MT_LOCK_INITIALIZER("mal_delayLock");
-MT_Sema mal_parallelism;
/*
* Initialization of the MAL context
* The compiler directive STRUCT_ALIGNED tells that the
@@ -77,11 +76,6 @@ int mal_init(void){
MT_lock_init( &mal_copyLock, "mal_copyLock");
MT_lock_init( &mal_delayLock, "mal_delayLock");
#endif
- /* "/2" is arbitrarily used / chosen, as on systems with
- * hyper-threading enabled, using all hardware threads rather than
- * "only" all physical cores does not necessarily yield a linear
- * performance benefit */
- MT_sema_init( &mal_parallelism, (GDKnr_threads > 1 ? GDKnr_threads/2:
1), "mal_parallelism");
tstAligned();
MCinit();
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
@@ -417,15 +417,8 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
int i;
ValPtr lhs;
InstrPtr pci = getInstrPtr(mb, 0);
-
- /*
- * Control the level of parallelism. The maximum number of
- * concurrent MAL plans is determined by an environment
- * variable. It is initially set equal to the number of cores,
- * which may be too coarse.
- */
+
cntxt->lastcmd= time(0);
- MT_sema_down(&mal_parallelism,"callMAL");
#ifdef DEBUG_CALLMAL
mnstr_printf(cntxt->fdout, "callMAL\n");
printInstruction(cntxt->fdout, mb, 0, pci, LIST_MAL_ALL);
@@ -460,10 +453,8 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
case PATcall:
case CMDcall:
default:
- MT_sema_up(&mal_parallelism,"callMAL");
throw(MAL, "mal.interpreter", RUNTIME_UNKNOWN_INSTRUCTION);
}
- MT_sema_up(&mal_parallelism,"callMAL");
if ( ret == MAL_SUCCEED && cntxt->qtimeout && GDKusec()- mb->starttime
> cntxt->qtimeout)
throw(MAL, "mal.interpreter", RUNTIME_QRY_TIMEOUT);
return ret;
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -59,7 +59,6 @@
__attribute__((__visibility__("hidden")));
__hidden extern MT_Lock mal_namespaceLock;
-__hidden extern MT_Sema mal_parallelism;
__hidden int mdbInit(void)
__attribute__((__visibility__("hidden")));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
