52fe28a052
* parity-version: bump beta to 2.1.2
* docs(rpc): push the branch along with tags (#9578)
* docs(rpc): push the branch along with tags
* ci: remove old rpc docs script
* Remove snapcraft clean (#9585)
* Revert " add snapcraft package image (master) (#9584)"
This reverts commit ceaedbbd7f
.
* Update package-snap.sh
* Update .gitlab-ci.yml
* ci: fix regex 🙄 (#9597)
* docs(rpc): annotate tag with the provided message (#9601)
* Update ropsten.json (#9602)
* HF in POA Sokol (2018-09-19) (#9607)
https://github.com/poanetwork/poa-chain-spec/pull/86
* fix(network): don't disconnect reserved peers (#9608)
The priority of && and || was borked.
* fix failing node-table tests on mac os, closes #9632 (#9633)
* ethcore-io retries failed work steal (#9651)
* ethcore-io uses newer version of crossbeam && retries failed work steal
* ethcore-io non-mio service uses newer crossbeam
* remove master from releasable branches (#9655)
* remove master from releasable branches
need backporting in beta
fix https://gitlab.parity.io/parity/parity-ethereum/-/jobs/101065 etc
* add except for snap packages for master
* Test fix for windows cache name... (#9658)
* Test fix for windows cache name...
* Fix variable name.
* fix(light_fetch): avoid race with BlockNumber::Latest (#9665)
* Calculate sha3 instead of sha256 for push-release. (#9673)
* Calculate sha3 instead of sha256 for push-release.
* Add pushes to the script.
* Hardfork the testnets (#9562)
* ethcore: propose hardfork block number 4230000 for ropsten
* ethcore: propose hardfork block number 9000000 for kovan
* ethcore: enable kip-4 and kip-6 on kovan
* etcore: bump kovan hardfork to block 9.2M
* ethcore: fix ropsten constantinople block number to 4.2M
* ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream
* ci: fix push script (#9679)
* ci: fix push script
* Fix copying & running on windows.
* CI: Remove unnecessary pipes (#9681)
* ci: reduce gitlab pipelines significantly
* ci: build pipeline for PR
* ci: remove dead weight
* ci: remove github release script
* ci: remove forever broken aura tests
* ci: add random stuff to the end of the pipes
* ci: add wind and mac to the end of the pipe
* ci: remove snap artifacts
* ci: (re)move dockerfiles
* ci: clarify job names
* ci: add cargo audit job
* ci: make audit script executable
* ci: ignore snap and docker files for rust check
* ci: simplify audit script
* ci: rename misc to optional
* ci: add publish script to releaseable branches
* ci: more verbose cp command for windows build
* ci: fix weird binary checksum logic in push script
* ci: fix regex in push script for windows
* ci: simplify gitlab caching
* docs: align README with ci changes
* ci: specify default cargo target dir
* ci: print verbose environment
* ci: proper naming of scripts
* ci: restore docker files
* ci: use docker hub file
* ci: use cargo home instead of cargo target dir
* ci: touch random rust file to trigger real builds
* ci: set cargo target dir for audit script
* ci: remove temp file
* ci: don't export the cargo target dir in the audit script
* ci: fix windows unbound variable
* docs: fix gitlab badge path
* rename deprecated gitlab ci variables
https://docs.gitlab.com/ee/ci/variables/#9-0-renaming
* ci: fix git compare for nightly builds
* test: skip c++ example for all platforms but linux
* ci: add random rust file to trigger tests
* ci: remove random rust file
* disable cpp lib test for mac, win and beta (#9686)
* cleanup ci merge
* ci: fix tests
* fix bad-block reporting no reason (#9638)
* ethcore: fix detection of major import (#9552)
* sync: set state to idle after sync is completed
* sync: refactor sync reset
* Don't hash the init_code of CREATE. (#9688)
* Docker: run as parity user (#9689)
* Implement CREATE2 gas changes and fix some potential overflowing (#9694)
* Implement CREATE2 gas changes and fix some potential overflowing
* Ignore create2 state tests
* Split CREATE and CREATE2 in gasometer
* Generalize rounding (x + 31) / 32 to to_word_size
* make instantSeal engine backwards compatible, closes #9696 (#9700)
* ethcore: delay ropsten hardfork (#9704)
* fix (light/provider) : Make `read_only executions` read-only (#9591)
* `ExecutionsRequest` from light-clients as read-only
This changes so all `ExecutionRequests` from light-clients are executed
as read-only which the `virtual``flag == true ensures.
This boost up the current transaction to always succeed
Note, this only affects `eth_estimateGas` and `eth_call` AFAIK.
* grumbles(revert renaming) : TransactionProof
* grumbles(trace) : remove incorrect trace
* grumbles(state/prove_tx) : explicit `virt`
Remove the boolean flag to determine that a `state::prove_transaction`
whether it should be executed in a virtual context or not.
Because of that also rename the function to
`state::prove_transction_virtual` to make more clear
* CI: Skip docs job for nightly (#9693)
* ci: force-tag wiki changes
* ci: force-tag wiki changes
* ci: skip docs job for master and nightly
* ci: revert docs job checking for nightly tag
* ci: exclude docs job from nightly builds in gitlab script
279 lines
8.5 KiB
Rust
279 lines
8.5 KiB
Rust
// Copyright 2015-2018 Parity Technologies (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/>.
|
|
|
|
//! General IO module.
|
|
//!
|
|
//! Example usage for creating a network service and adding an IO handler:
|
|
//!
|
|
//! ```rust
|
|
//! extern crate ethcore_io;
|
|
//! use ethcore_io::*;
|
|
//! use std::sync::Arc;
|
|
//! use std::time::Duration;
|
|
//!
|
|
//! struct MyHandler;
|
|
//!
|
|
//! #[derive(Clone)]
|
|
//! struct MyMessage {
|
|
//! data: u32
|
|
//! }
|
|
//!
|
|
//! impl IoHandler<MyMessage> for MyHandler {
|
|
//! fn initialize(&self, io: &IoContext<MyMessage>) {
|
|
//! io.register_timer(0, Duration::from_secs(1)).unwrap();
|
|
//! }
|
|
//!
|
|
//! fn timeout(&self, _io: &IoContext<MyMessage>, timer: TimerToken) {
|
|
//! println!("Timeout {}", timer);
|
|
//! }
|
|
//!
|
|
//! fn message(&self, _io: &IoContext<MyMessage>, message: &MyMessage) {
|
|
//! println!("Message {}", message.data);
|
|
//! }
|
|
//! }
|
|
//!
|
|
//! fn main () {
|
|
//! let mut service = IoService::<MyMessage>::start().expect("Error creating network service");
|
|
//! service.register_handler(Arc::new(MyHandler)).unwrap();
|
|
//!
|
|
//! // Wait for quit condition
|
|
//! // ...
|
|
//! // Drop the service
|
|
//! }
|
|
//! ```
|
|
//!
|
|
//! # Mio vs non-mio
|
|
//!
|
|
//! This library has two modes: mio and not mio. The `mio` feature can be activated or deactivated
|
|
//! when compiling or depending on the library.
|
|
//!
|
|
//! Without mio, only timers and message-passing are available. With mio, you can also use
|
|
//! low-level sockets provided by mio.
|
|
//!
|
|
//! The non-mio mode exists because the `mio` library doesn't compile on platforms such as
|
|
//! emscripten.
|
|
|
|
//TODO: use Poll from mio
|
|
#![allow(deprecated)]
|
|
|
|
#[cfg(feature = "mio")]
|
|
extern crate mio;
|
|
#[macro_use]
|
|
extern crate log as rlog;
|
|
extern crate slab;
|
|
extern crate crossbeam_deque as deque;
|
|
extern crate parking_lot;
|
|
extern crate num_cpus;
|
|
extern crate timer;
|
|
extern crate fnv;
|
|
extern crate time;
|
|
|
|
#[cfg(feature = "mio")]
|
|
mod service_mio;
|
|
#[cfg(not(feature = "mio"))]
|
|
mod service_non_mio;
|
|
#[cfg(feature = "mio")]
|
|
mod worker;
|
|
|
|
use std::cell::Cell;
|
|
use std::{fmt, error};
|
|
#[cfg(feature = "mio")]
|
|
use mio::deprecated::{EventLoop, NotifyError};
|
|
#[cfg(feature = "mio")]
|
|
use mio::Token;
|
|
|
|
thread_local! {
|
|
/// Stack size
|
|
/// Should be modified if it is changed in Rust since it is no way
|
|
/// to know or get it
|
|
pub static LOCAL_STACK_SIZE: Cell<usize> = Cell::new(::std::env::var("RUST_MIN_STACK").ok().and_then(|s| s.parse().ok()).unwrap_or(2 * 1024 * 1024));
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
/// IO Error
|
|
pub enum IoError {
|
|
/// Low level error from mio crate
|
|
#[cfg(feature = "mio")]
|
|
Mio(::std::io::Error),
|
|
/// Error concerning the Rust standard library's IO subsystem.
|
|
StdIo(::std::io::Error),
|
|
}
|
|
|
|
impl fmt::Display for IoError {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
// just defer to the std implementation for now.
|
|
// we can refine the formatting when more variants are added.
|
|
match *self {
|
|
#[cfg(feature = "mio")]
|
|
IoError::Mio(ref std_err) => std_err.fmt(f),
|
|
IoError::StdIo(ref std_err) => std_err.fmt(f),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl error::Error for IoError {
|
|
fn description(&self) -> &str {
|
|
"IO error"
|
|
}
|
|
}
|
|
|
|
impl From<::std::io::Error> for IoError {
|
|
fn from(err: ::std::io::Error) -> IoError {
|
|
IoError::StdIo(err)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "mio")]
|
|
impl<Message> From<NotifyError<service_mio::IoMessage<Message>>> for IoError where Message: Send {
|
|
fn from(_err: NotifyError<service_mio::IoMessage<Message>>) -> IoError {
|
|
IoError::Mio(::std::io::Error::new(::std::io::ErrorKind::ConnectionAborted, "Network IO notification error"))
|
|
}
|
|
}
|
|
|
|
/// Generic IO handler.
|
|
/// All the handler function are called from within IO event loop.
|
|
/// `Message` type is used as notification data
|
|
pub trait IoHandler<Message>: Send + Sync where Message: Send + Sync + 'static {
|
|
/// Initialize the handler
|
|
fn initialize(&self, _io: &IoContext<Message>) {}
|
|
/// Timer function called after a timeout created with `HandlerIo::timeout`.
|
|
fn timeout(&self, _io: &IoContext<Message>, _timer: TimerToken) {}
|
|
/// Called when a broadcasted message is received. The message can only be sent from a different IO handler.
|
|
fn message(&self, _io: &IoContext<Message>, _message: &Message) {}
|
|
/// Called when an IO stream gets closed
|
|
#[cfg(feature = "mio")]
|
|
fn stream_hup(&self, _io: &IoContext<Message>, _stream: StreamToken) {}
|
|
/// Called when an IO stream can be read from
|
|
#[cfg(feature = "mio")]
|
|
fn stream_readable(&self, _io: &IoContext<Message>, _stream: StreamToken) {}
|
|
/// Called when an IO stream can be written to
|
|
#[cfg(feature = "mio")]
|
|
fn stream_writable(&self, _io: &IoContext<Message>, _stream: StreamToken) {}
|
|
/// Register a new stream with the event loop
|
|
#[cfg(feature = "mio")]
|
|
fn register_stream(&self, _stream: StreamToken, _reg: Token, _event_loop: &mut EventLoop<IoManager<Message>>) {}
|
|
/// Re-register a stream with the event loop
|
|
#[cfg(feature = "mio")]
|
|
fn update_stream(&self, _stream: StreamToken, _reg: Token, _event_loop: &mut EventLoop<IoManager<Message>>) {}
|
|
/// Deregister a stream. Called whenstream is removed from event loop
|
|
#[cfg(feature = "mio")]
|
|
fn deregister_stream(&self, _stream: StreamToken, _event_loop: &mut EventLoop<IoManager<Message>>) {}
|
|
}
|
|
|
|
#[cfg(feature = "mio")]
|
|
pub use service_mio::{TimerToken, StreamToken, IoContext, IoService, IoChannel, IoManager, TOKENS_PER_HANDLER};
|
|
#[cfg(not(feature = "mio"))]
|
|
pub use service_non_mio::{TimerToken, IoContext, IoService, IoChannel, TOKENS_PER_HANDLER};
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::sync::Arc;
|
|
use std::sync::atomic;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
use super::*;
|
|
|
|
// Mio's behaviour is too unstable for this test. Sometimes we have to wait a few milliseconds,
|
|
// sometimes more than 5 seconds for the message to arrive.
|
|
// Therefore we ignore this test in order to not have spurious failure when running continuous
|
|
// integration.
|
|
#[test]
|
|
#[cfg_attr(feature = "mio", ignore)]
|
|
fn send_message_to_handler() {
|
|
struct MyHandler(atomic::AtomicBool);
|
|
|
|
#[derive(Clone)]
|
|
struct MyMessage {
|
|
data: u32
|
|
}
|
|
|
|
impl IoHandler<MyMessage> for MyHandler {
|
|
fn message(&self, _io: &IoContext<MyMessage>, message: &MyMessage) {
|
|
assert_eq!(message.data, 5);
|
|
self.0.store(true, atomic::Ordering::SeqCst);
|
|
}
|
|
}
|
|
|
|
let handler = Arc::new(MyHandler(atomic::AtomicBool::new(false)));
|
|
|
|
let service = IoService::<MyMessage>::start().expect("Error creating network service");
|
|
service.register_handler(handler.clone()).unwrap();
|
|
|
|
service.send_message(MyMessage { data: 5 }).unwrap();
|
|
|
|
thread::sleep(Duration::from_secs(1));
|
|
assert!(handler.0.load(atomic::Ordering::SeqCst));
|
|
}
|
|
|
|
#[test]
|
|
fn timeout_working() {
|
|
struct MyHandler(atomic::AtomicBool);
|
|
|
|
#[derive(Clone)]
|
|
struct MyMessage {
|
|
data: u32
|
|
}
|
|
|
|
impl IoHandler<MyMessage> for MyHandler {
|
|
fn initialize(&self, io: &IoContext<MyMessage>) {
|
|
io.register_timer_once(1234, Duration::from_millis(500)).unwrap();
|
|
}
|
|
|
|
fn timeout(&self, _io: &IoContext<MyMessage>, timer: TimerToken) {
|
|
assert_eq!(timer, 1234);
|
|
assert!(!self.0.swap(true, atomic::Ordering::SeqCst));
|
|
}
|
|
}
|
|
|
|
let handler = Arc::new(MyHandler(atomic::AtomicBool::new(false)));
|
|
|
|
let service = IoService::<MyMessage>::start().expect("Error creating network service");
|
|
service.register_handler(handler.clone()).unwrap();
|
|
|
|
thread::sleep(Duration::from_secs(2));
|
|
assert!(handler.0.load(atomic::Ordering::SeqCst));
|
|
}
|
|
|
|
#[test]
|
|
fn multi_timeout_working() {
|
|
struct MyHandler(atomic::AtomicUsize);
|
|
|
|
#[derive(Clone)]
|
|
struct MyMessage {
|
|
data: u32
|
|
}
|
|
|
|
impl IoHandler<MyMessage> for MyHandler {
|
|
fn initialize(&self, io: &IoContext<MyMessage>) {
|
|
io.register_timer(1234, Duration::from_millis(500)).unwrap();
|
|
}
|
|
|
|
fn timeout(&self, _io: &IoContext<MyMessage>, timer: TimerToken) {
|
|
assert_eq!(timer, 1234);
|
|
self.0.fetch_add(1, atomic::Ordering::SeqCst);
|
|
}
|
|
}
|
|
|
|
let handler = Arc::new(MyHandler(atomic::AtomicUsize::new(0)));
|
|
|
|
let service = IoService::<MyMessage>::start().expect("Error creating network service");
|
|
service.register_handler(handler.clone()).unwrap();
|
|
|
|
thread::sleep(Duration::from_secs(2));
|
|
assert!(handler.0.load(atomic::Ordering::SeqCst) >= 2);
|
|
}
|
|
}
|