Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unix library: better API for "close-on-exec" over file descriptors #650

Merged
merged 16 commits into from
Feb 13, 2017
Merged

Unix library: better API for "close-on-exec" over file descriptors #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
127cd4f
Experiment: better control of file descriptor inheritance across exec()
xavierleroy Jun 30, 2016
2b59957
win32unix implementation of the new close-on-exec API
xavierleroy Jun 30, 2016
d21f16e
Unix.dup implementation: wrong order of arguments to fcntl
xavierleroy Jul 1, 2016
650775f
Unix.dup implementation: missing 3rd argument to fcntl
xavierleroy Jul 1, 2016
3baced0
Default value of 'close on exec' is now a C variable instead of a macro
xavierleroy Jul 3, 2016
a7e9353
Add tests for the Unix library, focusing on close-on-exec behavior
xavierleroy Jul 4, 2016
f771a71
Bug fixing in the Unix library for Windows
xavierleroy Jul 4, 2016
b9bb7fb
Better implementation of Unix.createprocess for Win32
xavierleroy Jan 3, 2017
7f5da0e
Typo in open_process_out (double close in the exception handler)
xavierleroy Jan 4, 2017
3027671
Update the Win32 implementation of unix.ml
xavierleroy Jan 4, 2017
8b94f5c
Fix type error in open_process_full
xavierleroy Jan 4, 2017
0ccc5b4
Test redirections.ml incorrect under Win32
xavierleroy Jan 4, 2017
be87319
Merge branch 'cloexec' of ssh://github.com/ocaml/ocaml into cloexec
xavierleroy Jan 4, 2017
bfada79
Unix API: document the [?cloexec] optional arguments. Also add Chang…
xavierleroy Jan 23, 2017
9f5edb5
Add more documentation about the ~cloexec flag
xavierleroy Feb 3, 2017
2b6a82d
Update the documentation about the ~cloexec flag
xavierleroy Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ Next version (4.05.0):

### Other libraries:

- GPR#650: in the Unix library, add `?cloexec:bool` optional arguments to
functions that create file descriptors (`dup`, `dup2`, `pipe`, `socket`,
`socketpair`, `accept`). Implement these optional arguments in the
most atomic manner provided by the operating system to set (or clear)
the close-on-exec flag at the same time the file descriptor is created,
reducing the risk of race conditions with `exec` or `create_process`
calls running in other threads, and improving security. Also: add a
`O_KEEPEXEC` flag for `openfile` by symmetry with `O_CLOEXEC`.
(Xavier Leroy)

- MPR#7339, GPR#787: Support the '0 dimension' case for bigarrays
(see Bigarray documentation)
(Laurent Mazare,
Expand Down
15 changes: 15 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,21 @@ if sh ./hasgot nice; then
echo "#define HAS_NICE" >> s.h
fi

if sh ./hasgot dup3; then
inf "dup3() found"
echo "#define HAS_DUP3" >> s.h
fi

if sh ./hasgot pipe2; then
inf "pipe2() found"
echo "#define HAS_PIPE2" >> s.h
fi

if sh ./hasgot accept4; then
inf "accept4() found"
echo "#define HAS_ACCEPT4" >> s.h
fi

# Determine if the debugger is supported

if test -n "$with_debugger"; then
Expand Down
10 changes: 6 additions & 4 deletions otherlibs/systhreads/threadUnix.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ val select :

(** {6 Pipes and redirections} *)

val pipe : unit -> Unix.file_descr * Unix.file_descr
val pipe : ?cloexec:bool -> unit -> Unix.file_descr * Unix.file_descr
val open_process_in: string -> in_channel
val open_process_out: string -> out_channel
val open_process: string -> in_channel * out_channel
Expand All @@ -75,9 +75,11 @@ val sleep : int -> unit

(** {6 Sockets} *)

val socket : Unix.socket_domain ->
Unix.socket_type -> int -> Unix.file_descr
val accept : Unix.file_descr -> Unix.file_descr * Unix.sockaddr
val socket :
?cloexec:bool -> Unix.socket_domain -> Unix.socket_type -> int ->
Unix.file_descr
val accept :
?cloexec:bool -> Unix.file_descr -> Unix.file_descr * Unix.sockaddr
val connect : Unix.file_descr -> Unix.sockaddr -> unit
val recv : Unix.file_descr -> bytes ->
int -> int -> Unix.msg_flag list -> int
Expand Down
11 changes: 7 additions & 4 deletions otherlibs/threads/threadUnix.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ val select :

(** {6 Pipes and redirections} *)

val pipe : unit -> Unix.file_descr * Unix.file_descr
val pipe : ?cloexec:bool -> unit -> Unix.file_descr * Unix.file_descr
val open_process_in : string -> in_channel
val open_process_out : string -> out_channel
val open_process : string -> in_channel * out_channel
Expand All @@ -75,11 +75,14 @@ val sleep : int -> unit

(** {6 Sockets} *)

val socket : Unix.socket_domain -> Unix.socket_type -> int -> Unix.file_descr
val socket :
?cloexec:bool -> Unix.socket_domain -> Unix.socket_type -> int ->
Unix.file_descr
val socketpair :
Unix.socket_domain -> Unix.socket_type -> int ->
?cloexec:bool -> Unix.socket_domain -> Unix.socket_type -> int ->
Unix.file_descr * Unix.file_descr
val accept : Unix.file_descr -> Unix.file_descr * Unix.sockaddr
val accept :
?cloexec:bool -> Unix.file_descr -> Unix.file_descr * Unix.sockaddr
val connect : Unix.file_descr -> Unix.sockaddr -> unit
val recv :
Unix.file_descr -> bytes -> int -> int -> Unix.msg_flag list -> int
Expand Down
Loading