[BACK]Return to tcpf.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/tcpf.c between version 1.34 and 1.39

version 1.34, 2002/08/02 09:43:12 version 1.39, 2003/03/07 06:39:57
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.33 2002/08/02 02:28:28 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.38 2003/03/07 03:12:28 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 79  static struct m_c {
Line 79  static struct m_c {
 static int m_c_i,m_c_s;  static int m_c_i,m_c_s;
 int I_am_server;  int I_am_server;
   
 #if MPI  #if defined(MPI)
 extern int mpi_nprocs;  extern int mpi_nprocs;
 #define valid_mctab_index(ind)\  #define valid_mctab_index(ind)\
 if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");}  if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");}
Line 143  struct ftab tcp_tab[] = {
Line 143  struct ftab tcp_tab[] = {
         {"ox_cmo_rpc",Pox_cmo_rpc,-99999999},          {"ox_cmo_rpc",Pox_cmo_rpc,-99999999},
   
         {"ox_sync",Pox_sync,1},          {"ox_sync",Pox_sync,1},
 #if MPI  #if defined(MPI)
         {"ox_mpi_myid",Pox_mpi_myid,0},          {"ox_mpi_myid",Pox_mpi_myid,0},
         {"ox_mpi_nprocs",Pox_mpi_nprocs,0},          {"ox_mpi_nprocs",Pox_mpi_nprocs,0},
 #endif  #endif
 #if !MPI  #if !defined(MPI)
         {"ox_reset",Pox_reset,-2},          {"ox_reset",Pox_reset,-2},
         {"ox_intr",Pox_intr,1},          {"ox_intr",Pox_intr,1},
         {"ox_select",Pox_select,-2},          {"ox_select",Pox_select,-2},
Line 183  extern int ox_exchange_mathcap;
Line 183  extern int ox_exchange_mathcap;
   
 char *getenv();  char *getenv();
   
 #if MPI  #if defined(MPI)
 extern int mpi_myid, mpi_nprocs;  extern int mpi_myid, mpi_nprocs;
   
 void Pox_mpi_myid(Q *rp)  void Pox_mpi_myid(Q *rp)
Line 205  void Pox_get_serverinfo(NODE arg,LIST *rp)
Line 205  void Pox_get_serverinfo(NODE arg,LIST *rp)
         LIST list,l;          LIST list,l;
   
         if ( !arg ) {          if ( !arg ) {
                 for ( i = 0, n0 = 0; i < m_c_i; i++ )                  for ( i = I_am_server?1:0, n0 = 0; i < m_c_i; i++ )
                         if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) {                          if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) {
                                 c = m_c_tab[i].c;                                  c = m_c_tab[i].c;
                                 ox_get_serverinfo(c,&list);                                  ox_get_serverinfo(c,&list);
Line 771  int register_server(int af_unix,int m,int c)
Line 771  int register_server(int af_unix,int m,int c)
                 }                  }
                 m_c_s = INIT_TAB_SIZ;                  m_c_s = INIT_TAB_SIZ;
         }          }
 #if !MPI  #if !defined(MPI)
         for ( i = 0; i < m_c_i; i++ )          for ( i = 0; i < m_c_i; i++ )
                 if ( (m_c_tab[i].m<0) && (m_c_tab[i].c<0) )                  if ( (m_c_tab[i].m<0) && (m_c_tab[i].c<0) )
                         break;                          break;
Line 1193  void Pox_shutdown(NODE arg,Q *rp)
Line 1193  void Pox_shutdown(NODE arg,Q *rp)
         s = m_c_tab[index].m;          s = m_c_tab[index].m;
         ox_send_cmd(s,SM_shutdown);          ox_send_cmd(s,SM_shutdown);
         free_iofp(s);          free_iofp(s);
 #if !defined(VISUAL)  
         s = m_c_tab[index].c;          s = m_c_tab[index].c;
         free_iofp(s);          free_iofp(s);
 #endif  #if !defined(MPI) && !defined(VISUAL)
 #if !MPI && !defined(VISUAL)  
         if ( m_c_tab[index].af_unix )          if ( m_c_tab[index].af_unix )
                 wait(&status);                  wait(&status);
 #endif  #endif
Line 1235  void shutdown_all() {
Line 1233  void shutdown_all() {
         Sleep(1000);          Sleep(1000);
 #endif  #endif
                 free_iofp(s);                  free_iofp(s);
 #if !defined(VISUAL)  
                 s = m_c_tab[index].c;                  s = m_c_tab[index].c;
                 free_iofp(s);                  free_iofp(s);
 #endif  #if !defined(MPI) && !defined(VISUAL)
 #if !MPI && !defined(VISUAL)  
                 if ( m_c_tab[index].af_unix )                  if ( m_c_tab[index].af_unix )
                         wait(&status);                          wait(&status);
 #endif  #endif
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.39
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>