[BACK]Return to ox_asir.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_asir.c between version 1.47 and 1.50

version 1.47, 2003/12/11 05:48:04 version 1.50, 2003/12/13 08:03:56
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.46 2003/12/10 02:16:08 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.49 2003/12/12 09:01:11 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 479  void asir_reset_102(unsigned int serial)
Line 479  void asir_reset_102(unsigned int serial)
                 do {                  do {
                         ox_recv_102(i,&id,&obj);                          ox_recv_102(i,&id,&obj);
                 } while ( id != OX_SYNC_BALL );                  } while ( id != OX_SYNC_BALL );
         for ( i = myrank_102; i < nserver_102; i++ )          for ( i = myrank_102+1; i < nserver_102; i++ )
                 ox_send_sync_102(i);                  ox_send_sync_102(i);
 }  }
   
Line 556  void asir_tcp_connect_102(unsigned int serial)
Line 556  void asir_tcp_connect_102(unsigned int serial)
                 port = QTOS(p);                  port = QTOS(p);
                 sprintf(port_str,"%d",port);                  sprintf(port_str,"%d",port);
                 use_unix = 0;                  use_unix = 0;
                   host = BDY((STRING)h);
         } else {          } else {
                 strcpy(port_str,BDY((STRING)p));                  strcpy(port_str,BDY((STRING)p));
                 use_unix = 1;                  use_unix = 1;
                   host = 0;
         }          }
         host = BDY((STRING)h);  
         s = try_connect(use_unix,host,port_str);          s = try_connect(use_unix,host,port_str);
         rank = QTOS((Q)r);          rank = QTOS((Q)r);
         if ( register_102(s,rank,1) < 0 ) {          if ( register_102(s,rank,1) < 0 ) {
                 create_error(&err,serial,                  create_error(&err,serial,
                         "failed to bind or accept in ox_tcp_connect_102");                          "failed to connect in ox_tcp_connect_102");
                 asir_push_one((Obj)err);                  asir_push_one((Obj)err);
         }          }
 }  }

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.50

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>