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

fix missing locking

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-08-03 21:05:53 +01:00
parent c081d01e78
commit 91db3beeeb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
C/readutil.c
View File

@ -55,22 +55,25 @@ rl_to_codes(Term TEnd, int do_as_binary, int arity)
if (do_as_binary && !binary_stream) if (do_as_binary && !binary_stream)
Stream[sno].status &= ~Binary_Stream_f; Stream[sno].status &= ~Binary_Stream_f;
if (sz == -1 || sz == 0) { if (sz == -1 || sz == 0) {
UNLOCK(Stream[sno].streamlock);
if (Stream[sno].status & Eof_Stream_f) { if (Stream[sno].status & Eof_Stream_f) {
UNLOCK(Stream[sno].streamlock);
return Yap_unify_constant(ARG2, MkAtomTerm (AtomEof)); return Yap_unify_constant(ARG2, MkAtomTerm (AtomEof));
} }
UNLOCK(Stream[sno].streamlock);
return FALSE; return FALSE;
} }
if (Stream[sno].status & Eof_Stream_f || buf[sz-1] == 10) { if (Stream[sno].status & Eof_Stream_f || buf[sz-1] == 10) {
/* we're done */ /* we're done */
Term end; Term end;
UNLOCK(Stream[sno].streamlock);
if (!(do_as_binary || Stream[sno].status & Eof_Stream_f)) { if (!(do_as_binary || Stream[sno].status & Eof_Stream_f)) {
UNLOCK(Stream[sno].streamlock);
/* handle CR before NL */ /* handle CR before NL */
if (sz-2 >= 0 && buf[sz-2] == 13) if (sz-2 >= 0 && buf[sz-2] == 13)
buf[sz-2] = '\0'; buf[sz-2] = '\0';
else else
buf[sz-1] = '\0'; buf[sz-1] = '\0';
} else {
UNLOCK(Stream[sno].streamlock);
} }
if (arity == 2) if (arity == 2)
end = TermNil; end = TermNil;
@ -133,6 +136,7 @@ p_stream_to_codes(void)
HBASE = RepPair(ARG4); HBASE = RepPair(ARG4);
} }
} }
UNLOCK(Stream[sno].streamlock);
if (H == HBASE) if (H == HBASE)
return Yap_unify(ARG2,ARG3); return Yap_unify(ARG2,ARG3);
RESET_VARIABLE(H-1); RESET_VARIABLE(H-1);
@ -156,12 +160,14 @@ p_stream_to_terms(void)
{ {
Term th = Yap_Parse(); Term th = Yap_Parse();
if (H >= ASP-1024) { if (H >= ASP-1024) {
UNLOCK(Stream[sno].streamlock);
Yap_Error(OUT_OF_STACK_ERROR, ARG1, "read_stream_to_terms/3"); Yap_Error(OUT_OF_STACK_ERROR, ARG1, "read_stream_to_terms/3");
return FALSE; return FALSE;
} }
if (!th || Yap_ErrorMessage) if (!th || Yap_ErrorMessage)
break; break;
if (th == MkAtomTerm (AtomEof)) { if (th == MkAtomTerm (AtomEof)) {
UNLOCK(Stream[sno].streamlock);
Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable); Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable);
return Yap_unify(t,ARG2); return Yap_unify(t,ARG2);
} else { } else {
@ -170,6 +176,7 @@ p_stream_to_terms(void)
} }
Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable); Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable);
} }
UNLOCK(Stream[sno].streamlock);
return Yap_unify(t,ARG2); return Yap_unify(t,ARG2);
} }