=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v retrieving revision 1.12 retrieving revision 1.22 diff -u -p -r1.12 -r1.22 --- OpenXM_contrib2/asir2000/io/sio.c 2001/10/09 01:36:21 1.12 +++ OpenXM_contrib2/asir2000/io/sio.c 2003/03/07 03:12:28 1.22 @@ -44,10 +44,10 @@ * 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.11 2000/12/05 01:24:55 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.21 2003/02/14 22:29:15 ohara Exp $ */ #include "ca.h" -#include "setjmp.h" +#include #include "ox.h" #if defined(VISUAL) #include @@ -241,6 +241,8 @@ int try_connect(int use_unix,char *host,char *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; @@ -311,15 +313,17 @@ 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 ) close(r->s); +#elif !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(int s1,char *af_sock,int is_server) { int i; @@ -350,8 +354,10 @@ int get_iofp(int s1,char *af_sock,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 *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + setbuffer(iofp[i].out,iofp[i].outbuf = (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); +#endif #endif if ( little_endian ) c = 1;