[BACK]Return to ox_gsl.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_gsl

Diff for /OpenXM/src/ox_gsl/ox_gsl.c between version 1.3 and 1.4

version 1.3, 2018/03/30 04:43:16 version 1.4, 2018/03/30 08:48:23
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.2 2018/03/29 11:52:18 takayama Exp $  /* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.3 2018/03/30 04:43:16 takayama Exp $
 */  */
   
 #include <stdio.h>  #include <stdio.h>
Line 154  cmo *make_error2(const char *reason,const char *fname,
Line 154  cmo *make_error2(const char *reason,const char *fname,
     n = 5;      n = 5;
     argv = (cmo **) GC_malloc(sizeof(cmo *)*n);      argv = (cmo **) GC_malloc(sizeof(cmo *)*n);
     ms = (cmo *)new_cmo_string("Error"); argv[0] = ms;      ms = (cmo *)new_cmo_string("Error"); argv[0] = ms;
     if (reason != NULL) s = (char *)GC_malloc(strlen(reason)+1);      if (reason != NULL) {s = (char *)GC_malloc(strlen(reason)+1); strcpy(s,reason);
     else strcpy(s,"");      }else strcpy(s,"");
     ms = (cmo *) new_cmo_string(s); argv[1] = ms;      ms = (cmo *) new_cmo_string(s); argv[1] = ms;
     if (reason != NULL) s = (char *)GC_malloc(strlen(fname)+1);      if (fname != NULL) {s = (char *)GC_malloc(strlen(fname)+1); strcpy(s,fname);
     else strcpy(s,"");      }else strcpy(s,"");
     ms = (cmo *) new_cmo_string(s); argv[2] = ms;      ms = (cmo *) new_cmo_string(s); argv[2] = ms;
     err = (cmo *)new_cmo_int32(line); argv[3] = err;      err = (cmo *)new_cmo_int32(line); argv[3] = err;
     err = (cmo *)new_cmo_int32(code); argv[4] = err;      err = (cmo *)new_cmo_int32(code); argv[4] = err;
Line 179  int get_i()
Line 179  int get_i()
     }else if (c->tag == CMO_ZERO) {      }else if (c->tag == CMO_ZERO) {
         return(0);          return(0);
     }      }
     myhandler("get_i, not an integer",NULL,0,-1);      myhandler("get_i: not an integer",NULL,0,-1);
     return 0;      return 0;
 }  }
   
Line 208  double get_double()
Line 208  double get_double()
     }else if (c->tag == CMO_ZZ) {      }else if (c->tag == CMO_ZZ) {
        if ((mpz_cmp_si(mympz(c),(long int) 0x7fffffff)>0) ||         if ((mpz_cmp_si(mympz(c),(long int) 0x7fffffff)>0) ||
            (mpz_cmp_si(mympz(c),(long int) -0x7fffffff)<0)) {             (mpz_cmp_si(mympz(c),(long int) -0x7fffffff)<0)) {
          myhandler("get_double, out of int32",NULL,0,-1);           myhandler("get_double: out of int32",NULL,0,-1);
          return(NAN);           return(NAN);
        }         }
        return( (double) mpz_get_si(((cmo_zz *)c)->mpz));         return( (double) mpz_get_si(((cmo_zz *)c)->mpz));
Line 217  double get_double()
Line 217  double get_double()
     }else if (c->tag == CMO_ZERO) {      }else if (c->tag == CMO_ZERO) {
         return(0);          return(0);
     }      }
     myhandler("get_double, not a double",NULL,0,-1);      myhandler("get_double: not a double",NULL,0,-1);
     return(NAN);      return(NAN);
 }  }
   
Line 382  void myhandler(const char *reason,const char *file,int
Line 382  void myhandler(const char *reason,const char *file,int
   fprintf(fp,"%d\n",line);    fprintf(fp,"%d\n",line);
   if (file != NULL) fprintf(fp,"%s\n",file); else fprintf(fp,"file?\n");    if (file != NULL) fprintf(fp,"%s\n",file); else fprintf(fp,"file?\n");
   if (reason != NULL) fprintf(fp,"%s\n",reason); else fprintf(fp,"reason?\n");    if (reason != NULL) fprintf(fp,"%s\n",reason); else fprintf(fp,"reason?\n");
   fflush(NULL); fclose(fp);  // BUG. the contents are deleted after it is closed.    fflush(NULL); fclose(fp);
   // m = make_error2(reason,file,line,gsl_errno);    // m = make_error2(reason,file,line,gsl_errno);
   //  send_ox_cmo(fd_rw, m);  ox_flush(fd_rw);    //  send_ox_cmo(fd_rw, m);  ox_flush(fd_rw);
   // send error packet even it is not asked. Todo, OK? --> no    // send error packet even it is not asked. Todo, OK? --> no
   restart();    restart();
 }  }
   
 void push_error_from_file() {  void push_error_from_file() {
   FILE *fp;    FILE *fp;
 #define BUF_SIZE 1024  #define BUF_SIZE 1024
Line 400  void push_error_from_file() {
Line 399  void push_error_from_file() {
   cmo *m;    cmo *m;
   fprintf(stderr,"push_error_from_file()\n");    fprintf(stderr,"push_error_from_file()\n");
   sprintf(logname,"/tmp/ox_gsl-%d.txt",(int) getpid());    sprintf(logname,"/tmp/ox_gsl-%d.txt",(int) getpid());
   fp = fopen(logname,"w");    fp = fopen(logname,"r");
   if (fp == NULL) return;    if (fp == NULL) {
       fprintf(stderr,"open %s is failed\n",logname); return;
     }
   fgets(cmd,BUF_SIZE-2,fp); sscanf(cmd,"%d",&gsl_errno);    fgets(cmd,BUF_SIZE-2,fp); sscanf(cmd,"%d",&gsl_errno);
   fgets(cmd,BUF_SIZE-2,fp); sscanf(cmd,"%d",&line);    fgets(cmd,BUF_SIZE-2,fp); sscanf(cmd,"%d",&line);
   fgets(file,BUF_SIZE-2,fp);  #define remove_newline(s) {char *tmp_pos; if ((tmp_pos=strchr(s,'\n')) != NULL) *tmp_pos = '\0';}
   fgets(reason,BUF_SIZE-2,fp);    fgets(file,BUF_SIZE-2,fp);  remove_newline(file);
     fgets(reason,BUF_SIZE-2,fp); remove_newline(reason);
   fclose(fp);    fclose(fp);
   m = make_error2(reason,file,line,gsl_errno);    m = make_error2(reason,file,line,gsl_errno);
   push(m);    push(m);
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>