[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.72 and 1.77

version 1.72, 2014/05/09 19:35:51 version 1.77, 2016/08/24 05:33:58
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.71 2013/06/13 18:42:11 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.76 2015/08/14 13:51:55 fujimoto Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "signal.h"  #include "signal.h"
 #include "ox.h"  #include "ox.h"
 #include "version.h"  #include "version.h"
 #if defined(PARI)  
 #include "genpari.h"  
 #endif  
   
 char *find_asirrc();  char *find_asirrc();
 void ox_usr1_handler();  void ox_usr1_handler();
 int asir_ox_init();  int asir_ox_init();
   
 /* environement is defined in libpari.a */  /* environement is defined in libpari.a */
   #if 0
 # if !( PARI_VERSION_CODE > 131588)  # if !( PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;  extern jmp_buf environnement;
 # endif  # endif
   #endif
 extern int myrank_102,nserver_102;  extern int myrank_102,nserver_102;
   
 extern int do_message;  extern int do_message;
Line 167  void ox_main(int argc,char **argv) {
Line 166  void ox_main(int argc,char **argv) {
                 extern int recv_intr;                  extern int recv_intr;
   
                 serial = ox_recv(0,&id,&obj);                  serial = ox_recv(0,&id,&obj);
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
                 if ( recv_intr ) {                  if ( recv_intr ) {
                         if ( recv_intr == 1 ) {                          if ( recv_intr == 1 ) {
                                 recv_intr = 0;                                  recv_intr = 0;
Line 706  int asir_executeString()
Line 705  int asir_executeString()
         SNODE snode;          SNODE snode;
         pointer val;          pointer val;
         char *cmd;          char *cmd;
   #if 0
 #if defined(PARI)  #if defined(PARI)
         recover(0);          recover(0);
         /* environement is defined in libpari.a */          /* environement is defined in libpari.a */
Line 716  int asir_executeString()
Line 716  int asir_executeString()
         }          }
 # endif  # endif
 #endif  #endif
   #endif
         cmd = ((STRING)asir_pop_one())->body;          cmd = ((STRING)asir_pop_one())->body;
 /* XXX : probably this is useless */  /* XXX : probably this is useless */
 #if 0  #if 0
Line 947  void ox_asir_init(int argc,char **argv,char *servernam
Line 948  void ox_asir_init(int argc,char **argv,char *servernam
         extern char displayname[];          extern char displayname[];
         static ox_asir_initialized = 0;          static ox_asir_initialized = 0;
         int do_server_sav;          int do_server_sav;
 #if !defined(VISUAL)  #if !defined(VISUAL) && !defined(__MINGW32__)
         int tmp;          int tmp;
 #endif  #endif
   
         GC_init();          GC_init();
 #if !defined(VISUAL) && !defined(MPI)  #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
         do_server_in_X11 = 1; /* XXX */          do_server_in_X11 = 1; /* XXX */
 #endif  #endif
         asir_save_handler();          asir_save_handler();
   #if 0
 #if defined(PARI)  #if defined(PARI)
         risa_pari_init();          risa_pari_init();
 #endif  #endif
   #endif
         srandom((int)get_current_time());          srandom((int)get_current_time());
   
         rtime_init();          rtime_init();
Line 981  void ox_asir_init(int argc,char **argv,char *servernam
Line 984  void ox_asir_init(int argc,char **argv,char *servernam
         sysf_init();          sysf_init();
         parif_init();          parif_init();
         order_init();          order_init();
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         init_socket();          init_socket();
 #endif  #endif
 #if defined(UINIT)  #if defined(UINIT)
Line 1028  void ox_io_init() {
Line 1031  void ox_io_init() {
   
         I_am_server = 1;          I_am_server = 1;
         endian_init();          endian_init();
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         if ( !ox_sock_id )          if ( !ox_sock_id )
                 exit(0);                  exit(0);
         iofp[0].in = WSIO_open(ox_sock_id,"r");          iofp[0].in = WSIO_open(ox_sock_id,"r");
Line 1041  void ox_io_init() {
Line 1044  void ox_io_init() {
         setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ);          setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
         setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ);          setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
 #endif  #endif
         signal(SIGUSR1,ox_usr1_handler);          set_signal(SIGUSR1,ox_usr1_handler);
 #endif  #endif
         asir_OperandStackSize = BUFSIZ;          asir_OperandStackSize = BUFSIZ;
         asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));          asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
Line 1058  void ox_io_init() {
Line 1061  void ox_io_init() {
         register_server(0,0,0,-1);          register_server(0,0,0,-1);
 }  }
   
 #if !defined(VISUAL)  #if !defined(VISUAL) && !defined(__MINGW32__)
 /*  /*
  * Library mode functions   * Library mode functions
  */   */
Line 1227  int asir_ox_init(int byteorder)
Line 1230  int asir_ox_init(int byteorder)
         static ox_asir_initialized = 0;          static ox_asir_initialized = 0;
   
         GC_init();          GC_init();
 #if !defined(VISUAL) && !defined(MPI)  #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
         do_server_in_X11 = 0; /* XXX */          do_server_in_X11 = 0; /* XXX */
 #endif  #endif
         asir_save_handler();          asir_save_handler();
   #if 0
 #if defined(PARI)  #if defined(PARI)
         risa_pari_init();          risa_pari_init();
 #endif  #endif
   #endif
         srandom((int)get_current_time());          srandom((int)get_current_time());
   
         rtime_init();          rtime_init();
Line 1250  int asir_ox_init(int byteorder)
Line 1255  int asir_ox_init(int byteorder)
         pf_init();          pf_init();
         sysf_init();          sysf_init();
         parif_init();          parif_init();
 #if defined(VISUAL)  #if defined(VISUAL) || defined(__MINGW32__)
         init_socket();          init_socket();
 #endif  #endif
 #if defined(UINIT)  #if defined(UINIT)
Legend:
Removed from v.1.72  
changed lines
  Added in v.1.77
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>