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

Diff for /OpenXM_contrib2/asir2018/io/ox_asir.c between version 1.1 and 1.2

version 1.1, 2018/09/19 05:45:08 version 1.2, 2018/09/28 08:20:29
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: OpenXM_contrib2/asir2018/io/ox_asir.c,v 1.1 2018/09/19 05:45:08 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 220  static void asir_do_cmd(int cmd,unsigned int serial)
Line 220  static void asir_do_cmd(int cmd,unsigned int serial)
       break;        break;
     case SM_getsp:      case SM_getsp:
       i = asir_OperandStackPtr+1;        i = asir_OperandStackPtr+1;
       STOQ(i,q);        STOZ(i,q);
       asir_push_one((Obj)q);        asir_push_one((Obj)q);
       break;        break;
     case SM_popSerializedLocalObject:      case SM_popSerializedLocalObject:
Line 452  void asir_reduce_102(unsigned int serial)
Line 452  void asir_reduce_102(unsigned int serial)
   op = (STRING)asir_pop_one();    op = (STRING)asir_pop_one();
   opname = BDY(op);    opname = BDY(op);
   r = (Q)asir_pop_one();    r = (Q)asir_pop_one();
   root = QTOS(r);    root = ZTOS(r);
   if ( !strcmp(opname,"+") )    if ( !strcmp(opname,"+") )
     func = arf_add;      func = arf_add;
   else if ( !strcmp(opname,"*") )    else if ( !strcmp(opname,"*") )
Line 471  void asir_bcast_102(unsigned int serial)
Line 471  void asir_bcast_102(unsigned int serial)
   Obj data;    Obj data;
   
   r = (Q)asir_pop_one();    r = (Q)asir_pop_one();
   root = QTOS(r);    root = ZTOS(r);
   ox_bcast_102(root);    ox_bcast_102(root);
 }  }
   
Line 502  void asir_set_rank_102(unsigned int serial)
Line 502  void asir_set_rank_102(unsigned int serial)
   if ( !nserver || !INT(nserver) || !INT(rank) ) {    if ( !nserver || !INT(nserver) || !INT(rank) ) {
     stat = -1;      stat = -1;
   } else {    } else {
     n = QTOS(nserver); r = QTOS(rank);      n = ZTOS(nserver); r = ZTOS(rank);
     if ( n <= 0 || r < 0 || r >= n ) {      if ( n <= 0 || r < 0 || r >= n ) {
       stat = -1;        stat = -1;
     }      }
Line 527  void asir_tcp_accept_102(unsigned int serial)
Line 527  void asir_tcp_accept_102(unsigned int serial)
   r = (Q)asir_pop_one();    r = (Q)asir_pop_one();
   p = (Q)asir_pop_one();    p = (Q)asir_pop_one();
   if ( IS_CYGWIN || !p || NUM(p) ) {    if ( IS_CYGWIN || !p || NUM(p) ) {
     port = QTOS(p);      port = ZTOS(p);
     sprintf(port_str,"%d",port);      sprintf(port_str,"%d",port);
     use_unix = 0;      use_unix = 0;
   } else {    } else {
Line 536  void asir_tcp_accept_102(unsigned int serial)
Line 536  void asir_tcp_accept_102(unsigned int serial)
   }    }
   s = try_bind_listen(use_unix,port_str);    s = try_bind_listen(use_unix,port_str);
   s = try_accept(use_unix,s);    s = try_accept(use_unix,s);
   rank = QTOS((Q)r);    rank = ZTOS((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_accept_102",0);        "failed to bind or accept in ox_tcp_accept_102",0);
Line 558  void asir_tcp_connect_102(unsigned int serial)
Line 558  void asir_tcp_connect_102(unsigned int serial)
   p = (Q)asir_pop_one();    p = (Q)asir_pop_one();
   h = (STRING)asir_pop_one();    h = (STRING)asir_pop_one();
   if ( IS_CYGWIN || !p || NUM(p) ) {    if ( IS_CYGWIN || !p || NUM(p) ) {
     port = QTOS(p);      port = ZTOS(p);
     sprintf(port_str,"%d",port);      sprintf(port_str,"%d",port);
     use_unix = 0;      use_unix = 0;
     host = BDY((STRING)h);      host = BDY((STRING)h);
Line 568  void asir_tcp_connect_102(unsigned int serial)
Line 568  void asir_tcp_connect_102(unsigned int serial)
     host = 0;      host = 0;
   }    }
   s = try_connect(use_unix,host,port_str);    s = try_connect(use_unix,host,port_str);
   rank = QTOS((Q)r);    rank = ZTOS((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 connect in ox_tcp_connect_102",0);        "failed to connect in ox_tcp_connect_102",0);
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>