Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug where some unclosed channels could be discarded without flushing 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15817 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2015-02-06 21:58:00 +00:00
parent 97b2fe76ae
commit 46f6fe62f3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
byterun/io.c
View File

@ -420,14 +420,23 @@ CAMLexport intnat caml_input_scan_line(struct channel *channel)
/* OCaml entry points for the I/O functions. Wrap struct channel *
objects into a heap-allocated object. Perform locking
and unlocking around the I/O operations. */
/* FIXME CAMLexport, but not in io.h exported for Cash ? */
CAMLexport void caml_finalize_channel(value vchan)
{
struct channel * chan = Channel(vchan);
if (--chan->refcount > 0) return;
if (caml_channel_mutex_free != NULL) (*caml_channel_mutex_free)(chan);
unlink_channel(chan);
caml_stat_free(chan);
/* If the buffer is empty, remove the channel from the list of all
open channels and free it. Otherwise, keep it around so the Ocaml
[at_exit] function gets a chance to flush it.
We would want to simply flush the channel now, but flushing can
raise exceptions, which is forbidden in a finalization function.
*/
if (chan->curr == chan->buff){
unlink_channel(chan);
caml_stat_free(chan);
}
}
static int compare_channel(value vchan1, value vchan2)