=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.63 retrieving revision 1.66 diff -u -p -r1.63 -r1.66 --- OpenXM_contrib2/asir2000/io/tcpf.c 2013/06/13 18:40:31 1.63 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2013/11/22 00:43:41 1.66 @@ -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.62 2012/12/17 07:20:45 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.65 2013/11/21 23:15:37 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -128,7 +128,6 @@ void Pgenerate_port(),Ptry_bind_listen(),Ptry_connect( void Pregister_server(); void Pox_get_serverinfo(); void Pox_mpi_myid(), Pox_mpi_nprocs(); -void Pnd_exec_f4_red(); void Pox_tcp_accept_102(),Pox_tcp_connect_102(); void Pox_send_102(),Pox_recv_102(); void Pox_set_rank_102(); @@ -203,9 +202,6 @@ struct ftab tcp_tab[] = { {"ox_execute_string",Pox_execute_string,2}, {"ox_execute_function",Pox_execute_function,3}, - {"nd_exec_f4_red",Pnd_exec_f4_red,0}, - - {0,0,0}, }; @@ -216,12 +212,6 @@ extern int ox_exchange_mathcap; Obj asir_pop_one(); void asir_push_one(Obj); -void Pnd_exec_f4_red(Q *rp) -{ - nd_exec_f4_red_dist(); - *rp = 0; -} - #if defined(MPI) extern int mpi_myid, mpi_nprocs; @@ -982,7 +972,7 @@ void ox_launch_main(int with_x,NODE arg,Obj *p) void extend_mctab(int bound) { - int s,i,n; + int i,n; struct m_c *t; if ( !m_c_tab ) { n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ; @@ -995,7 +985,7 @@ void extend_mctab(int bound) }else if (bound >= m_c_s) { n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ; t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c)); - bzero((void *)t,s); + bzero((void *)t,n*sizeof(struct m_c)); bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c)); for ( i = m_c_s; i < n; i++ ) { t[i].af_unix = 0; @@ -1042,11 +1032,11 @@ int register_server(int af_unix,int m,int c,int ind) #endif if ( m_c_i == m_c_s ) { s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c); - t = (struct m_c *)MALLOC_ATOMIC(s); bzero((void *)m_c_tab,s); + t = (struct m_c *)MALLOC_ATOMIC(s); bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c)); for ( i = 0; i < INIT_TAB_SIZ; i++ ) { - m_c_tab[m_c_s+i].af_unix = 0; - m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; + t[m_c_s+i].af_unix = 0; + t[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; } m_c_s += INIT_TAB_SIZ; m_c_tab = t; }