Skip to content

Commit fd85188

Browse files
Seulgi Kimsgkim126
authored andcommitted
Upgrade crossbeam
1 parent cf23ef6 commit fd85188

File tree

4 files changed

+66
-10
lines changed

4 files changed

+66
-10
lines changed

Cargo.lock

Lines changed: 58 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

util/io/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ authors = ["Parity Technologies <[email protected]>", "CodeChain Team <codechain@k
1010
codechain-limited-table = { path = "../limited_table" }
1111
codechain-logger = { path = "../logger" }
1212
mio = "0.6.16"
13-
crossbeam = "0.3"
13+
crossbeam = "0.5.0"
1414
parking_lot = "0.6.0"
1515
log = "0.4.6"

util/io/src/service.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
1616

1717
use climited_table::LimitedTable;
18-
use crossbeam::sync::chase_lev;
18+
use crossbeam::deque;
1919
use mio::deprecated::{EventLoop, EventLoopBuilder, Handler, Sender};
2020
use mio::timer::Timeout;
2121
use mio::*;
@@ -196,7 +196,7 @@ where
196196
timers: Arc<RwLock<HashMap<HandlerId, UserTimer>>>,
197197
handlers: Arc<HandlersType<Message>>,
198198
workers: Vec<Worker>,
199-
worker_channel: chase_lev::Worker<Work<Message>>,
199+
worker_channel: deque::Worker<Work<Message>>,
200200
work_ready: Arc<SCondvar>,
201201
}
202202

@@ -210,7 +210,7 @@ where
210210
handlers: Arc<HandlersType<Message>>,
211211
name: &str,
212212
) -> Result<(), IoError> {
213-
let (worker, stealer) = chase_lev::deque();
213+
let (worker, stealer) = deque::lifo();
214214
let num_workers = 4;
215215
let work_ready_mutex = Arc::new(SMutex::new(()));
216216
let work_ready = Arc::new(SCondvar::new());

util/io/src/worker.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
1616

17-
use crossbeam::sync::chase_lev;
17+
use crossbeam::deque;
1818
use service::{HandlerId, IoChannel, IoContext};
1919
use std::cell::Cell;
2020
use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
@@ -61,7 +61,7 @@ impl Worker {
6161
/// Creates a new worker instance.
6262
pub fn new<Message>(
6363
index: usize,
64-
stealer: chase_lev::Stealer<Work<Message>>,
64+
stealer: deque::Stealer<Work<Message>>,
6565
channel: IoChannel<Message>,
6666
wait: Arc<SCondvar>,
6767
wait_mutex: Arc<SMutex<()>>,
@@ -90,7 +90,7 @@ impl Worker {
9090
}
9191

9292
fn work_loop<Message>(
93-
stealer: &chase_lev::Stealer<Work<Message>>,
93+
stealer: &deque::Stealer<Work<Message>>,
9494
channel: &IoChannel<Message>,
9595
wait: &SCondvar,
9696
wait_mutex: &SMutex<()>,
@@ -108,7 +108,7 @@ impl Worker {
108108

109109
while !deleting.load(AtomicOrdering::Acquire) {
110110
match stealer.steal() {
111-
chase_lev::Steal::Data(work) => Worker::do_work(work, channel.clone()),
111+
deque::Steal::Data(work) => Worker::do_work(work, channel.clone()),
112112
_ => break,
113113
}
114114
}

0 commit comments

Comments
 (0)