=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v retrieving revision 1.1.1.1 retrieving revision 1.6 diff -u -p -r1.1.1.1 -r1.6 --- OpenXM_contrib2/asir2000/io/sio.c 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/io/sio.c 2000/08/22 05:04:18 1.6 @@ -1,6 +1,54 @@ -/* $OpenXM: OpenXM/src/asir99/io/sio.c,v 1.3 1999/11/18 09:00:38 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * 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.5 2000/08/21 08:31:39 noro Exp $ +*/ #if INET #include "ca.h" +#include "setjmp.h" #include "ox.h" #if defined(VISUAL) #include @@ -75,10 +123,11 @@ int use_unix; char *port_str; { struct sockaddr_in sin; - struct sockaddr_un s_un; struct sockaddr *saddr; int len; int service; +#if !defined(VISUAL) + struct sockaddr_un s_un; if ( use_unix ) { service = socket(AF_UNIX, SOCK_STREAM, 0); @@ -95,7 +144,9 @@ char *port_str; len = strlen(s_un.sun_path)+sizeof(s_un.sun_family); #endif saddr = (struct sockaddr *)&s_un; - } else { + } else +#endif + { service = socket(AF_INET, SOCK_STREAM, 0); if ( service < 0 ) { perror("in socket"); @@ -142,14 +193,17 @@ int try_accept(af_unix,s) int af_unix,s; { int len,c,i; - struct sockaddr_un s_un; struct sockaddr_in sin; +#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 { + } else +#endif + { len = sizeof(sin); for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ ) @@ -166,12 +220,15 @@ int use_unix; char *host,*port_str; { struct sockaddr_in sin; - struct sockaddr_un s_un; struct sockaddr *saddr; struct hostent *hp; int len,s,i; +#if !defined(VISUAL) + struct sockaddr_un s_un; +#endif for ( i = 0; i < 10; i++ ) { +#if !defined(VISUAL) if ( use_unix ) { if ( (s = socket(AF_UNIX,SOCK_STREAM,0)) < 0 ) { perror("socket"); @@ -187,7 +244,9 @@ char *host,*port_str; len = strlen(s_un.sun_path)+sizeof(s_un.sun_family); #endif saddr = (struct sockaddr *)&s_un; - } else { + } else +#endif /* VISUAL */ + { if ( (s = socket(AF_INET,SOCK_STREAM,0)) < 0 ) { perror("socket"); return -1; @@ -209,7 +268,11 @@ char *host,*port_str; break; else { close(s); +#if defined(VISUAL) + Sleep(100); +#else usleep(100000); +#endif } } if ( i == 10 ) { @@ -265,12 +328,27 @@ int is_server; { int i; unsigned char c,rc; + extern int mpi_myid; +#if MPI + iofp[s1].s = s1; + if ( mpi_myid == s1 ) { + iofp[s1].in = 0; + iofp[s1].out = 0; + } else { + iofp[s1].in = WSIO_open(s1,"r"); + iofp[s1].out = WSIO_open(s1,"w"); + } + iofp[s1].conv = 0; + iofp[s1].socket = 0; + + return s1; +#else for ( i = 0; i < MAXIOFP; i++ ) if ( !iofp[i].in ) break; iofp[i].s = s1; -#if defined(VISUAL) || MPI +#if defined(VISUAL) iofp[i].in = WSIO_open(s1,"r"); iofp[i].out = WSIO_open(s1,"w"); #else @@ -279,10 +357,6 @@ int is_server; setbuffer(iofp[i].in,(char *)malloc(LBUFSIZ),LBUFSIZ); setbuffer(iofp[i].out,(char *)malloc(LBUFSIZ),LBUFSIZ); #endif -#if MPI - iofp[i].conv = 0; - iofp[i].socket = 0; -#else if ( little_endian ) c = 1; else @@ -302,8 +376,8 @@ int is_server; strcpy(iofp[i].socket,af_sock); } else iofp[i].socket = 0; -#endif return i; +#endif } #if defined(VISUAL)