Changeset c848e3 in git

Timestamp:

Mar 22, 2012, 3:30:54 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0bae3e12c3651cf05e6cc405368481bcbbe0dbff

Parents:

7d63e1e0792380ed518adc5f2805eb4abcb1ee55

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-03-22 15:30:54+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-09-12 13:19:30+02:00

Message:

chg: re-enable system("cpu"), change setting of semaphore 0
(cherry picked from commit 71871dcf30b201439f1a4885b5dd9f6ecd140938)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>

Location:

Singular

Files:

• extra.cc (modified) (1 diff)
• tesths.cc (modified) (1 diff)

Singular/extra.cc

@@ -314 +314 @@
     if(strcmp(sys_cmd,"cpu")==0)
     {
-      res->data=(void *)feOptValue(FE_OPT_CPUS);
+      long cpu=1; //feOptValue(FE_OPT_CPUS);
+      #ifdef _SC_NPROCESSORS_ONLN
+      cpu=sysconf(_SC_NPROCESSORS_ONLN);
+      #elif defined(_SC_NPROCESSORS_CONF)
+      cpu=sysconf(_SC_NPROCESSORS_CONF);
+      #endif
+      res->data=(void *)cpu;
       res->rtyp=INT_CMD;
       return FALSE;

Singular/tesths.cc

@@ -136 +136 @@
   feOptIndex cpu_opt = feGetOptIndex("cpus");
   int cpus = (int)(long)feOptValue(FE_OPT_CPUS);
-  sipc_semaphore_init(0, cpus);
+  sipc_semaphore_init(0, cpus-1);
 #endif