Merge pull request #3592 from ethcore/mio-cpu-fix
Fix CPU usage when idle
This commit is contained in:
		
						commit
						34ab265b68
					
				
							
								
								
									
										8
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							@ -385,7 +385,7 @@ version = "1.5.0"
 | 
			
		||||
dependencies = [
 | 
			
		||||
 "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "mio 0.6.1 (git+https://github.com/carllerche/mio)",
 | 
			
		||||
 "mio 0.6.1 (git+https://github.com/ethcore/mio)",
 | 
			
		||||
 "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
]
 | 
			
		||||
@ -475,7 +475,7 @@ dependencies = [
 | 
			
		||||
 "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "mio 0.6.1 (git+https://github.com/carllerche/mio)",
 | 
			
		||||
 "mio 0.6.1 (git+https://github.com/ethcore/mio)",
 | 
			
		||||
 "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "rlp 0.1.0",
 | 
			
		||||
@ -1026,7 +1026,7 @@ dependencies = [
 | 
			
		||||
[[package]]
 | 
			
		||||
name = "mio"
 | 
			
		||||
version = "0.6.1"
 | 
			
		||||
source = "git+https://github.com/carllerche/mio#56f8663510196fdca04bdf7c5f4d60b24297826f"
 | 
			
		||||
source = "git+https://github.com/ethcore/mio#ef182bae193a9c7457cd2cf661fcaffb226e3eef"
 | 
			
		||||
dependencies = [
 | 
			
		||||
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
 "lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 | 
			
		||||
@ -2053,7 +2053,7 @@ dependencies = [
 | 
			
		||||
"checksum mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)" = "<none>"
 | 
			
		||||
"checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
 | 
			
		||||
"checksum mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)" = "<none>"
 | 
			
		||||
"checksum mio 0.6.1 (git+https://github.com/carllerche/mio)" = "<none>"
 | 
			
		||||
"checksum mio 0.6.1 (git+https://github.com/ethcore/mio)" = "<none>"
 | 
			
		||||
"checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a"
 | 
			
		||||
"checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
 | 
			
		||||
"checksum nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)" = "<none>"
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,7 @@ version = "1.5.0"
 | 
			
		||||
authors = ["Ethcore <admin@ethcore.io>"]
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
mio = { git = "https://github.com/carllerche/mio" }
 | 
			
		||||
mio = { git = "https://github.com/ethcore/mio" }
 | 
			
		||||
crossbeam = "0.2"
 | 
			
		||||
parking_lot = "0.3"
 | 
			
		||||
log = "0.3"
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@ authors = ["Ethcore <admin@ethcore.io>"]
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
log = "0.3"
 | 
			
		||||
mio = { git = "https://github.com/carllerche/mio" }
 | 
			
		||||
mio = { git = "https://github.com/ethcore/mio" }
 | 
			
		||||
bytes = "0.3.0"
 | 
			
		||||
rand = "0.3.12"
 | 
			
		||||
time = "0.1.34"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user