Merge pull request #3716 from ethcore/fdlimit

Use fdlimit utility crate from crates.io

Cargo.lock

@@ -24,7 +24,7 @@ dependencies = [
  "ethcore-stratum 1.4.0",
  "ethcore-util 1.5.0",
  "ethsync 1.5.0",
- "fdlimit 0.1.0",
+ "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -684,7 +684,8 @@ dependencies = [
 
 [[package]]
 name = "fdlimit"
-version = "0.1.0"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2027,6 +2028,7 @@ dependencies = [
 "checksum env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aba65b63ffcc17ffacd6cf5aa843da7c5a25e3bd4bbe0b7def8b214e411250e5"
 "checksum eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)" = "<none>"
 "checksum ethabi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0c53453517f620847be51943db329276ae52f2e210cfc659e81182864be2f"
+"checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa"
 "checksum flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb"
 "checksum gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "91ecd03771effb0c968fd6950b37e89476a578aaf1c70297d8e92b6516ec3312"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"

Cargo.toml

@@ -30,7 +30,7 @@ serde = "0.8.0"
 serde_json = "0.8.0"
 hyper = { version = "0.9", default-features = false }
 ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
-fdlimit = { path = "util/fdlimit" }
+fdlimit = "0.1"
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
 ethsync = { path = "sync" }

util/fdlimit/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-description = "Utility function to raise file descriptor limit on OS X"
-homepage = "http://ethcore.io"
-license = "GPL-3.0"
-name = "fdlimit"
-version = "0.1.0"
-authors = ["Ethcore <admin@ethcore.io>"]
-
-[dependencies]
-libc = "0.2"

util/fdlimit/src/lib.rs

@@ -1,19 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-//
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.extern crate libc;
-
-extern crate libc;
-mod raise_fd_limit;
-pub use raise_fd_limit::raise_fd_limit;

util/fdlimit/src/raise_fd_limit.rs

@@ -1,88 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-/// darwin_fd_limit exists to work around an issue where launchctl on Mac OS X
-/// defaults the rlimit maxfiles to 256/unlimited. The default soft limit of 256
-/// ends up being far too low for our multithreaded scheduler testing, depending
-/// on the number of cores available.
-///
-#[cfg(any(target_os = "macos", target_os = "ios"))]
-#[allow(non_camel_case_types)]
-pub fn raise_fd_limit() {
-	use libc;
-	use std::cmp;
-	use std::io;
-	use std::mem::size_of_val;
-	use std::ptr::null_mut;
-
-	unsafe {
-		static CTL_KERN: libc::c_int = 1;
-		static KERN_MAXFILESPERPROC: libc::c_int = 29;
-
-		// The strategy here is to fetch the current resource limits, read the
-		// kern.maxfilesperproc sysctl value, and bump the soft resource limit for
-		// maxfiles up to the sysctl value.
-
-		// Fetch the kern.maxfilesperproc value
-		let mut mib: [libc::c_int; 2] = [CTL_KERN, KERN_MAXFILESPERPROC];
-		let mut maxfiles: libc::c_int = 0;
-		let mut size: libc::size_t = size_of_val(&maxfiles) as libc::size_t;
-		if libc::sysctl(&mut mib[0], 2, &mut maxfiles as *mut _ as *mut _, &mut size,
-				  null_mut(), 0) != 0 {
-			let err = io::Error::last_os_error();
-			panic!("raise_fd_limit: error calling sysctl: {}", err);
-		}
-
-		// Fetch the current resource limits
-		let mut rlim = libc::rlimit{rlim_cur: 0, rlim_max: 0};
-		if libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) != 0 {
-			let err = io::Error::last_os_error();
-			panic!("raise_fd_limit: error calling getrlimit: {}", err);
-		}
-
-		// Bump the soft limit to the smaller of kern.maxfilesperproc and the hard
-		// limit
-		rlim.rlim_cur = cmp::min(maxfiles as libc::rlim_t, rlim.rlim_max);
-
-		// Set our newly-increased resource limit
-		if libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) != 0 {
-			let err = io::Error::last_os_error();
-			panic!("raise_fd_limit: error calling setrlimit: {}", err);
-		}
-	}
-}
-
-#[cfg(any(target_os = "linux"))]
-#[allow(non_camel_case_types)]
-pub fn raise_fd_limit() {
-	use libc;
-	use std::io;
-
-	unsafe {
-		// Fetch the current resource limits
-		let mut rlim = libc::rlimit{rlim_cur: 0, rlim_max: 0};
-		if libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) != 0 {
-			let err = io::Error::last_os_error();
-			panic!("raise_fd_limit: error calling getrlimit: {}", err);
-		}
-
-		// Set soft limit to hard imit
-		rlim.rlim_cur = rlim.rlim_max;
-
-		// Set our newly-increased resource limit
-		if libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) != 0 {
-			let err = io::Error::last_os_error();
-			panic!("raise_fd_limit: error calling setrlimit: {}", err);
-		}
-	}
-}
-
-#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "linux")))]
-pub fn raise_fd_limit() {}