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

Diff for /OpenXM/src/kan96xx/Kan/ext.c between version 1.44 and 1.48

version 1.44, 2013/09/22 01:26:07 version 1.48, 2016/03/31 05:27:34
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.43 2012/12/23 01:27:54 takayama Exp $ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.47 2016/03/31 03:22:54 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include <string.h>  #include <string.h>
 #include <sys/types.h>  #include <sys/types.h>
Line 20 
Line 20 
 #include <errno.h>  #include <errno.h>
 #include <regex.h>  #include <regex.h>
 #include "ox_pathfinder.h"  #include "ox_pathfinder.h"
   #include "mysig.h"
   
 extern int Quiet;  extern int Quiet;
 extern char **environ;  extern char **environ;
Line 33  static void mywait() {
Line 34  static void mywait() {
   int status;    int status;
   int pid;    int pid;
   int i,j;    int i,j;
   /* signal(SIGCHLD,SIG_IGN); */    /* mysignal(SIGCHLD,SIG_IGN); */
   pid = wait(&status);    pid = wait(&status);
   if ((!Quiet) && (Verbose_mywait)) fprintf(stderr,"Child process %d is exiting.\n",pid);    if ((!Quiet) && (Verbose_mywait)) fprintf(stderr,"Child process %d is exiting.\n",pid);
   for (i=0; i<Mycp; i++) {    for (i=0; i<Mycp; i++) {
Line 44  static void mywait() {
Line 45  static void mywait() {
       if (Mycp > 0) Mycp--;        if (Mycp > 0) Mycp--;
     }      }
   }    }
   signal(SIGCHLD,mywait);    mysignal(SIGCHLD,mywait);
 }  }
   
 #define SIZE_OF_ENVSTACK 5  #define SIZE_OF_ENVSTACK 5
Line 109  struct object Kextension(struct object obj)
Line 110  struct object Kextension(struct object obj)
   char *abc;    char *abc;
   char *abc2;    char *abc2;
   extern struct context *CurrentContextp;    extern struct context *CurrentContextp;
     struct timeval tm;
 #if (__CYGWIN__)  #if (__CYGWIN__)
   extern sigjmp_buf EnvOfStackMachine;    extern sigjmp_buf EnvOfStackMachine;
 #else  #else
Line 142  struct object Kextension(struct object obj)
Line 144  struct object Kextension(struct object obj)
     pushEnv(EnvOfStackMachine);      pushEnv(EnvOfStackMachine);
     m = KSexecuteString(obj1.lc.str);      m = KSexecuteString(obj1.lc.str);
     /* This is critical area. If you catch ctrl-c here, program crashes. */      /* This is critical area. If you catch ctrl-c here, program crashes. */
     oldsig = signal(SIGINT,SIG_IGN);      oldsig = mysignal(SIGINT,SIG_IGN);
     popEnv(EnvOfStackMachine);      popEnv(EnvOfStackMachine);
     /* OK! We passed the critical area. */      /* OK! We passed the critical area. */
     signal(SIGINT,oldsig);      mysignal(SIGINT,oldsig);
     rob = KpoInteger(m);      rob = KpoInteger(m);
   }else if (strcmp(key,"getpid") == 0) {    }else if (strcmp(key,"getpid") == 0) {
     rob = KpoInteger( (int) getpid() );      rob = KpoInteger( (int) getpid() );
Line 181  struct object Kextension(struct object obj)
Line 183  struct object Kextension(struct object obj)
         } */          } */
   }else if (strcmp(key,"date")==0) {    }else if (strcmp(key,"date")==0) {
     if (size != 1) errorKan1("%s\n","[(date)] extension.");      if (size != 1) errorKan1("%s\n","[(date)] extension.");
     struct timeval tm;  
     gettimeofday(&tm,NULL);      gettimeofday(&tm,NULL);
     rob = KpoString(ctime(&((time_t)tm.tv_sec)));      rob = KpoString(ctime((time_t *)&(tm.tv_sec)));
   }else if (strcmp(key,"defaultPolyRing")==0) {    }else if (strcmp(key,"defaultPolyRing")==0) {
     if (size != 2) errorKan1("%s\n","[(defaultPolyRing) n] extension.");      if (size != 2) errorKan1("%s\n","[(defaultPolyRing) n] extension.");
     rob = KdefaultPolyRing(getoa(obj,1));      rob = KdefaultPolyRing(getoa(obj,1));
Line 255  struct object Kextension(struct object obj)
Line 256  struct object Kextension(struct object obj)
       if (m&2) {        if (m&2) {
          /* Do not call singal to turn around a trouble on cygwin. BUG. */           /* Do not call singal to turn around a trouble on cygwin. BUG. */
       }else{        }else{
          signal(SIGCHLD,mywait); /* to kill Zombie */           mysignal(SIGCHLD,mywait); /* to kill Zombie */
       }        }
       Mychildren[Mycp++] = pid;        Mychildren[Mycp++] = pid;
       if (Mycp >= MYCP_SIZE-1) {        if (Mycp >= MYCP_SIZE-1) {
Legend:
Removed from v.1.44  
changed lines
  Added in v.1.48
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>