diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alarm(0) should be careful to kill existing signals.

Browse Source
This commit is contained in:
Costa Vitor 2009-05-26 17:31:21 -05:00
parent f11eeb2967
commit 43e9e9f337
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
C/sysbits.c
View File

@ -2420,6 +2420,7 @@ p_alarm(void)
{ {
Term t = Deref(ARG1); Term t = Deref(ARG1);
Term t2 = Deref(ARG2); Term t2 = Deref(ARG2);
Int i1, i2;
if (IsVarTerm(t)) { if (IsVarTerm(t)) {
Yap_Error(INSTANTIATION_ERROR, t, "alarm/2"); Yap_Error(INSTANTIATION_ERROR, t, "alarm/2");
return(FALSE); return(FALSE);
@ -2436,13 +2437,25 @@ p_alarm(void)
Yap_Error(TYPE_ERROR_INTEGER, t2, "alarm/2"); Yap_Error(TYPE_ERROR_INTEGER, t2, "alarm/2");
return(FALSE); return(FALSE);
} }
i1 = IntegerOfTerm(t);
i2 = IntegerOfTerm(t2);
if (i1 == 0 && i2 == 0) {
LOCK(SignalLock);
if (ActiveSignals & YAP_ALARM_SIGNAL) {
ActiveSignals &= ~YAP_ALARM_SIGNAL;
if (!ActiveSignals) {
CreepFlag = CalculateStackGap();
}
}
UNLOCK(SignalLock);
}
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
{ {
Term tout; Term tout;
Int time[2]; Int time[2];
time[0] = IntegerOfTerm(t); time[0] = i1;
time[1] = IntegerOfTerm(t2); time[1] = i2;
if (time[0] != 0 && time[1] != 0) { if (time[0] != 0 && time[1] != 0) {
DWORD dwThreadId; DWORD dwThreadId;
@ -2470,8 +2483,8 @@ p_alarm(void)
new.it_interval.tv_sec = 0; new.it_interval.tv_sec = 0;
new.it_interval.tv_usec = 0; new.it_interval.tv_usec = 0;
new.it_value.tv_sec = IntegerOfTerm(t); new.it_value.tv_sec = i1;
new.it_value.tv_usec = IntegerOfTerm(t2); new.it_value.tv_usec = i2;
if (setitimer(ITIMER_REAL, &new, &old) < 0) { if (setitimer(ITIMER_REAL, &new, &old) < 0) {
#if HAVE_STRERROR #if HAVE_STRERROR
Yap_Error(OPERATING_SYSTEM_ERROR, ARG1, "setitimer: %s", strerror(errno)); Yap_Error(OPERATING_SYSTEM_ERROR, ARG1, "setitimer: %s", strerror(errno));
@ -2488,7 +2501,7 @@ p_alarm(void)
Int left; Int left;
Term tout; Term tout;
left = alarm(IntegerOfTerm(t)); left = alarm(i1);
tout = MkIntegerTerm(left); tout = MkIntegerTerm(left);
return Yap_unify(ARG3,tout) && Yap_unify(ARG4,MkIntTerm(0)) ; return Yap_unify(ARG3,tout) && Yap_unify(ARG4,MkIntTerm(0)) ;
} }