[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.34 and 1.35

version 1.34, 2015/08/08 14:19:42 version 1.35, 2015/08/14 13:51:55
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.33 2015/08/06 10:01:52 fujimoto Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.34 2015/08/08 14:19:42 fujimoto Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 94  void mclist_to_mc(LIST mclist,struct mathcap *mc);
Line 94  void mclist_to_mc(LIST mclist,struct mathcap *mc);
 Obj asir_pop_one();  Obj asir_pop_one();
 void asir_push_one(Obj);  void asir_push_one(Obj);
   
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
 /* XXX : mainly used in engine2000/io.c, but declared here */  /* XXX : mainly used in engine2000/io.c, but declared here */
 typedef void *HANDLE;  typedef void *HANDLE;
 HANDLE hStreamNotify,hStreamNotify_Ack;  HANDLE hStreamNotify,hStreamNotify_Ack;
Line 110  void cleanup_events()
Line 110  void cleanup_events()
   
 void ox_resetenv(char *s)  void ox_resetenv(char *s)
 {  {
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
         cleanup_events();          cleanup_events();
 #endif  #endif
         fprintf(stderr,"%s\n",s);          fprintf(stderr,"%s\n",s);
 #if defined(__MINGW32__) || defined(__MINGW64__)  
         fflush(stderr);  
 #endif  
         LONGJMP(ox_env,1);          LONGJMP(ox_env,1);
 }  }
   
Line 399  void end_critical() {
Line 396  void end_critical() {
         critical_when_signal = 0;          critical_when_signal = 0;
         if ( ox_usr1_sent ) {          if ( ox_usr1_sent ) {
                 ox_usr1_sent = 0;                  ox_usr1_sent = 0;
 #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)  #if !defined(VISUAL) && !defined(__MINGW32__)
         ox_usr1_handler(SIGUSR1);          ox_usr1_handler(SIGUSR1);
 #else  #else
         ox_usr1_handler(0);          ox_usr1_handler(0);
Line 416  void ox_usr1_handler(int sig)
Line 413  void ox_usr1_handler(int sig)
 {  {
         NODE t;          NODE t;
   
 #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)  #if !defined(VISUAL) && !defined(__MINGW32__)
         signal(SIGUSR1,ox_usr1_handler);          signal(SIGUSR1,ox_usr1_handler);
 #endif  #endif
         if ( critical_when_signal ) {          if ( critical_when_signal ) {
Line 433  void ox_usr1_handler(int sig)
Line 430  void ox_usr1_handler(int sig)
                 }                  }
                 ox_resetenv("usr1 : return to toplevel by SIGUSR1");                  ox_resetenv("usr1 : return to toplevel by SIGUSR1");
         }          }
 #if defined(__MINGW32__) || defined(__MINGW64__)  
         fflush(stderr);  
 #endif  
 }  }
   
 void clear_readbuffer()  void clear_readbuffer()
Line 488  void wait_for_data(int s)
Line 482  void wait_for_data(int s)
         int sock;          int sock;
   
         if ( !FP_DATA_IS_AVAILABLE(iofp[s].in) ) {          if ( !FP_DATA_IS_AVAILABLE(iofp[s].in) ) {
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
                 sock = iofp[s].in->fildes;                  sock = iofp[s].in->fildes;
                 FD_ZERO(&r);                  FD_ZERO(&r);
                 FD_SET((unsigned int)sock,&r);                  FD_SET((unsigned int)sock,&r);
Line 508  void wait_for_data_102(int rank)
Line 502  void wait_for_data_102(int rank)
         int sock;          int sock;
   
         if ( !FP_DATA_IS_AVAILABLE(iofp_102[rank].in) ) {          if ( !FP_DATA_IS_AVAILABLE(iofp_102[rank].in) ) {
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
                 sock = iofp_102[rank].in->fildes;                  sock = iofp_102[rank].in->fildes;
                 FD_ZERO(&r);                  FD_ZERO(&r);
                 FD_SET((unsigned int)sock,&r);                  FD_SET((unsigned int)sock,&r);
Line 944  void ox_flush_stream(int s)
Line 938  void ox_flush_stream(int s)
 {  {
         if ( ox_batch )          if ( ox_batch )
                 return;                  return;
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
         if ( _fileno(&iofp[s].out->fp) < 0 )          if ( _fileno(&iofp[s].out->fp) < 0 )
                 cflush(iofp[s].out);                  cflush(iofp[s].out);
         else          else
Line 958  void ox_flush_stream(int s)
Line 952  void ox_flush_stream(int s)
   
 void ox_flush_stream_force(int s)  void ox_flush_stream_force(int s)
 {  {
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
         if ( _fileno(&iofp[s].out->fp) < 0 )          if ( _fileno(&iofp[s].out->fp) < 0 )
                 cflush(iofp[s].out);                  cflush(iofp[s].out);
         else          else
Line 979  void ox_flush_stream_102(int rank)
Line 973  void ox_flush_stream_102(int rank)
 void ox_flush_stream_force_102(int rank)  void ox_flush_stream_force_102(int rank)
 {  {
         if ( iofp_102[rank].out )          if ( iofp_102[rank].out )
 #if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #if defined(VISUAL) || defined(__MINGW32__)
                 cflush(iofp_102[rank].out);                  cflush(iofp_102[rank].out);
 #elif MPI  #elif MPI
                 cflush(iofp_102[rank].out);                  cflush(iofp_102[rank].out);
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>