[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.40 and 1.41

version 1.40, 2017/08/30 09:40:30 version 1.41, 2018/03/12 02:37:08
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.39 2016/08/24 05:33:58 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.40 2017/08/30 09:40:30 ohara Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 428  void end_critical() {
Line 428  void end_critical() {
 }  }
   
 extern NODE user_int_handler;  extern NODE user_int_handler;
   extern int caught_intr,in_gc;
   
 void ox_usr1_handler(int sig)  void ox_usr1_handler(int sig)
 {  {
Line 439  void ox_usr1_handler(int sig)
Line 440  void ox_usr1_handler(int sig)
         if ( critical_when_signal ) {          if ( critical_when_signal ) {
                 fprintf(stderr,"usr1 : critical\n");                  fprintf(stderr,"usr1 : critical\n");
                 ox_usr1_sent = 1;                  ox_usr1_sent = 1;
       } else if ( in_gc ) {
                   fprintf(stderr,"usr1 : in_gc\n");
                   caught_intr = 2;
         } else {          } else {
                 ox_flushing = 1;                  ox_flushing = 1;
                 if ( user_int_handler ) {                  if ( user_int_handler ) {
Line 541  void wait_for_data_102(int rank)
Line 545  void wait_for_data_102(int rank)
 void ox_send_data(int s,pointer p)  void ox_send_data(int s,pointer p)
 {  {
         ERR err;          ERR err;
       Obj p0;
   
       p0 = (Obj)p;
         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",0);                  create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0);
                 p = (pointer)err;                  p = (pointer)err;

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

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