Changeset e61d3fe in git

Timestamp:

Sep 12, 2013, 2:36:10 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

23fb95c1e215ef122b642006b6c3130ee96b8329

Parents:

63c9a7737466fd0b090092ded4895b1b0ce064fba30cafedcb561c528ef5fd1c2dfae0fe72880b5e

Message:

Merge pull request #369 from steenpass/changes_from_master

Changes from master

Location:

Singular

Files:

• extra.cc (modified) (1 diff)
• links/silink.cc (modified) (1 diff)
• misc_ip.cc (modified) (2 diffs)
• si_signals.h (modified) (1 diff)
• tesths.cc (modified) (1 diff)

Singular/extra.cc

@@ -314 +314 @@
     if(strcmp(sys_cmd,"cpu")==0)
     {
+      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;
-      #ifdef _SC_NPROCESSORS_ONLN
-      res->data=(void *)sysconf(_SC_NPROCESSORS_ONLN);
-      #elif defined(_SC_NPROCESSORS_CONF)
-      res->data=(void *)sysconf(_SC_NPROCESSORS_CONF);
-      #else
-      // dummy, if not defined:
-      res->data=(void *)1;
-      #endif
       return FALSE;
     }

Singular/links/silink.cc

@@ -148 +148 @@
 {
   slCleanUp(l);
-  if (l->ref == 0)
+  if ((l!=NULL) &&(l->ref == 0))
     omFreeBin((ADDRESS)l,  ip_link_bin);
 }

Singular/misc_ip.cc

@@ -1074 +1074 @@
   #endif
   fe_reset_input_mode();
-  idhdl h = IDROOT;
-  while(h != NULL)
-  {
-    if(IDTYP(h) == LINK_CMD)
-    {
-      idhdl hh=h->next;
-      killhdl(h, currPack);
-      h = hh;
-    }
-    else
-    {
-      h = h->next;
-    }
-  }
-  if(!singular_in_batchmode)
+  if (ssiToBeClosed_inactive)
+  {
+    link_list hh=ssiToBeClosed;
+    while(hh!=NULL)
+    {
+      //Print("close %s\n",hh->l->name);
+      slPrepClose(hh->l);
+      hh=(link_list)hh->next;
+    }
+    ssiToBeClosed_inactive=FALSE;
+
+    idhdl h = currPack->idroot;
+    while(h != NULL)
+    {
+      if(IDTYP(h) == LINK_CMD)
+      {
+        idhdl hh=h->next;
+        //Print("kill %s\n",IDID(h));
+        killhdl(h, currPack);
+        h = hh;
+      }
+      else
+      {
+        h = h->next;
+      }
+    }
+    hh=ssiToBeClosed;
+    while(hh!=NULL)
+    {
+      //Print("close %s\n",hh->l->name);
+      slClose(hh->l);
+      hh=ssiToBeClosed;
+    }
+  }
+  if (!singular_in_batchmode)
   {
     if (i<=0)
@@ -1215 +1235 @@
   slStandardInit();
   myynest=0;
+// semapohore 0 -----------------------------------------------------
+  int cpus=2;
+  int cpu_n;
+  #ifdef _SC_NPROCESSORS_ONLN
+  if ((cpu_n=sysconf(_SC_NPROCESSORS_ONLN))>cpus) cpus=cpu_n;
+  #elif defined(_SC_NPROCESSORS_CONF)
+  if ((cpu_n=sysconf(_SC_NPROCESSORS_CONF))>cpus) cpus=cpu_n;
+  #endif
+  feSetOptValue(FE_OPT_CPUS, cpus);
 
 // loading standard.lib -----------------------------------------------

Singular/si_signals.h

@@ -48 +48 @@
                    )
 
-#ifdef HAVE_PSELECT
-SI_EINTR_SAVE_FUNC(int, pselect,
-                   (int nfds, fd_set *readfds, fd_set *writefds,
-                    fd_set *exceptfds, const struct timespec *timeout,
-                    const sigset_t *sigmask),
-                   (nfds, readfds, writefds, exceptfds, timeout,sigmask)
-                   )
-#endif
-
 SI_EINTR_SAVE_FUNC(pid_t, wait, (int *status), (status))
 SI_EINTR_SAVE_FUNC(pid_t, waitpid, (pid_t pid, int *status, int options),

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