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

avoid too long messages

Browse Source 
back to top level if Yap_Error is called in a critical region.
This commit is contained in:
Vitor Santos Costa 2009-05-23 15:51:00 -05:00
parent 4d497193b6
commit b9a7d24e8b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
C/errors.c
View File

@ -232,6 +232,7 @@ dump_stack(void)
CELL *env_ptr = ENV; CELL *env_ptr = ENV;
char tp[256]; char tp[256];
yamop *ipc = CP; yamop *ipc = CP;
int max_count = 200;
#if DEBUG #if DEBUG
fprintf(stderr,"%% YAP regs: P=%p, CP=%p, ASP=%p, H=%p, TR=%p, HeapTop=%p\n",P,CP,ASP,H,TR,HeapTop); fprintf(stderr,"%% YAP regs: P=%p, CP=%p, ASP=%p, H=%p, TR=%p, HeapTop=%p\n",P,CP,ASP,H,TR,HeapTop);
@ -286,10 +287,18 @@ dump_stack(void)
} else { } else {
fprintf(stderr,"%% %s\n", tp); fprintf(stderr,"%% %s\n", tp);
} }
if (!max_count--) {
fprintf(stderr,"%% .....\n");
return;
}
ipc = (yamop *)(env_ptr[E_CP]); ipc = (yamop *)(env_ptr[E_CP]);
env_ptr = (CELL *)(env_ptr[E_E]); env_ptr = (CELL *)(env_ptr[E_E]);
} }
if (b_ptr) { if (b_ptr) {
if (!max_count--) {
fprintf(stderr,"%% .....\n");
return;
}
if (b_ptr->cp_ap && /* tabling */ if (b_ptr->cp_ap && /* tabling */
b_ptr->cp_ap->opc != Yap_opcode(_or_else) && b_ptr->cp_ap->opc != Yap_opcode(_or_else) &&
b_ptr->cp_ap->opc != Yap_opcode(_or_last) && b_ptr->cp_ap->opc != Yap_opcode(_or_last) &&
@ -1764,6 +1773,17 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
ActiveSignals = 0; ActiveSignals = 0;
CreepFlag = CalculateStackGap(); CreepFlag = CalculateStackGap();
Yap_PrologMode &= ~InErrorMode; Yap_PrologMode &= ~InErrorMode;
LOCK(SignalLock);
/* we might be in the middle of a critical region */
if (!Yap_InterruptsDisabled) {
UncaughtThrow = TRUE;
UNLOCK(SignalLock);
#if PUSH_REGS
restore_absmi_regs(&Yap_standard_regs);
#endif
siglongjmp(Yap_RestartEnv,1);
}
UNLOCK(SignalLock);
if (type == PURE_ABORT) if (type == PURE_ABORT)
Yap_JumpToEnv(MkAtomTerm(AtomDAbort)); Yap_JumpToEnv(MkAtomTerm(AtomDAbort));
else else