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

fix output stream usage

Browse Source
This commit is contained in:
Ricardo Rocha 2011-07-26 15:26:01 +01:00
parent 69f1bedf47
commit 31b3eeaae6
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
OPTYap/opt.preds.c
View File

@ -393,17 +393,17 @@ static Int p_show_tabled_predicates( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
tab_ent_ptr tab_ent; tab_ent_ptr tab_ent;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
tab_ent = GLOBAL_root_tab_ent; tab_ent = GLOBAL_root_tab_ent;
Sfprintf(out, "Tabled predicates\n"); Sfprintf(out, "Tabled predicates\n");
if (tab_ent == NULL) if (tab_ent == NULL)
Sfprintf(out, " NONE\n"); Sfprintf(out, " NONE\n");
else else while(tab_ent) {
while(tab_ent) {
Sfprintf(out, " %s/%d\n", AtomName(TabEnt_atom(tab_ent)), TabEnt_arity(tab_ent)); Sfprintf(out, " %s/%d\n", AtomName(TabEnt_atom(tab_ent)), TabEnt_arity(tab_ent));
tab_ent = TabEnt_next(tab_ent); tab_ent = TabEnt_next(tab_ent);
} }
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
@ -413,7 +413,7 @@ static Int p_show_table( USES_REGS1 ) {
Term mod, t; Term mod, t;
tab_ent_ptr tab_ent; tab_ent_ptr tab_ent;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
mod = Deref(ARG2); mod = Deref(ARG2);
t = Deref(ARG3); t = Deref(ARG3);
@ -421,9 +421,12 @@ static Int p_show_table( USES_REGS1 ) {
tab_ent = RepPredProp(PredPropByAtom(AtomOfTerm(t), mod))->TableOfPred; tab_ent = RepPredProp(PredPropByAtom(AtomOfTerm(t), mod))->TableOfPred;
else if (IsApplTerm(t)) else if (IsApplTerm(t))
tab_ent = RepPredProp(PredPropByFunc(FunctorOfTerm(t), mod))->TableOfPred; tab_ent = RepPredProp(PredPropByFunc(FunctorOfTerm(t), mod))->TableOfPred;
else else {
PL_release_stream(out);
return (FALSE); return (FALSE);
}
show_table(tab_ent, SHOW_MODE_STRUCTURE, out); show_table(tab_ent, SHOW_MODE_STRUCTURE, out);
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
@ -432,20 +435,31 @@ static Int p_show_all_tables( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
tab_ent_ptr tab_ent; tab_ent_ptr tab_ent;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
tab_ent = GLOBAL_root_tab_ent; tab_ent = GLOBAL_root_tab_ent;
while(tab_ent) { while(tab_ent) {
show_table(tab_ent, SHOW_MODE_STRUCTURE, out); show_table(tab_ent, SHOW_MODE_STRUCTURE, out);
tab_ent = TabEnt_next(tab_ent); tab_ent = TabEnt_next(tab_ent);
} }
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
static Int p_show_all_local_tables( USES_REGS1 ) { static Int p_show_all_local_tables( USES_REGS1 ) {
#ifdef THREADS #ifdef THREADS
IOSTREAM *out;
tab_ent_ptr tab_ent;
if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE);
tab_ent = GLOBAL_root_tab_ent;
while(tab_ent) {
show_table(tab_ent, SHOW_MODE_STRUCTURE, out);
tab_ent = TabEnt_next(tab_ent);
}
PL_release_stream(out);
#else #else
p_show_all_tables(); p_show_all_tables();
#endif /* THREADS */ #endif /* THREADS */
@ -456,9 +470,10 @@ static Int p_show_all_local_tables( USES_REGS1 ) {
static Int p_show_global_trie( USES_REGS1 ) { static Int p_show_global_trie( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
show_global_trie(SHOW_MODE_STRUCTURE, out); show_global_trie(SHOW_MODE_STRUCTURE, out);
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
@ -468,7 +483,7 @@ static Int p_show_statistics_table( USES_REGS1 ) {
Term mod, t; Term mod, t;
tab_ent_ptr tab_ent; tab_ent_ptr tab_ent;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
mod = Deref(ARG2); mod = Deref(ARG2);
t = Deref(ARG3); t = Deref(ARG3);
@ -476,9 +491,12 @@ static Int p_show_statistics_table( USES_REGS1 ) {
tab_ent = RepPredProp(PredPropByAtom(AtomOfTerm(t), mod))->TableOfPred; tab_ent = RepPredProp(PredPropByAtom(AtomOfTerm(t), mod))->TableOfPred;
else if (IsApplTerm(t)) else if (IsApplTerm(t))
tab_ent = RepPredProp(PredPropByFunc(FunctorOfTerm(t), mod))->TableOfPred; tab_ent = RepPredProp(PredPropByFunc(FunctorOfTerm(t), mod))->TableOfPred;
else else {
PL_release_stream(out);
return (FALSE); return (FALSE);
}
show_table(tab_ent, SHOW_MODE_STATISTICS, out); show_table(tab_ent, SHOW_MODE_STATISTICS, out);
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
@ -487,7 +505,7 @@ static Int p_show_statistics_tabling( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
long total_bytes = 0, aux_bytes; long total_bytes = 0, aux_bytes;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
aux_bytes = 0; aux_bytes = 0;
Sfprintf(out, "Execution data structures\n"); Sfprintf(out, "Execution data structures\n");
@ -518,15 +536,17 @@ static Int p_show_statistics_tabling( USES_REGS1 ) {
#else #else
Sfprintf(out, "Total memory in use (I+II+III): %10ld bytes\n", total_bytes); Sfprintf(out, "Total memory in use (I+II+III): %10ld bytes\n", total_bytes);
#endif /* USE_PAGES_MALLOC */ #endif /* USE_PAGES_MALLOC */
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
static Int p_show_statistics_global_trie( USES_REGS1 ) { static Int p_show_statistics_global_trie( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
show_global_trie(SHOW_MODE_STATISTICS, out); show_global_trie(SHOW_MODE_STATISTICS, out);
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
#endif /* TABLING */ #endif /* TABLING */
@ -592,7 +612,7 @@ static Int p_yapor_workers( USES_REGS1 ) {
return Yap_unify(MkIntegerTerm(GLOBAL_number_workers),ARG1); return Yap_unify(MkIntegerTerm(GLOBAL_number_workers),ARG1);
#else #else
return FALSE; return FALSE;
#endif #endif /* YAPOR_THREADS */
} }
@ -628,7 +648,7 @@ static Int p_show_statistics_or( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
long total_bytes = 0, aux_bytes; long total_bytes = 0, aux_bytes;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
aux_bytes = 0; aux_bytes = 0;
Sfprintf(out, "Execution data structures\n"); Sfprintf(out, "Execution data structures\n");
@ -649,6 +669,7 @@ static Int p_show_statistics_or( USES_REGS1 ) {
#else #else
Sfprintf(out, "Total memory in use (I+II): %10ld bytes\n", total_bytes); Sfprintf(out, "Total memory in use (I+II): %10ld bytes\n", total_bytes);
#endif /* USE_PAGES_MALLOC */ #endif /* USE_PAGES_MALLOC */
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
#endif /* YAPOR */ #endif /* YAPOR */
@ -664,7 +685,7 @@ static Int p_show_statistics_opt( USES_REGS1 ) {
IOSTREAM *out; IOSTREAM *out;
long total_bytes = 0, aux_bytes; long total_bytes = 0, aux_bytes;
if ((out = YAP_TermToStream(Deref(ARG1))) == NULL) if (!PL_get_stream_handle(Yap_InitSlot(Deref(ARG1) PASS_REGS), &out))
return (FALSE); return (FALSE);
aux_bytes = 0; aux_bytes = 0;
Sfprintf(out, "Execution data structures\n"); Sfprintf(out, "Execution data structures\n");
@ -707,6 +728,7 @@ static Int p_show_statistics_opt( USES_REGS1 ) {
#else #else
Sfprintf(out, "Total memory in use (I+II+III+IV): %10ld bytes\n", total_bytes); Sfprintf(out, "Total memory in use (I+II+III+IV): %10ld bytes\n", total_bytes);
#endif /* USE_PAGES_MALLOC */ #endif /* USE_PAGES_MALLOC */
PL_release_stream(out);
return (TRUE); return (TRUE);
} }
#endif /* YAPOR && TABLING */ #endif /* YAPOR && TABLING */