=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.61 retrieving revision 1.64 diff -u -p -r1.61 -r1.64 --- OpenXM_contrib2/asir2000/io/tcpf.c 2011/06/16 08:17:15 1.61 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2013/09/26 00:38:47 1.64 @@ -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.60 2011/01/18 09:09:22 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.63 2013/06/13 18:40:31 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -58,8 +58,8 @@ #endif #include "ox.h" -#if defined(VISUAL) #include +#if defined(VISUAL) #include #include #endif @@ -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}, }; @@ -213,14 +209,9 @@ extern struct IOFP iofp[]; extern MATHCAP my_mathcap; extern int ox_exchange_mathcap; -char *getenv(); +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; @@ -1642,9 +1633,9 @@ int register_102(int s1,int rank,int is_master) iofp_102[rank].out = fdopen(s1,"w"); #if !defined(__CYGWIN__) setbuffer(iofp_102[rank].in,iofp_102[rank].inbuf = - (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = - (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); #endif #endif if ( little_endian )