=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.28 retrieving revision 1.36 diff -u -p -r1.28 -r1.36 --- OpenXM_contrib2/asir2000/io/tcpf.c 2001/12/25 05:28:39 1.28 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2003/01/24 08:01:25 1.36 @@ -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.27 2001/12/25 02:39:05 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.35 2002/12/09 01:43:54 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -205,7 +205,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); @@ -471,6 +471,15 @@ void ox_launch_generic(char *host,char *launcher,char } #if defined(__CYGWIN__) +static void bslash2slash(char *buf) +{ + char *p; + + for ( p = buf; *p; p++ ) + if ( *p == '\\' ) + *p = '/'; +} + static int get_start_path(char *buf) { static char start_path[BUFSIZ]; @@ -482,22 +491,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) ) { - strcpy(start_path,buf); + bslash2slash(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; } @@ -516,6 +549,7 @@ static void get_launcher_path(char *buf) get_rootdir(rootname,sizeof(rootname)); sprintf(name,"%s/ox_launch.exe",rootname); cygwin_conv_to_full_win32_path(name,launcher_path); + bslash2slash(launcher_path); launcher_initialized = 1; strcpy(buf,launcher_path); } @@ -526,7 +560,7 @@ void spawn_server(char *host,char *launcher,char *serv char *control_port_str,char *server_port_str) { char localhost[BUFSIZ]; - char *dname,*conn_str,*rsh,*dname0; + char *dname,*conn_str,*rsh,*dname0,*asirhost; char AsirExe[BUFSIZ]; STRING rootdir; char prog[BUFSIZ]; @@ -554,7 +588,11 @@ void spawn_server(char *host,char *launcher,char *serv */ use_ssh = 1; } - gethostname(localhost,BUFSIZ); + asirhost = (char *)getenv("ASIRHOSTNAME"); + if ( asirhost ) + strcpy(localhost,asirhost); + else + gethostname(localhost,BUFSIZ); #if defined(VISUAL) if ( !use_unix ) error("spawn_server : not implemented on Windows"); @@ -575,28 +613,40 @@ void spawn_server(char *host,char *launcher,char *serv // _spawnv(_P_NOWAIT,"d:\\home\\noro\\engine2000\\debug\\engine.exe",av); // printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server); #else - get_start_path(win_start); if ( use_unix || !host ) { - if ( !fork() ) { - setpgid(0,getpid()); #if defined(__CYGWIN__) - if ( dname && get_start_path(win_start) ) - { - get_launcher_path(win_launcher); - execlp(win_start,"start",win_launcher, - use_unix?".":"127.1",conn_str, - control_port_str,server_port_str,server,"1",0); + get_launcher_path(win_launcher); + if ( dname && strchr(dname,':') ) { + if ( !fork() ) { + setpgid(0,getpid()); + execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, + "-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname,0); } + } else if ( dname && get_start_path(win_start) ) { + sprintf(cmd,"%s %s %s %s %s %s %s 1", + win_start,win_launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server); + system(cmd); + } else { + if ( !fork() ) { + setpgid(0,getpid()); + execlp(launcher,launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname0,"-nolog",0); + } + } #else + if ( !fork() ) { + setpgid(0,getpid()); if ( dname ) execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, "-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str, control_port_str,server_port_str,server,dname,0); -#endif else execlp(launcher,launcher,use_unix?".":"127.1",conn_str, control_port_str,server_port_str,server,dname0,"-nolog",0); } +#endif } else if ( conn_to_serv == 2 ) { /* special support for java */ if ( dname ) @@ -1143,10 +1193,8 @@ 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 ( m_c_tab[index].af_unix ) wait(&status); @@ -1185,10 +1233,8 @@ 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 ( m_c_tab[index].af_unix ) wait(&status); @@ -1196,4 +1242,44 @@ void shutdown_all() { 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; }