=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.31 retrieving revision 1.42 diff -u -p -r1.31 -r1.42 --- OpenXM_contrib2/asir2000/io/tcpf.c 2002/04/01 08:20:26 1.31 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2003/09/19 02:33:14 1.42 @@ -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.30 2001/12/26 09:28:36 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.41 2003/05/23 00:11:58 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -79,7 +79,7 @@ static struct m_c { static int m_c_i,m_c_s; int I_am_server; -#if MPI +#if defined(MPI) extern int mpi_nprocs; #define valid_mctab_index(ind)\ if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");} @@ -119,6 +119,7 @@ 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 ox_launch_generic(); @@ -143,11 +144,11 @@ struct ftab tcp_tab[] = { {"ox_cmo_rpc",Pox_cmo_rpc,-99999999}, {"ox_sync",Pox_sync,1}, -#if MPI +#if defined(MPI) {"ox_mpi_myid",Pox_mpi_myid,0}, {"ox_mpi_nprocs",Pox_mpi_nprocs,0}, #endif -#if !MPI +#if !defined(MPI) {"ox_reset",Pox_reset,-2}, {"ox_intr",Pox_intr,1}, {"ox_select",Pox_select,-2}, @@ -173,7 +174,9 @@ 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}, }; @@ -183,7 +186,13 @@ extern int ox_exchange_mathcap; char *getenv(); -#if MPI +void Pnd_exec_f4_red(Q *rp) +{ + nd_exec_f4_red_dist(); + *rp = 0; +} + +#if defined(MPI) extern int mpi_myid, mpi_nprocs; void Pox_mpi_myid(Q *rp) @@ -205,7 +214,7 @@ void Pox_get_serverinfo(NODE arg,LIST *rp) LIST list,l; 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) ) { c = m_c_tab[i].c; ox_get_serverinfo(c,&list); @@ -425,17 +434,23 @@ void ox_launch_generic(char *host,char *launcher,char generate_port(use_unix,server_port_str); if ( !conn_to_serv ) { cs = try_bind_listen(use_unix,control_port_str); + if ( cs < 0 ) continue; ss = try_bind_listen(use_unix,server_port_str); + if ( ss < 0 ) continue; } spawn_server(host,launcher,server, use_unix,use_ssh,use_x,conn_to_serv, control_port_str,server_port_str); if ( conn_to_serv ) { cs = try_connect(use_unix,host,control_port_str); + if ( cs < 0 ) continue; ss = try_connect(use_unix,host,server_port_str); + if ( ss < 0 ) continue; } else { cs = try_accept(use_unix,cs); + if ( cs < 0 ) continue; ss = try_accept(use_unix,ss); + if ( ss < 0 ) continue; } } while ( cs < 0 || ss < 0 ); @@ -491,24 +506,46 @@ static int get_start_path(char *buf) return 1; } + /* Windows98 */ + strcpy(buf,"c:\\windows\\command\\start.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + strcpy(start_path,buf); + start_initialized = 1; + return 1; + } + /* Windows2000 */ strcpy(buf,"c:\\winnt\\system32\\start.exe"); cygwin_conv_to_full_posix_path(buf,name); if ( !access(name,X_OK) ) { bslash2slash(buf); strcpy(start_path,buf); + start_initialized = 1; return 1; } - /* Windows98 */ - strcpy(buf,"c:\\windows\\command\\start.exe"); + strcpy(buf,"c:\\winnt\\system32\\cmd.exe"); cygwin_conv_to_full_posix_path(buf,name); if ( !access(name,X_OK) ) { bslash2slash(buf); - strcpy(start_path,buf); + sprintf(start_path,"%s /c start",buf); + strcpy(buf,start_path); + start_initialized = 1; return 1; } + strcpy(buf,"c:\\windows\\system32\\cmd.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + sprintf(start_path,"%s /c start",buf); + strcpy(buf,start_path); + start_initialized = 1; + return 1; + } + return 0; } @@ -749,7 +786,7 @@ int register_server(int af_unix,int m,int c) } m_c_s = INIT_TAB_SIZ; } -#if !MPI +#if !defined(MPI) for ( i = 0; i < m_c_i; i++ ) if ( (m_c_tab[i].m<0) && (m_c_tab[i].c<0) ) break; @@ -862,8 +899,11 @@ void Pox_push_local(NODE arg,Obj *rp) int s; struct oLIST dummy; VL vl; - int index = QTOS((Q)ARG0(arg)); + int index; + if ( !arg ) + error("ox_push_local : too few arguments."); + index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); s = m_c_tab[index].c; arg = NEXT(arg); @@ -879,8 +919,11 @@ void Pox_push_local(NODE arg,Obj *rp) void Pox_push_cmo(NODE arg,Obj *rp) { int s; - int index = QTOS((Q)ARG0(arg)); + int index; + if ( !arg ) + error("ox_push_cmo : too few arguments."); + index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); s = m_c_tab[index].c; arg = NEXT(arg); for ( ; arg; arg = NEXT(arg) ) @@ -1171,11 +1214,9 @@ void Pox_shutdown(NODE arg,Q *rp) s = m_c_tab[index].m; ox_send_cmd(s,SM_shutdown); free_iofp(s); -#if !defined(VISUAL) s = m_c_tab[index].c; free_iofp(s); -#endif -#if !MPI && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1213,15 +1254,59 @@ void shutdown_all() { Sleep(1000); #endif free_iofp(s); -#if !defined(VISUAL) s = m_c_tab[index].c; free_iofp(s); -#endif -#if !MPI && !defined(VISUAL) +#if !defined(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; } +} + +char *ox_get_servername(int); + +int is_ox_plot(int index) +{ + char *name; + + check_valid_mctab_index(index); + if ( index < 0 ) + return 0; + /* m : client, c : server ??? */ + name = ox_get_servername(m_c_tab[index].c); + return strcmp(name,"ox_plot") ? 0 : 1; +} + +int validate_ox_plot_stream(int index) +{ + int i; + NODE arg; + STRING name; + Obj r; + + if ( is_ox_plot(index) ) + return index; + for ( i = 0; i < m_c_i; i++ ) + if ( is_ox_plot(i) ) + return i; + + /* create an ox_plot server */ + MKSTR(name,"ox_plot"); + arg = mknode(2,0,name); + Pox_launch_nox(arg,&r); + i = QTOS((Q)r); +#if defined(VISUAL) + Sleep(100); + ox_send_cmd(m_c_tab[i].c,SM_nop); + ox_flush_stream_force(m_c_tab[i].c); +#endif + return i; +} + +int get_ox_server_id(int index) +{ + valid_mctab_index(index); + return m_c_tab[index].c; }