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

Diff for /OpenXM_contrib2/asir2000/io/ox.c between version 1.26 and 1.30

version 1.26, 2004/12/17 03:09:08 version 1.30, 2013/06/13 18:40:31
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.c,v 1.25 2004/08/28 12:50:30 takayama Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.29 2010/04/23 04:44:52 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 91  static struct mathcap *remote_mc;
Line 91  static struct mathcap *remote_mc;
 static int remote_mc_len;  static int remote_mc_len;
   
 void mclist_to_mc(LIST mclist,struct mathcap *mc);  void mclist_to_mc(LIST mclist,struct mathcap *mc);
   Obj asir_pop_one();
   void asir_push_one(Obj);
   
 #if defined(VISUAL)  #if defined(VISUAL)
 /* XXX : mainly used in engine2000/io.c, but declared here */  /* XXX : mainly used in engine2000/io.c, but declared here */
Line 145  static int ox_asir_available_sm[] = {
Line 147  static int ox_asir_available_sm[] = {
         SM_executeStringByLocalParserInBatchMode,          SM_executeStringByLocalParserInBatchMode,
         SM_executeFunction, SM_shutdown, SM_pops,          SM_executeFunction, SM_shutdown, SM_pops,
         SM_mathcap, SM_setMathcap, SM_nop,          SM_mathcap, SM_setMathcap, SM_nop,
         SM_beginBlock, SM_endBlock,          SM_beginBlock, SM_endBlock,  SM_executeFunctionSync,
         SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102,          SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102,
         SM_bcast_102, SM_reduce_102,          SM_bcast_102, SM_reduce_102,
         0          0
Line 462  void wait_for_data(int s)
Line 464  void wait_for_data(int s)
 {  {
         return;          return;
 }  }
   
   void wait_for_data_102(int rank)
   {
           return;
   }
 #else  #else
 int ox_data_is_available(int s)  int ox_data_is_available(int s)
 {  {
Line 514  void ox_send_data(int s,pointer p)
Line 521  void ox_send_data(int s,pointer p)
         ERR err;          ERR err;
   
         if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {          if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {
                 create_error(&err,ox_serial,"ox_send_data : Mathcap violation");                  create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0);
                 p = (pointer)err;                  p = (pointer)err;
         }          }
         begin_critical();          begin_critical();

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.30

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