=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v retrieving revision 1.11 retrieving revision 1.27 diff -u -p -r1.11 -r1.27 --- OpenXM_contrib2/asir2000/io/sio.c 2000/12/05 01:24:55 1.11 +++ OpenXM_contrib2/asir2000/io/sio.c 2015/08/14 13:51:55 1.27 @@ -44,13 +44,14 @@ * 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/sio.c,v 1.10 2000/11/15 01:20:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.26 2015/08/06 10:01:52 fujimoto Exp $ */ #include "ca.h" -#include "setjmp.h" +#include #include "ox.h" -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include +#include #else #include #include @@ -75,15 +76,16 @@ struct IOFP iofp[MAXIOFP]; void init_socket(void); -int getremotesocket(s) -int s; +#if !defined(VISUAL) && !defined(__MINGW32__) +#define closesocket(s) (close((s))) +#endif + +int getremotesocket(int s) { return iofp[s].s; } -void getremotename(s,name) -int s; -char *name; +void getremotename(int s,char *name) { struct sockaddr_in peer; struct hostent *hp; @@ -98,16 +100,14 @@ char *name; strcpy(name,(char *)inet_ntoa(peer.sin_addr)); } -int generate_port(use_unix,port_str) -int use_unix; -char *port_str; +void generate_port(int use_unix,char *port_str) { double get_current_time(); unsigned long mt_genrand(); unsigned int port; static int count=0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( use_unix ) { sprintf(port_str,"/tmp/ox%02x.XXXXXX",count); count++; @@ -121,15 +121,13 @@ char *port_str; } } -int try_bind_listen(use_unix,port_str) -int use_unix; -char *port_str; +int try_bind_listen(int use_unix,char *port_str) { struct sockaddr_in sin; struct sockaddr *saddr; int len; int service; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) struct sockaddr_un s_un; if ( use_unix ) { @@ -156,23 +154,23 @@ char *port_str; return -1; } sin.sin_family = AF_INET; sin.sin_addr.s_addr = INADDR_ANY; - sin.sin_port = htons(atoi(port_str)); + sin.sin_port = htons((unsigned short)atoi(port_str)); len = sizeof(sin); saddr = (struct sockaddr *)&sin; } if (bind(service, saddr, len) < 0) { perror("in bind"); - close(service); + closesocket(service); return -1; } if (getsockname(service,saddr, &len) < 0) { perror("in getsockname"); - close(service); + closesocket(service); return -1; } if (listen(service, SOCKQUEUELENGTH) < 0) { perror("in listen"); - close(service); + closesocket(service); return -1; } return service; @@ -192,13 +190,12 @@ char *port_str; the original socket is always closed. */ -int try_accept(af_unix,s) -int af_unix,s; +int try_accept(int af_unix,int s) { int len,c,i; struct sockaddr_in sin; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) struct sockaddr_un s_un; if ( af_unix ) { len = sizeof(s_un); @@ -214,24 +211,22 @@ int af_unix,s; } if ( i == 10 ) c = -1; - close(s); + closesocket(s); return c; } -int try_connect(use_unix,host,port_str) -int use_unix; -char *host,*port_str; +int try_connect(int use_unix,char *host,char *port_str) { struct sockaddr_in sin; struct sockaddr *saddr; struct hostent *hp; int len,s,i; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) struct sockaddr_un s_un; #endif for ( i = 0; i < 10; i++ ) { -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( use_unix ) { if ( (s = socket(AF_UNIX,SOCK_STREAM,0)) < 0 ) { perror("socket"); @@ -250,12 +245,14 @@ char *host,*port_str; } else #endif /* VISUAL */ { + if ( !host ) + host = "127.0.0.1"; if ( (s = socket(AF_INET,SOCK_STREAM,0)) < 0 ) { perror("socket"); return -1; } bzero(&sin,sizeof(sin)); - sin.sin_port = htons(atoi(port_str)); + sin.sin_port = htons((unsigned short)atoi(port_str)); sin.sin_addr.s_addr = inet_addr(host); if ( sin.sin_addr.s_addr != -1 ) { sin.sin_family = AF_INET; @@ -270,8 +267,8 @@ char *host,*port_str; if ( connect(s,saddr,len) >= 0 ) break; else { - close(s); -#if defined(VISUAL) + closesocket(s); +#if defined(VISUAL) || defined(__MINGW32__) Sleep(100); #else usleep(100000); @@ -286,7 +283,7 @@ char *host,*port_str; } #if 0 -close_allconnections() +void close_allconnections() { int s; @@ -297,8 +294,7 @@ close_allconnections() close_connection(s); } -close_connection(s) -int s; +void close_connection(int s) { struct IOFP *r; @@ -310,37 +306,35 @@ int s; } } #else -close_allconnections() +void close_allconnections() { shutdown_all(); } #endif -free_iofp(s) -int s; +void free_iofp(int s) { struct IOFP *r; r = &iofp[s]; - r->in = r->out = 0; r->s = 0; -#if !defined(VISUAL) - if ( r->socket ) - unlink(r->socket); +#if defined(VISUAL) || defined(__MINGW32__) + if ( r->s ) closesocket(r->s); +#elif !defined(MPI) + if ( r->in ) fclose(r->in); + if ( r->out ) fclose(r->out); + if ( r->socket ) unlink(r->socket); #endif + r->inbuf = r->outbuf = 0; + r->in = r->out = 0; r->s = 0; } -#define LBUFSIZ BUFSIZ*10 - -int get_iofp(s1,af_sock,is_server) -int s1; -char *af_sock; -int is_server; +int get_iofp(int s1,char *af_sock,int is_server) { int i; unsigned char c,rc; extern int mpi_myid; -#if MPI +#if defined(MPI) iofp[s1].s = s1; if ( mpi_myid == s1 ) { iofp[s1].in = 0; @@ -358,30 +352,32 @@ int is_server; if ( !iofp[i].in ) break; iofp[i].s = s1; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) iofp[i].in = WSIO_open(s1,"r"); iofp[i].out = WSIO_open(s1,"w"); #else iofp[i].in = fdopen(s1,"r"); iofp[i].out = fdopen(s1,"w"); - setbuffer(iofp[i].in,(char *)malloc(LBUFSIZ),LBUFSIZ); - setbuffer(iofp[i].out,(char *)malloc(LBUFSIZ),LBUFSIZ); +#if !defined(__CYGWIN__) + setbuffer(iofp[i].in,iofp[i].inbuf = (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); + setbuffer(iofp[i].out,iofp[i].outbuf = (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); #endif +#endif if ( little_endian ) c = 1; else c = 0xff; if ( is_server ) { /* server : write -> read */ - write_char(iofp[i].out,&c); ox_flush_stream_force(i); - read_char(iofp[i].in,&rc); + write_char((FILE *)iofp[i].out,&c); ox_flush_stream_force(i); + read_char((FILE *)iofp[i].in,&rc); } else { /* client : read -> write */ - read_char(iofp[i].in,&rc); + read_char((FILE *)iofp[i].in,&rc); /* special care for a failure of spawing a server */ if ( rc !=0 && rc != 1 && rc != 0xff ) return -1; - write_char(iofp[i].out,&c); ox_flush_stream_force(i); + write_char((FILE *)iofp[i].out,&c); ox_flush_stream_force(i); } iofp[i].conv = c == rc ? 0 : 1; if ( af_sock && af_sock[0] ) { @@ -393,7 +389,7 @@ int is_server; #endif } -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) void init_socket() { static int socket_is_initialized; @@ -410,14 +406,12 @@ void init_socket() } #endif -get_fd(index) -int index; +int get_fd(int index) { return iofp[index].s; } -get_index(fd) -int fd; +int get_index(int fd) { int i;