=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.15 retrieving revision 1.16.2.1 diff -u -p -r1.15 -r1.16.2.1 --- OpenXM_contrib2/asir2000/io/tcpf.c 2000/10/06 06:05:23 1.15 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2000/11/08 08:31:55 1.16.2.1 @@ -44,7 +44,7 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.14 2000/09/27 09:27:24 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.16 2000/11/07 06:35:39 noro Exp $ */ #if INET #include "ca.h" @@ -76,15 +76,21 @@ static struct m_c { } *m_c_tab; static int m_c_i,m_c_s; +int I_am_server; #if MPI extern int mpi_nprocs; #define valid_mctab_index(ind)\ if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");} +#define check_valid_mctab_index(ind)\ +if((ind)<0||(ind)>=mpi_nprocs){(ind)=-1;} #else #define valid_mctab_index(ind)\ if((ind)<0||(ind)>=m_c_i||\ ((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){error("invalid server id");} +#define check_valid_mctab_index(ind)\ +if((ind)<0||(ind)>=m_c_i||\ +((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){(ind)=-1;} #endif int register_server(); @@ -303,7 +309,7 @@ Q *rp; } /* - try_accept(sock,port) + try_accept(sock) */ void Ptry_accept(arg,rp) @@ -316,7 +322,7 @@ Q *rp; use_unix = 0; else use_unix = 1; - s = try_accept(use_unix,QTOS((Q)ARG0(arg))); + s = try_accept(QTOS((Q)ARG0(arg))); STOQ(s,*rp); } @@ -442,8 +448,8 @@ Q *rp; cs = try_connect(use_unix,host,control_port_str); ss = try_connect(use_unix,host,server_port_str); } else { - cs = try_accept(use_unix,cs); - ss = try_accept(use_unix,ss); + cs = try_accept(cs); + ss = try_accept(ss); } } while ( cs < 0 || ss < 0 ); @@ -1157,3 +1163,25 @@ Q *rp; *rp = 0; } #endif + +void shutdown_all() { + int s; + int i,index; + int status; + + for ( i = I_am_server?1:0; i < m_c_i; i++ ) { + index = i; + check_valid_mctab_index(index); + if ( index < 0 ) + continue; + s = m_c_tab[index].m; + ox_send_cmd(s,SM_shutdown); + free_iofp(s); +#if !MPI && !defined(VISUAL) + if ( m_c_tab[index].af_unix ) + wait(&status); +#endif + m_c_tab[index].m = 0; m_c_tab[index].c = 0; + m_c_tab[index].af_unix = 0; + } +}