Extract create_shmem into the shmemfdrs crate

(which adds support for FreeBSD SHM_ANON)

Author: valpackett

Cargo.toml

@@ -8,23 +8,23 @@ repository = "https://github.com/servo/ipc-channel"
 
 [features]
 force-inprocess = []
-memfd = ["syscall"]
+memfd = ["shmemfdrs/memfd"]
 unstable = []
 async = ["futures"]
 
 [dependencies]
 bincode = "0.9"
 lazy_static = "1"
-libc = "0.2.12"
+libc = "0.2.34"
 rand = "0.3"
 serde = { version="1.0", features=["rc"] }
 uuid = {version = "0.5", features = ["v4"]}
 fnv = "1.0.3"
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 mio = "0.6.11"
+shmemfdrs = "0.1"
 
-syscall = { version = "0.2.1", optional = true }
 futures = { version = "0.1", optional = true }
 
 [dev-dependencies]

src/lib.rs

@@ -26,10 +26,9 @@ extern crate mio;
 #[cfg(all(not(feature = "force-inprocess"), any(target_os = "linux",
                                                 target_os = "freebsd")))]
 extern crate fnv;
-#[cfg(all(feature = "memfd", not(feature = "force-inprocess"),
-          target_os="linux"))]
-#[macro_use]
-extern crate syscall;
+#[cfg(all(not(feature = "force-inprocess"), any(target_os = "linux",
+                                                target_os = "freebsd")))]
+extern crate shmemfdrs;
 
 #[cfg(feature = "async")]
 extern crate futures;

src/platform/unix/mod.rs

@@ -11,7 +11,7 @@ use bincode;
 use fnv::FnvHasher;
 use libc::{self, MAP_FAILED, MAP_SHARED, PROT_READ, PROT_WRITE, SOCK_SEQPACKET, SOL_SOCKET};
 use libc::{SO_LINGER, S_IFMT, S_IFSOCK, c_char, c_int, c_void, getsockopt};
-use libc::{iovec, mode_t, msghdr, off_t, recvmsg, sendmsg};
+use libc::{iovec, mode_t, msghdr, recvmsg, sendmsg};
 use libc::{setsockopt, size_t, sockaddr, sockaddr_un, socketpair, socklen_t, sa_family_t};
 use std::cell::Cell;
 use std::cmp;
@@ -31,6 +31,7 @@ use std::time::UNIX_EPOCH;
 use std::thread;
 use mio::unix::EventedFd;
 use mio::{Poll, Token, Events, Ready, PollOpt};
+use shmemfdrs::create_shmem;
 
 const MAX_FDS_IN_CMSG: u32 = 64;
 
@@ -945,31 +946,6 @@ fn recv(fd: c_int, blocking_mode: BlockingMode)
     Ok((main_data_buffer, channels, shared_memory_regions))
 }
 
-#[cfg(not(all(target_os="linux", feature="memfd")))]
-fn create_shmem(name: CString, length: usize) -> c_int {
-    unsafe {
-        // NB: the FreeBSD man page for shm_unlink states that it requires
-        // write permissions, but testing shows that read-write is required.
-        let fd = libc::shm_open(name.as_ptr(),
-                                libc::O_CREAT | libc::O_RDWR | libc::O_EXCL,
-                                0o600);
-        assert!(fd >= 0);
-        assert!(libc::shm_unlink(name.as_ptr()) == 0);
-        assert!(libc::ftruncate(fd, length as off_t) == 0);
-        fd
-    }
-}
-
-#[cfg(all(feature="memfd", target_os="linux"))]
-fn create_shmem(name: CString, length: usize) -> c_int {
-    unsafe {
-        let fd = memfd_create(name.as_ptr(), 0);
-        assert!(fd >= 0);
-        assert!(libc::ftruncate(fd, length as off_t) == 0);
-        fd
-    }
-}
-
 struct UnixCmsg {
     cmsg_buffer: *mut cmsghdr,
     msghdr: msghdr,
@@ -1045,11 +1021,6 @@ fn is_socket(fd: c_int) -> bool {
 
 // FFI stuff follows:
 
-#[cfg(all(feature="memfd", target_os="linux"))]
-unsafe fn memfd_create(name: *const c_char, flags: usize) -> c_int {
-    syscall!(MEMFD_CREATE, name, flags) as c_int
-}
-
 #[allow(non_snake_case)]
 fn CMSG_LEN(length: size_t) -> size_t {
     CMSG_ALIGN(mem::size_of::<cmsghdr>()) + length