Changeset 61941e2 in git

Timestamp:

Jun 5, 1997, 6:39:13 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4e595a7b47d6ba4b8e2ca07d3de099932b5b9e33

Parents:

4f9ae6a6eb8da1c85be97e6a95dc85bee4e5edb1

Message:

* added fork mode to MP TCP links


git-svn-id: file:///usr/local/Singular/svn/trunk@370 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

MP/MP

Files:

• ChangeLog (modified) (1 diff)
• MP.h (modified) (5 diffs)
• MP_Env.c (modified) (4 diffs)
• MP_Get.c (modified) (2 diffs)
• MP_GmpBigInt.c (modified) (1 diff)
• MP_TcpTransp.c (modified) (7 diffs)
• Makefile.in (modified) (1 diff)
• h/ChangeLog (modified) (1 diff)
• h/MP_Config.h.in (modified) (1 diff)
• h/MP_Env.h (modified) (1 diff)
• h/MP_TcpTransp.h (modified) (2 diffs)
• h/MP_Types.h (modified) (1 diff)

MP/MP/ChangeLog

@@ +1 @@
+Tue May 27 13:57:13 1997  Olaf Bachmann  <obachman@ratchwu>
+
+        * MP_TcpTransp.h: Added fork mode to MPtcp links
+
 Tue May 20 17:38:53 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
 

MP/MP/MP.h

@@ -1 +1 @@
 
-/* MP.h automatically generated by ./makeheader.pl on Sun May 25 22:43:33 METDST 1997
+/* MP.h automatically generated by ./makeheader.pl on Thu Jun  5 11:35:57 METDST 1997
 */
 /****************************************************************
@@ -100 +100 @@
 
 /* For checking the status of a link*/
-enum link_status_option {MP_LinkReadyReading, MP_LinkReadyWriting};
+enum link_status_option {MP_LinkReadyReading, MP_LinkReadyWriting,
+                         MP_LinkIsParent};
 typedef enum link_status_option MP_LinkStatus_t;
 
@@ -761 +762 @@
 EXTERN MP_Status_t MP_SetEnvBigRealFormat _ANSI_ARGS_((MP_Env_t *env, 
                              MP_BigRealOps_t *ops, MP_BigNumFormat_t format));
- 
+EXTERN MP_Status_t open_logfile _ANSI_ARGS_((MP_ENV env));
 #endif /* _MP_Env_h */
 
@@ -1425 +1426 @@
 #define MP_LISTEN_MODE          2
 #define MP_LAUNCH_MODE          3
+#define MP_FORK_MODE            4
 
 /* Initial port for listening */
@@ -1456 +1458 @@
     char    *peerhost;
     char    *myhost;
+    char     isparent;
 } MP_TCP_t;
 

MP/MP/MP_Env.c

@@ -57 +57 @@
 
 #ifndef lint
-static char vcid[] = "@(#) $Id: MP_Env.c,v 1.1.1.1 1997-05-25 20:31:46 obachman Exp $";
+static char vcid[] = "@(#) $Id: MP_Env.c,v 1.2 1997-06-05 16:38:52 obachman Exp $";
 #endif /*lint */
 
@@ -183 +183 @@
 
       /* Store the log file name. */
-      env->logfilename = IMP_MemAllocFnc(strlen(fname) + 1);
+      env->logfilename = IMP_RawMemAllocFnc(strlen(fname) + 1);
       if (env->logfilename == NULL) {
         fprintf(stderr, "MP_InitializeEnv: can't allocate memory!!\n");
@@ -346 +346 @@
     fprintf(env->logfd, "\nReleasing MP environment resources. \n");
     fclose(env->logfd);
-    IMP_MemFreeFnc(env->logfilename, strlen(env->logfilename));
+    IMP_RawMemFreeFnc(env->logfilename);
 #endif
 
@@ -495 +495 @@
 
 #ifdef MP_DEBUG
-    fprintf(stderr,"MP_AddEnvTranspDevice: entering to add device %s\n", name);
+    fprintf(stderr,"MP_AddEnvTranspDevice: entering to add device %d\n", transp_dev);
     fflush(stderr);
 #endif

MP/MP/MP_Get.c

@@ -66 +66 @@
 
 #ifndef lint
-static char vcid[] = "@(#) $Id: MP_Get.c,v 1.1.1.1 1997-05-25 20:31:46 obachman Exp $";
+static char vcid[] = "@(#) $Id: MP_Get.c,v 1.2 1997-06-05 16:38:54 obachman Exp $";
 #endif /* lint */
  
@@ -177 +177 @@
 #endif
 {
+    unsigned char t;
+    MP_Status_t status;
 #ifdef MP_DEBUG
     fprintf(stderr, "IMP_GetNodeHeader: entering for link %d\n", link->link_id);
 #endif
-    unsigned char t;
-    MP_Status_t status;
     /*
      * For now we don't let the programmer in on this little secret (unless,

MP/MP/MP_GmpBigInt.c

@@ -48 +48 @@
 #endif
 {
+  mpz_ptr apint = (mpz_ptr) mp_apint;
 #ifdef MP_DEBUG
   fprintf(stderr, "IMP_PutGmpInt: entering\n"); fflush(stderr);
 #endif
-  mpz_ptr apint = (mpz_ptr) mp_apint;
 
   if (!IMP_PutLong(link, (long *)&(apint->_mp_size)))

MP/MP/MP_TcpTransp.c

@@ -74 +74 @@
 
 #ifndef lint
-static char vcid[] = "@(#) $Id: MP_TcpTransp.c,v 1.1.1.1 1997-05-25 20:31:47 obachman Exp $";
+static char vcid[] = "@(#) $Id: MP_TcpTransp.c,v 1.2 1997-06-05 16:38:56 obachman Exp $";
 #endif /* lint */
 
@@ -179 +179 @@
         else if (!strcmp(cmode, "launch"))
             return MP_LAUNCH_MODE;
+        else if (!strcmp(cmode, "fork"))
+          return MP_FORK_MODE;
+    
 
 #ifdef MP_DEBUG
@@ -613 +616 @@
 
 /***********************************************************************
+ * FUNCTION:  open_tcp_fork_mode
+ * INPUT:     link - pointer to link structure for this connection
+ * OUTPUT:    Success:  MP_Success
+ *                      socket connected to the a forked child
+ *            Failure:  MP_Failure - couldn't make the connection.
+ * OPERATION: forks a child, establishes a connection to it and uses
+ *            the return of the fork to set parent/child attribute
+ ***********************************************************************/
+#ifdef __STDC__
+MP_Status_t open_tcp_fork_mode(MP_Link_pt link, int argc, char** argv)
+#else
+MP_Status_t open_tcp_fork_mode(link, argc, argv)
+    MP_Link_pt   link;
+    int          argc;
+    char**       argv;
+#endif
+{
+  int pid;
+  MP_TCP_t *tcp_rec = (MP_TCP_t *) link->transp.private1;
+#ifndef NO_LOGGING
+  char log_msg[200];
+  char *parent_logfilename = link->env->logfilename;
+  FILE *parent_logfd = link->env->logfd;
+#endif
+  
+  /* prepare the socket */
+  if (open_tcp_listen_mode(link, argc, argv) != MP_Success)
+  {
+    MP_LogEvent(link, MP_ERROR_EVENT,
+                "MP_OpenLink: can't open a listening socket");
+    return MP_SetError(link, MP_CantConnect);
+  }
+
+#ifndef NO_LOGGING
+  /* Open the log file before the fork, so that the processes do not
+     get out of sync */
+  sprintf(log_msg,
+          "open_tcp_fork: Preparing to create fork link, parent id: %d",
+          getpid());
+  if (open_logfile(link->env) != MP_Success) return MP_Failure;
+  MP_LogEvent(link, MP_INIT_EVENT,
+              "open_tcp_fork: MP Log file for a forked (child) link");
+  sprintf(log_msg, "open_tcp_fork: Parent link: L%d, logfile: %s, pid: %d",
+          link->link_id, parent_logfilename, getpid());
+  MP_LogEvent(link, MP_INIT_EVENT, log_msg);
+#endif
+  
+  /* Do the fork */
+  if ((pid = fork()) == -1)
+  {
+#ifndef NO_LOGGING
+    link->env->logfilename = parent_logfilename;
+    link->env->logfd = parent_logfd;
+#endif    
+    MP_LogEvent(link, MP_ERROR_EVENT, "MP_OpenLink: can't fork");
+    return MP_SetError(link, MP_Failure);
+  }
+
+  if (!pid)
+  {
+    /* Child's business */
+    MP_Status_t stat;
+    char cport[12];
+    char *argv[] = {"MPtransp","TCP","-MPmode","connect","-MPhost",
+                    "localhost", "-MPport", ""};
+    sprintf(cport,"%d",tcp_rec->peerport);
+    argv[7] = cport;
+    tcp_rec->isparent = 0;
+
+    /* establish connection */
+    stat = open_tcp_connect_mode(link, 8, argv);
+
+#ifndef NO_LOGGING
+    IMP_RawMemFreeFnc(parent_logfilename);
+    if (stat == MP_Success)
+      sprintf(log_msg, "open_tcp_fork: opened forked link, child id: %d",
+              getpid());
+    else
+      sprintf(log_msg,
+              "open_tcp_fork: open of forked link failed, child is exited");
+    MP_LogEvent(link, MP_ERROR_EVENT, log_msg);
+#endif
+    if (stat != MP_Success)
+      _exit(1);
+    else
+      return MP_Success;
+  }
+  else
+  {
+    /* parent's business */
+#ifndef NO_LOGGING
+    /* reset logging stuff */
+    link->env->logfilename = parent_logfilename;
+    link->env->logfd = parent_logfd;
+#endif
+
+    /* establish connection */
+    socket_accept_blocking(link, &tcp_rec->sock);
+    tcp_rec->isparent = 1;
+
+#ifndef NO_LOGGING
+    sprintf(log_msg,"open_tcp_fork: opened fork link, parent id: %d",
+            getpid()); 
+    MP_LogEvent(link, MP_INIT_EVENT, log_msg);
+#endif
+
+    RETURN_OK(link);
+  }
+}
+  
+/***********************************************************************
  * FUNCTION:  open_tcp_connect_mode
  * INPUT:     link - pointer to link structure for this connection
@@ -878 +992 @@
     printf("tcp_get_status: entering for link %d\n", link->link_id);
 #endif
+  if (status_to_check == MP_LinkIsParent)
+  {
+    if (((MP_TCP_t *)link->transp.private1)->isparent)
+      return MP_TRUE;
+    else
+      return MP_FALSE;
+  }
 
     FD_ZERO(&mask);
@@ -1122 +1243 @@
     tcp_rec->myhost   = NULL;
     tcp_rec->peerhost = NULL;
+    tcp_rec->isparent   = 0;
 
     link->transp.private1 = (char *)tcp_rec;
@@ -1132 +1254 @@
     RETURN_OK(link);
 }
-
-
 
 /***********************************************************************
@@ -1238 +1358 @@
         break;
 
+        case MP_FORK_MODE:
+          status = open_tcp_fork_mode(link, argc, argv);
+          break;
+          
     default:
         MP_LogEvent(link, MP_ERROR_EVENT,

MP/MP/Makefile.in

@@ -119 +119 @@
         rm -f MP.h 
         
-MP.h: ${HEADERS} 
+MP.h: ${HEADERS}
         perl ./makeheader.pl -I${hdir} ${hdir}/MP.h MP.h
 

MP/MP/h/ChangeLog

@@ +1 @@
+Thu Jun  5 12:02:12 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * MP_Config.h.in: added WORDS_BIGENDIAN target 
+
 Sun May 25 11:11:47 1997  Simon Gray  (sgray@Pooh)
 

MP/MP/h/MP_Config.h.in

@@ -52 +52 @@
 #undef HAVE_SYS_SELECT_H
 
+/* Define if you have BIG ENDIAN numbers */
+#ifndef WORDS_BIGENDIAN
+#undef WORDS_BIGENDIAN
+#endif
+
 /* Define to turn off logging */
 #undef NO_LOGGING

MP/MP/h/MP_Env.h

@@ -118 +118 @@
 EXTERN MP_Status_t MP_SetEnvBigRealFormat _ANSI_ARGS_((MP_Env_t *env, 
                              MP_BigRealOps_t *ops, MP_BigNumFormat_t format));
- 
+EXTERN MP_Status_t open_logfile _ANSI_ARGS_((MP_ENV env));
 #endif /* _MP_Env_h */

MP/MP/h/MP_TcpTransp.h

@@ -63 +63 @@
 #define MP_LISTEN_MODE          2
 #define MP_LAUNCH_MODE          3
+#define MP_FORK_MODE            4
 
 /* Initial port for listening */
@@ -94 +95 @@
     char    *peerhost;
     char    *myhost;
+    char     isparent;
 } MP_TCP_t;
 

MP/MP/h/MP_Types.h

@@ -36 +36 @@
 
 /* For checking the status of a link*/
-enum link_status_option {MP_LinkReadyReading, MP_LinkReadyWriting};
+enum link_status_option {MP_LinkReadyReading, MP_LinkReadyWriting,
+                         MP_LinkIsParent};
 typedef enum link_status_option MP_LinkStatus_t;