Changeset 52f95b in git

Timestamp:

Aug 7, 2013, 5:20:45 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

46e869cc5ffe6ff2378166330f78fca4a2bb2f0d

Parents:

0509a99879516c51900bcab0307422a7b2214004

Message:

fix: removed MPSR stuff

File:

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

Singular/links/ssiLink.cc

@@ -45 +45 @@
 #include <Singular/links/s_buff.h>
 #include <Singular/links/ssiLink.h>
-
-#ifdef HAVE_MPSR
-#include <Singular/mpsr.h>
-#endif
 
 #ifdef HAVE_SIMPLEIPC
@@ -1491 +1487 @@
   si_link l;
   ssiInfo *d;
-  #ifdef HAVE_MPSR
-  MP_Link_pt dd;
-  #endif
   int d_fd;
   fd_set  mask, fdmask;
@@ -1536 +1529 @@
         && (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)
       {
@@ -1555 +1546 @@
       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;
-      if (!s_isready(d->f_read))
-      {
-        FD_SET(d_fd, &fdmask);
-        if (d_fd > max_fd) max_fd=d_fd;
-      }
-      else
-        return i+1;
-    #endif
+        Werror("wrong link type >>%s<<",l->m->type);
+        return -2;
+      }
     }
   }
@@ -1613 +1591 @@
       {
         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
+        if (strcmp(l->m->type,"ssi")==0)
         {
           d=(ssiInfo*)l->data;
@@ -1627 +1597 @@
           if(j==d_fd) break;
         }
-        #else
-        d=(ssiInfo*)l->data;
-        d_fd=d->fd_read;
-        if(j==d_fd) break;
-        #endif
+        else
+        {
+          Werror("wrong link type >>%s<<",l->m->type);
+          return -2;
+        }
       }
     }