Merge branch 'master' into dapps-sync

Conflicts:
	dapps/src/handlers/fetch.rs

parity/blockchain.rs

@@ -24,7 +24,8 @@ use std::sync::Arc;
 use rustc_serialize::hex::FromHex;
 use ethcore_logger::{setup_log, Config as LogConfig};
 use io::{PanicHandler, ForwardPanic};
-use util::{PayloadInfo, ToPretty};
+use util::ToPretty;
+use rlp::PayloadInfo;
 use ethcore::service::ClientService;
 use ethcore::client::{Mode, DatabaseCompactionProfile, Switch, VMType, BlockImportError, BlockChainClient, BlockID};
 use ethcore::error::ImportError;

parity/boot.rs

@@ -42,7 +42,7 @@ pub fn host_service<T: ?Sized + Send + Sync + 'static>(addr: &str, stop_guard: A
 		let mut worker = nanoipc::Worker::<T>::new(&service);
 		worker.add_reqrep(&socket_url).unwrap();
 
-		while !stop_guard.load(Ordering::Relaxed) {
+		while !stop_guard.load(Ordering::SeqCst) {
 			worker.poll();
 		}
 	});

parity/main.rs

@@ -26,12 +26,8 @@ extern crate docopt;
 extern crate num_cpus;
 extern crate rustc_serialize;
 extern crate ethcore_devtools as devtools;
-#[macro_use]
-extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate ethsync;
-#[macro_use]
-extern crate log as rlog;
 extern crate env_logger;
 extern crate ethcore_logger;
 extern crate ctrlc;
@@ -43,8 +39,8 @@ extern crate semver;
 extern crate ethcore_io as io;
 extern crate ethcore_ipc as ipc;
 extern crate ethcore_ipc_nano as nanoipc;
-#[macro_use]
-extern crate hyper; // for price_info.rs
+extern crate rlp;
+
 extern crate json_ipc_server as jsonipc;
 
 extern crate ethcore_ipc_hypervisor as hypervisor;
@@ -52,11 +48,19 @@ extern crate ethcore_rpc;
 
 extern crate ethcore_signer;
 extern crate ansi_term;
-#[macro_use]
-extern crate lazy_static;
+
 extern crate regex;
 extern crate isatty;
 
+#[macro_use]
+extern crate ethcore_util as util;
+#[macro_use]
+extern crate log as rlog;
+#[macro_use]
+extern crate hyper; // for price_info.rs
+#[macro_use]
+extern crate lazy_static;
+
 #[cfg(feature="stratum")]
 extern crate ethcore_stratum;
 

parity/sync.rs

@@ -31,9 +31,10 @@ struct SyncControlService {
 }
 
 impl ControlService for SyncControlService {
-	fn shutdown(&self) {
+	fn shutdown(&self) -> bool {
 		trace!(target: "hypervisor", "Received shutdown from control service");
-		self.stop.store(true, ::std::sync::atomic::Ordering::Relaxed);
+		self.stop.store(true, ::std::sync::atomic::Ordering::SeqCst);
+		true
 	}
 }
 
@@ -75,14 +76,15 @@ pub fn main() {
 	let control_service = Arc::new(SyncControlService::default());
 	let as_control = control_service.clone() as Arc<ControlService>;
 	let mut worker = nanoipc::Worker::<ControlService>::new(&as_control);
+	let thread_stop = control_service.stop.clone();
 	worker.add_reqrep(
 		&service_urls::with_base(&service_config.io_path, service_urls::SYNC_CONTROL)
 	).unwrap();
 
-	while !control_service.stop.load(::std::sync::atomic::Ordering::Relaxed) {
+	while !thread_stop.load(::std::sync::atomic::Ordering::SeqCst) {
 		worker.poll();
 	}
-	service_stop.store(true, ::std::sync::atomic::Ordering::Relaxed);
+	service_stop.store(true, ::std::sync::atomic::Ordering::SeqCst);
 
 	hypervisor.module_shutdown(SYNC_MODULE_ID);
 	trace!(target: "hypervisor", "Sync process terminated gracefully");