Add --single-thread option for HPC-GAP.

gap-system · Oct 24, 2019 · 5d7dad6 · 5d7dad6
1 parent dba9007
commit 5d7dad6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 6 deletions.
diff --git a/hpcgap/lib/hpc/thread.g b/hpcgap/lib/hpc/thread.g
@@ -100,7 +100,7 @@ BindGlobal("InstallHPCGAPSignalHandling", function()
   fi;
 end);
 
-if IsHPCGAP and THREAD_UI() then
+if IsHPCGAP and not SINGLE_THREAD_STARTUP() then
   InstallHPCGAPSignalHandling();
 fi;
 

diff --git a/lib/system.g b/lib/system.g
@@ -188,10 +188,12 @@ if IsHPCGAP then
     GAPInfo.TestData:= ThreadLocalRecord( rec() );
     APPEND_LIST_INTR(GAPInfo.CommandLineOptionData, [
         ,
-        rec( short:= "S", default := false, help := ["enable/disable single-threaded startup"] ),
+        rec( short:= "S", default := false, help := ["disable/enable multi-threaded interface"] ),
         rec( short:= "P", default := "0", arg := "<num>", help := ["set number of logical processors"] ),
         rec( short:= "G", default := "0", arg := "<num>", help := ["set number of GC threads"] ),
         rec( short:= "Z", default := false, help := ["enforce ordering of region locks"] ),
+        rec( long := "single-thread", default := false,
+             help := [ "enable/disable single-threaded startup" ]),
       ]);
 
     MakeImmutable(GAPInfo.CommandLineOptionData);

diff --git a/src/gap.c b/src/gap.c
@@ -1391,9 +1391,19 @@ static Obj FuncBREAKPOINT(Obj self, Obj arg)
 
 static Obj FuncTHREAD_UI(Obj self)
 {
-  return ThreadUI ? True : False;
+    return (ThreadUI && !SingleThreadStartup) ? True : False;
 }
 
+/****************************************************************************
+**
+*F  FuncSINGLE_THREAD_STARTUP . . whether to start up in single-threaded mode
+**
+*/
+
+static Obj FuncSINGLE_THREAD_STARTUP(Obj self)
+{
+    return SingleThreadStartup ? True : False;
+}
 
 #endif
 
@@ -1480,6 +1490,7 @@ static StructGVarFunc GVarFuncs[] = {
     GVAR_FUNC_0ARGS(KERNEL_INFO),
 #ifdef HPCGAP
     GVAR_FUNC_0ARGS(THREAD_UI),
+    GVAR_FUNC_0ARGS(SINGLE_THREAD_STARTUP),
 #endif
     GVAR_FUNC_1ARGS(MASTER_POINTER_NUMBER, ob),
     GVAR_FUNC_1ARGS(BREAKPOINT, integer),

diff --git a/src/hpc/misc.c b/src/hpc/misc.c
@@ -44,6 +44,12 @@ UInt SyNumProcessors = 4;
 */
 UInt SyNumGCThreads = 0;
 
+/****************************************************************************
+**
+*V  SingleThreadStartup . . . . . . . . .  start HPC-GAP with just one thread
+**
+*/
+UInt SingleThreadStartup = 0;
 
 /****************************************************************************
 **

diff --git a/src/hpc/misc.h b/src/hpc/misc.h
@@ -45,6 +45,13 @@ extern UInt SyNumProcessors;
 */
 extern UInt SyNumGCThreads;
 
+/****************************************************************************
+**
+*V  SingleThreadStartup . . . . . . . . .  start HPC-GAP with just one thread
+**
+*/
+extern UInt SingleThreadStartup;
+
 /****************************************************************************
 **
 *F  MergeSort() . . . . . . . . . . . . . . . sort an array using mergesort.

diff --git a/src/system.c b/src/system.c
@@ -1024,9 +1024,10 @@ static const struct optInfo options[] = {
   { 'q', "", toggle, &SyQuiet, 0 }, /* ?? */
 #ifdef HPCGAP
   { 'S', "", toggle, &ThreadUI, 0 }, /* Thread UI */
-  { 'Z', "", toggle, &DeadlockCheck, 0 }, /* Thread UI */
-  { 'P', "", storePosInteger, &SyNumProcessors, 1 }, /* Thread UI */
-  { 'G', "", storePosInteger, &SyNumGCThreads, 1 }, /* Thread UI */
+  { 'Z', "", toggle, &DeadlockCheck, 0 }, /* Deadlock prevention */
+  { 'P', "", storePosInteger, &SyNumProcessors, 1 }, /* number of CPUs */
+  { 'G', "", storePosInteger, &SyNumGCThreads, 1 }, /* number of GC threads */
+  { 0  , "single-thread", toggle, &SingleThreadStartup, 0 }, /* startup with one thread only */
 #endif
   /* The following options must be handled in the kernel so they are set up before loading the library */
   { 0  , "prof", enableProfilingAtStartup, 0, 1},    /* enable profiling at startup */