diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1997-05-13 15:46:49 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1997-05-13 15:46:49 +0000 |
| commit | d75dd36508169412b88e25276a841db3b940d061 (patch) | |
| tree | b4f79c9e045aef7cdf147861c62b8882b1287000 /otherlibs/unix/write.c | |
| parent | 31b160fdfa029eded4d95eac8436d1a04c59fb0c (diff) | |
Pour adaptation au compacteur: les I/O passent par un buffer
supplementaire hors du tas; suppression de unix_freeze_buffer
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1541 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/unix/write.c')
| -rw-r--r-- | otherlibs/unix/write.c | 46 |
1 files changed, 37 insertions, 9 deletions
diff --git a/otherlibs/unix/write.c b/otherlibs/unix/write.c index 6569fe3a6..5ae80459f 100644 --- a/otherlibs/unix/write.c +++ b/otherlibs/unix/write.c @@ -11,17 +11,45 @@ /* $Id$ */ +#include <errno.h> #include <mlvalues.h> +#include <memory.h> +#include <signals.h> #include "unixsupport.h" -value unix_write(fd, buf, ofs, len) /* ML */ - value fd, buf, ofs, len; +#ifndef EAGAIN +#define EAGAIN (-1) +#endif +#ifndef EWOULDBLOCK +#define EWOULDBLOCK (-1) +#endif + +value unix_write(fd, buf, vofs, vlen) /* ML */ + value fd, buf, vofs, vlen; { - int ret; - buf = unix_freeze_buffer(buf); - enter_blocking_section(); - ret = write(Int_val(fd), &Byte(buf, Long_val(ofs)), Int_val(len)); - leave_blocking_section(); - if (ret == -1) uerror("write", Nothing); - return Val_int(ret); + long ofs, len, written; + int numbytes, ret; + char iobuf[UNIX_BUFFER_SIZE]; + Push_roots(r, 1); + + r[0] = buf; + ofs = Long_val(vofs); + len = Long_val(vlen); + written = 0; + while (len > 0) { + numbytes = len > UNIX_BUFFER_SIZE ? UNIX_BUFFER_SIZE : len; + bcopy(&Byte(r[0], ofs), iobuf, numbytes); + enter_blocking_section(); + ret = write(Int_val(fd), iobuf, numbytes); + leave_blocking_section(); + if (ret == -1) { + if ((errno == EAGAIN || errno == EWOULDBLOCK) && written > 0) break; + uerror("write", Nothing); + } + written += ret; + ofs += ret; + len -= ret; + } + Pop_roots(); + return Val_long(written); } |