diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1997-08-29 15:37:22 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1997-08-29 15:37:22 +0000 |
| commit | bec90463c896d78e84bb1c2802c671f1d4e6854f (patch) | |
| tree | a65319f63114593490c1685867026eee511ebd15 /byterun/debugger.c | |
| parent | 891e4e9c276994f0badbc5c9df619afa9183ea32 (diff) | |
Revu completement l'allocation des buffers d'I/O.
Nettoyage du code d'I/O.
Ajout de hooks pour verrouiller en conjonction avec otherlibs/systhreads.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1693 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/debugger.c')
| -rw-r--r-- | byterun/debugger.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/byterun/debugger.c b/byterun/debugger.c index fb87f1978..368011d8b 100644 --- a/byterun/debugger.c +++ b/byterun/debugger.c @@ -72,10 +72,8 @@ static void open_connection() if (dbg_socket == -1 || connect(dbg_socket, &sock_addr.s_gen, sock_addr_len) == -1) fatal_error("cannot connect to debugger"); - dbg_in = open_descr(dbg_socket); - if (!debugger_in_use) register_global_root((value *) &dbg_in); - dbg_out = open_descr(dbg_socket); - if (!debugger_in_use) register_global_root((value *) &dbg_out); + dbg_in = open_descriptor(dbg_socket); + dbg_out = open_descriptor(dbg_socket); if (!debugger_in_use) putword(dbg_out, -1); /* first connection */ putword(dbg_out, getpid()); flush(dbg_out); @@ -155,11 +153,11 @@ static void safe_output_value(chan, val) { struct longjmp_buffer raise_buf, * saved_external_raise; - /* Catch exceptions raised by output_value */ + /* Catch exceptions raised by output_val */ saved_external_raise = external_raise; if (sigsetjmp(raise_buf.buf, 1) == 0) { external_raise = &raise_buf; - output_value(chan, val, Val_unit); + output_val(chan, val, Val_unit); } else { /* Send wrong magic number, will cause input_value to fail */ really_putblock(chan, "\000\000\000\000", 4); |