Changeset 5179a0 in git

Timestamp:

Jul 29, 2013, 6:33:46 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a4480646ef09cf15409cf635907aae92d5e81d7c

Parents:

cca4407deeb250aa255ceccd313c30b53dfd49f2

Message:

fix: signal handling stuff

Files:

• Singular/links/ssiLink.cc (modified) (9 diffs)
• configure.ac (modified) (1 diff)
• kernel/mod2.h (modified) (1 diff)

Singular/links/ssiLink.cc

@@ -72 +72 @@
 
 #ifdef HAVE_SIMPLEIPC
-#include <Singular/simpleipc.h>
+#include <Singular/links/simpleipc.h>
 #endif
 //#if (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
@@ -1565 +1565 @@
   si_link l;
   ssiInfo *d;
-  #ifdef HAVE_MPSR
-  MP_Link_pt dd;
-  #endif
   int d_fd;
   fd_set  mask, fdmask;
@@ -1575 +1572 @@
 
   /* timeout */
-  #ifdef HAVE_PSELECT
-  struct timespec wt;
-  struct timespec *wt_ptr=&wt;
-  #else
   struct timeval wt;
   struct timeval *wt_ptr=&wt;
-  #endif
   int startingtime = getRTimer()/TIMER_RESOLUTION;  // in seconds
   if (timeout== -1)
@@ -1590 +1582 @@
   {
     wt.tv_sec  = timeout / 1000000;
-  #ifdef HAVE_PSELECT
-    wt.tv_nsec = 1000 * (timeout % 1000000);
-  #else
     wt.tv_usec = timeout % 1000000;
-  #endif
-  }
-
-  /* signal mask for pselect() */
-  sigset_t sigmask;
-  if(sigprocmask(SIG_SETMASK, NULL, &sigmask) < 0)
-  {
-    WerrorS("error in sigprocmask()");
-    return -2;
-  }
-  if(sigaddset(&sigmask, SIGCHLD) < 0)
-  {
-    WerrorS("error in sigaddset()");
-    return -2;
   }
 
@@ -1632 +1607 @@
         && (strcmp(l->mode,"launch")!=0) && (strcmp(l->mode,"connect")!=0)))
       {
-        WerrorS("all links must be of type ssi:fork, ssi:tcp, ssi:connect,");
-        WerrorS(" MPtcp:fork or MPtcp:launch");
+        WerrorS("all links must be of type ssi:fork, ssi:tcp, ssi:connect");
         return -2;
       }
-    #ifdef HAVE_MPSR
-      if (strcmp(l->m->type,"ssi")==0)
-      {
-        d=(ssiInfo*)l->data;
-        d_fd=d->fd_read;
-        if (!s_isready(d->f_read))
-        {
-          FD_SET(d_fd, &fdmask);
-          if (d_fd > max_fd) max_fd=d_fd;
-        }
-        else
-          return i+1;
-      }
-      else
-      {
-        dd=(MP_Link_pt)l->data;
-        d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-        FD_SET(d_fd, &fdmask);
-        if (d_fd > max_fd) max_fd=d_fd;
-      }
-    #else
       d=(ssiInfo*)l->data;
       d_fd=d->fd_read;
@@ -1666 +1619 @@
       else
         return i+1;
-    #endif
     }
   }
@@ -1686 +1638 @@
   sipc_semaphore_release(0);
   #endif
-  #ifdef HAVE_PSELECT
-  s = si_pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
-  #else
-  SSI_BLOCK_CHLD;
   s = si_select(max_fd, &mask, NULL, NULL, wt_ptr);
-  SSI_UNBLOCK_CHLD;
-  #endif
   #ifdef HAVE_SIMPLEIPC
   sipc_semaphore_acquire(0);
@@ -1715 +1661 @@
       {
         l=(si_link)L->m[i].Data();
-        #ifdef HAVE_MPSR
-        if (strcmp(l->m->type,"ssi")!=0)
-        {
-          // for MP links, return here:
-          dd=(MP_Link_pt)l->data;
-          d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-          if(j==d_fd) return i+1;
-        }
-        else
-        {
-          d=(ssiInfo*)l->data;
-          d_fd=d->fd_read;
-          if(j==d_fd) break;
-        }
-        #else
         d=(ssiInfo*)l->data;
         d_fd=d->fd_read;
         if(j==d_fd) break;
-        #endif
       }
     }
@@ -1765 +1695 @@
              timeout - 1000000*(getRTimer()/TIMER_RESOLUTION - startingtime));
           wt.tv_sec  = timeout / 1000000;
-          #ifdef HAVE_PSELECT
-          wt.tv_nsec = 1000 * (timeout % 1000000);
-          #else
           wt.tv_usec = (timeout % 1000000);
-          #endif
         }
         goto do_select;

configure.ac

@@ -34 +34 @@
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h iostream.h)
+AC_CHECK_HEADERS(unistd.h iostream.h sys/time.h sys/times.h asm/sigcontext.h)
 
-AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv)
+AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv pselect)
 
 

kernel/mod2.h

@@ -56 +56 @@
 
 #endif
+
+/* include simpleipc/semaphore code, link against librt/libpthread */
+#define HAVE_SIMPLEIPC 1
+
 
 /* linear algebra extensions from pcv.h/pcv.cc */