Changeset bc0d32 in git for Singular/links/ssiLink.cc

Timestamp:

Apr 9, 2013, 3:33:02 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bdda8c2a271e7650c11462d22c70cd15d21d34f1

Parents:

f8565ac2b56eae4e46fb63670efa1bc402ae3628

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-09 15:33:02+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-09 15:33:47+02:00

Message:

add: handling signals in systyem calls

File:

• Singular/links/ssiLink.cc (modified) (16 diffs)

Singular/links/ssiLink.cc

@@ -25 +25 @@
 #include "config.h"
 #include <kernel/mod2.h>
+#include <Singular/si_signals.h>
 
 #include <omalloc/omalloc.h>
@@ -832 +833 @@
           ssiToBeClosed->next=NULL;
           SSI_BLOCK_CHLD;
-          close(pc[1]); close(cp[0]);
+          si_close(pc[1]); si_close(cp[0]);
           d->f_write=fdopen(cp[1],"w");
           SSI_UNBLOCK_CHLD;
@@ -869 +870 @@
           d->pid=pid;
           SSI_BLOCK_CHLD;
-          close(pc[0]); close(cp[1]);
+          si_close(pc[0]); si_close(cp[1]);
           d->f_write=fdopen(pc[1],"w");
           SSI_UNBLOCK_CHLD;
@@ -919 +920 @@
         Print("waiting on port %d\n", portno);mflush();
         listen(sockfd,1);
-        newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+        newsockfd = si_accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
         if(newsockfd < 0)
         {
@@ -933 +934 @@
         d->f_write = fdopen(newsockfd, "w");
         SI_LINK_SET_RW_OPEN_P(l);
-        close(sockfd);
+        si_close(sockfd);
       }
       // no ssi-Link on stdin or stdout
@@ -1008 +1009 @@
         omFree(ser_host);
         clilen = sizeof(cli_addr);
-        newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+        newsockfd = si_accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
         if(newsockfd < 0)
         {
@@ -1022 +1023 @@
         SSI_BLOCK_CHLD;
         d->f_write = fdopen(newsockfd, "w");
-        close(sockfd);
+        si_close(sockfd);
         SSI_UNBLOCK_CHLD;
         SI_LINK_SET_RW_OPEN_P(l);
@@ -1052 +1053 @@
                 server->h_length);
           serv_addr.sin_port = htons(portno);
-          if (connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
+          if (si_connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
           { Werror("ERROR connecting(errno=%d)",errno); return TRUE; }
           //PrintS("connected\n");mflush();
@@ -1162 +1163 @@
       if (d->r!=NULL) rKill(d->r);
       if ((d->pid!=0)
-      && (waitpid(d->pid,NULL,WNOHANG)==0))
+      && (si_waitpid(d->pid,NULL,WNOHANG)==0))
       {
         struct timespec t;
@@ -1168 +1169 @@
         t.tv_nsec=50000000; // <=50 ms
         int r=nanosleep(&t,NULL);
-        if((r==0) && (waitpid(d->pid,NULL,WNOHANG)==0))
+        if((r==0) && (si_waitpid(d->pid,NULL,WNOHANG)==0))
         {
           kill(d->pid,15);
@@ -1174 +1175 @@
           t.tv_nsec=10000000; // <=10 ms
           r=nanosleep(&t,NULL);
-          if((r==0)&&(waitpid(d->pid,NULL,WNOHANG)==0))
+          if((r==0)&&(si_waitpid(d->pid,NULL,WNOHANG)==0))
           {
             kill(d->pid,9); // just to be sure
-            waitpid(d->pid,NULL,0);
+            si_waitpid(d->pid,NULL,0);
           }
         }
@@ -1498 +1499 @@
       //Print("test fd %d\n",d->fd_read);
     /* check with select: chars waiting: no -> not ready */
-      switch (select(d->fd_read+1, &mask, NULL, NULL, &wt))
+      switch (si_select(d->fd_read+1, &mask, NULL, NULL, &wt))
       {
         case 0: /* not ready */ return "not ready";
@@ -1669 +1670 @@
   #endif
   #ifdef HAVE_PSELECT
-  s = pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
+  s = si_pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
   #else
   SSI_BLOCK_CHLD;
-  s = select(max_fd, &mask, NULL, NULL, wt_ptr);
+  s = si_select(max_fd, &mask, NULL, NULL, wt_ptr);
   SSI_UNBLOCK_CHLD;
   #endif
@@ -1848 +1849 @@
   struct sockaddr_in cli_addr;
   int clilen = sizeof(cli_addr);
-  int newsockfd = accept(ssiReserved_sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+  int newsockfd = si_accept(ssiReserved_sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
   if(newsockfd < 0)
   {
@@ -1894 +1895 @@
   {
     ssiReserved_P=0;
-    close(ssiReserved_sockfd);
+    si_close(ssiReserved_sockfd);
   }
   return l;
@@ -1919 +1920 @@
   loop
   {
-    kidpid = waitpid(-1, &status, WNOHANG);
+    kidpid = si_waitpid(-1, &status, WNOHANG);
     if (kidpid==-1)
     {