=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v retrieving revision 1.9.2.1 retrieving revision 1.25 diff -u -p -r1.9.2.1 -r1.25 --- OpenXM_contrib2/asir2000/io/sio.c 2000/11/08 08:18:14 1.9.2.1 +++ OpenXM_contrib2/asir2000/io/sio.c 2012/12/17 07:20:45 1.25 @@ -44,14 +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.9 2000/11/07 06:35:39 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.24 2011/02/06 07:07:39 ohara Exp $ */ -#if INET #include "ca.h" -#include "setjmp.h" +#include #include "ox.h" #if defined(VISUAL) -#include +#include +#include #else #include #include @@ -76,36 +76,31 @@ struct IOFP iofp[MAXIOFP]; void init_socket(void); -int getremotesocket(s) -int s; +#if !defined(VISUAL) +#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) { - union { - struct sockaddr sa; - char data[SOCK_MAXADDRLEN]; - } dummy; - struct sockaddr *sa; - socklen_t len; - char host[NI_MAXHOST]; - int rs; + struct sockaddr_in peer; + struct hostent *hp; + int peerlen; - rs = getremotesocket(s); - len = SOCK_MAXADDRLEN; - getpeername(rs, (struct sockaddr *)dummy.data, &len); - sa = &(dummy.sa); - getnameinfo(sa, sa->sa_len, host, sizeof(host), NULL, 0, 0); - strcpy(name, host); + peerlen = sizeof(peer); + getpeername(getremotesocket(s),(struct sockaddr *)&peer,&peerlen); + hp = gethostbyaddr((char *)&peer.sin_addr,sizeof(struct in_addr),AF_INET); + if ( hp ) + strcpy(name,hp->h_name); + else + 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(); @@ -126,60 +121,59 @@ 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 addrinfo hints, *res, *ai; - int s, error; - char *errstr; + struct sockaddr_in sin; + struct sockaddr *saddr; + int len; + int service; +#if !defined(VISUAL) + struct sockaddr_un s_un; - memset(&hints, 0, sizeof(hints)); -#if defined(VISUAL) - hints.ai_family = PF_UNSPEC; + if ( use_unix ) { + service = socket(AF_UNIX, SOCK_STREAM, 0); + if (service < 0) { + perror("in socket"); + return -1; + } + s_un.sun_family = AF_UNIX; + strcpy(s_un.sun_path,port_str); +#if defined(__FreeBSD__) + len = SUN_LEN(&s_un); + s_un.sun_len = len+1; /* XXX */ #else - if (use_unix) - hints.ai_family = PF_UNIX; - else - hints.ai_family = PF_UNSPEC; -#endif /* VISUAL */ - hints.ai_socktype = SOCK_STREAM; - - error = getaddrinfo(NULL, port_str, &hints, &res); - if (error) { - warnx("try_bind_listen(): %s", gai_strerror(error)); - return (-1); - } - - for (ai = res ; ai != NULL ; ai = ai->ai_next) { - if ((s = socket(ai->ai_family, ai->ai_socktype, - ai->ai_protocol)) < 0 ) { - errstr = "in socket"; - continue; + len = strlen(s_un.sun_path)+sizeof(s_un.sun_family); +#endif + saddr = (struct sockaddr *)&s_un; + } else +#endif + { + service = socket(AF_INET, SOCK_STREAM, 0); + if ( service < 0 ) { + perror("in socket"); + return -1; } - - if (bind(s, ai->ai_addr, ai->ai_addrlen) < 0) { - errstr = "in bind"; - close(s); - s = -1; - continue; - } - - if (listen(s, SOCKQUEUELENGTH) < 0) { - errstr = "in listen"; - close(s); - s = -1; - continue; - } - - /* established connection */ - break; + sin.sin_family = AF_INET; sin.sin_addr.s_addr = INADDR_ANY; + sin.sin_port = htons((unsigned short)atoi(port_str)); + len = sizeof(sin); + saddr = (struct sockaddr *)&sin; } - freeaddrinfo(res); - - if (s < 0) - perror(errstr); - return (s); + if (bind(service, saddr, len) < 0) { + perror("in bind"); + closesocket(service); + return -1; + } + if (getsockname(service,saddr, &len) < 0) { + perror("in getsockname"); + closesocket(service); + return -1; + } + if (listen(service, SOCKQUEUELENGTH) < 0) { + perror("in listen"); + closesocket(service); + return -1; + } + return service; } /* @@ -196,95 +190,100 @@ 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) { - union { - struct sockaddr sa; - char data[SOCK_MAXADDRLEN]; - } dummy; - socklen_t len; - int c, i; + int len,c,i; + struct sockaddr_in sin; - len = SOCK_MAXADDRLEN; - if (getsockname(s, (struct sockaddr *)dummy.data, &len) < 0) { - close(s); - return (-1) - } +#if !defined(VISUAL) + struct sockaddr_un s_un; + if ( af_unix ) { + len = sizeof(s_un); + for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ ) + c = accept(s, (struct sockaddr *) &s_un, &len); + } else +#endif + { - for (i = 0 ; i < 10 ; i++) { - c = accept(s, &(dummy.sa), &len); - if (c >= 0) { - close(s); - return (c); - } + len = sizeof(sin); + for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ ) + c = accept(s, (struct sockaddr *) &sin, &len); } - - close(s); - return (-1); + if ( i == 10 ) + c = -1; + 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 addrinfo hints, *res, *ai; - int s, error, i; - char *errstr; + struct sockaddr_in sin; + struct sockaddr *saddr; + struct hostent *hp; + int len,s,i; +#if !defined(VISUAL) + struct sockaddr_un s_un; +#endif - memset(&hints, 0, sizeof(hints)); -#if defined(VISUAL) - hints.ai_family = PF_UNSPEC; + for ( i = 0; i < 10; i++ ) { +#if !defined(VISUAL) + if ( use_unix ) { + if ( (s = socket(AF_UNIX,SOCK_STREAM,0)) < 0 ) { + perror("socket"); + return -1; + } + bzero(&s_un,sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strcpy(s_un.sun_path,port_str); +#if defined(__FreeBSD__) + len = SUN_LEN(&s_un); + s_un.sun_len = len+1; /* XXX */ #else - if (use_unix) - hints.ai_family = PF_UNIX; - else - hints.ai_family = PF_UNSPEC; + len = strlen(s_un.sun_path)+sizeof(s_un.sun_family); +#endif + saddr = (struct sockaddr *)&s_un; + } else #endif /* VISUAL */ - hints.ai_socktype = SOCK_STREAM; - - error = getaddrinfo(host, port_str, &hints, &res); - if (error) { - warnx("try_connect: %s", gai_strerror(error)); - return (-1); - } - for (i = 0 ; i < 10 ; i++) { - for (ai = res ; ai != NULL ; ai = ai->ai_next) { - if ((s = socket(ai->ai_family, ai->ai_socktype, - ai->ai_protocol)) < 0 ) { - errstr = "socket"; - continue; + { + if ( !host ) + host = "127.0.0.1"; + if ( (s = socket(AF_INET,SOCK_STREAM,0)) < 0 ) { + perror("socket"); + return -1; } - if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0) { - errstr = "connect"; - close(s); - s = -1; - continue; + bzero(&sin,sizeof(sin)); + 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; + } else { + hp = gethostbyname(host); + bcopy(hp->h_addr,&sin.sin_addr,hp->h_length); + sin.sin_family = hp->h_addrtype; } - - /* established a connection */ - break; + len = sizeof(sin); + saddr = (struct sockaddr *)&sin; } - - if (s >= 0) { - freeaddrinfo(res); - return (s); - } - + if ( connect(s,saddr,len) >= 0 ) + break; + else { + closesocket(s); #if defined(VISUAL) - Sleep(100); + Sleep(100); #else - usleep(100000); + usleep(100000); #endif + } } - freeaddrinfo(res); - - perror(errstr); - return (-1); + if ( i == 10 ) { + perror("connect"); + return -1; + } else + return s; } #if 0 -close_allconnections() +void close_allconnections() { int s; @@ -295,8 +294,7 @@ close_allconnections() close_connection(s); } -close_connection(s) -int s; +void close_connection(int s) { struct IOFP *r; @@ -308,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) + 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; @@ -362,24 +358,26 @@ int is_server; #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] ) { @@ -408,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; @@ -424,6 +420,4 @@ int fd; return i; return -1; } - -#endif /* INET */