Skip to content

refactor: re-export crossbeam-channel - #2244

Merged
bors[bot] merged 2 commits into
nervosnetwork:developfrom
zhangsoledad:zhangsoledad/reexport-crossbeam
Sep 1, 2020
Merged

refactor: re-export crossbeam-channel#2244
bors[bot] merged 2 commits into
nervosnetwork:developfrom
zhangsoledad:zhangsoledad/reexport-crossbeam

Conversation

@zhangsoledad

@zhangsoledad zhangsoledad commented Aug 25, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Description

re-export crossbeam-channel from facade wrapper, unify version specify.
use tilde requirements specify for crossbeam-channel, prevent automate dependency updates.

crossbeam-channel 0.4.3 has UB, may lead to jemalloc deadlock.

    frame #0: 0x00007fb34acd5620 libpthread.so.0`__lll_lock_wait + 48
    frame #1: 0x00007fb34accddf3 libpthread.so.0`__pthread_mutex_lock + 227
    frame #2: 0x000056423ada57fc ckb`_rjem_je_malloc_mutex_lock_slow at mutex.h:141:2
    frame #3: 0x000056423ada57f4 ckb`_rjem_je_malloc_mutex_lock_slow at mutex.c:84
    frame #4: 0x000056423ad6e1a8 ckb`_rjem_je_arena_tcache_fill_small at mutex.h:205:4
    frame #5: 0x000056423ad6e1a0 ckb`_rjem_je_arena_tcache_fill_small at arena.c:1261
    frame #6: 0x000056423adc1494 ckb`_rjem_je_tcache_alloc_small_hard at tcache.c:93:2
    frame #7: 0x000056423ad68618 ckb`mallocx at tcache_inlines.h:60:9
    frame #8: 0x000056423ad685e0 ckb`mallocx at jemalloc.c:1709
    frame #9: 0x000056423ad685e0 ckb`mallocx at jemalloc.c:1905
    frame #10: 0x000056423ad685e0 ckb`mallocx at jemalloc.c:2005
    frame #11: 0x000056423ad68324 ckb`mallocx at jemalloc.c:2588
    frame #12: 0x000056423b16a56c ckb`alloc::raw_vec::RawVec$LT$T$C$A$GT$::reserve::h10a313223974a7d1 + 188
    frame #13: 0x000056423b1a25f9 ckb`crossbeam_channel::flavors::array::Channel$LT$T$GT$::with_capacity::had6f123b9bc217e1 + 121

crossbeam-rs/crossbeam#533
#2235

also crossbeam-channel is not optimize for oneshot case. replace it if it is convenient.

@zhangsoledad
zhangsoledad requested a review from a team August 25, 2020 04:52
@zhangsoledad zhangsoledad changed the title refactor: re-export crossbeam-channel from ckb-types refactor: re-export crossbeam-channel Aug 25, 2020
@zhangsoledad
zhangsoledad force-pushed the zhangsoledad/reexport-crossbeam branch 2 times, most recently from fe5fd3c to 327b76f Compare August 25, 2020 07:25
doitian
doitian previously approved these changes Aug 25, 2020
View reviewed changes
@zhangsoledad
zhangsoledad dismissed stale reviews from doitian and chaoticlonghair via 567bfa9 August 25, 2020 12:51
@zhangsoledad
zhangsoledad force-pushed the zhangsoledad/reexport-crossbeam branch 3 times, most recently from 8ccd065 to a5823bb Compare August 27, 2020 02:46
quake
quake previously approved these changes Aug 29, 2020
View reviewed changes
doitian
doitian previously approved these changes Aug 31, 2020
View reviewed changes
@doitian

doitian commented Aug 31, 2020

Copy link
Copy Markdown
Contributor

@zhangsoledad conflicting: util/logger-service/src/lib.rs

@zhangsoledad
zhangsoledad dismissed stale reviews from doitian and quake via 92892e7 August 31, 2020 08:34
@zhangsoledad
zhangsoledad force-pushed the zhangsoledad/reexport-crossbeam branch from ac59ce2 to 92892e7 Compare August 31, 2020 08:34
@doitian
doitian requested a review from quake September 1, 2020 03:27
@chaoticlonghair

chaoticlonghair commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

bors merge

@bors

bors Bot commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@chaoticlonghair

chaoticlonghair commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

Checks can't completed and bors doesn't work.
Let administrator do merge or force-push to rerun Checks after git commit --amend.

@bors

bors Bot commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

GitHub status checks took too long to complete, so bors is giving up. You can adjust bors configuration to have it wait longer if you like.

@zhangsoledad

zhangsoledad commented Sep 1, 2020

Copy link
Copy Markdown
Member Author

bors r=doitian,yangby-cryptape

@bors

bors Bot commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

Build succeeded:

@bors
bors Bot merged commit 2832363 into nervosnetwork:develop Sep 1, 2020
@zhangsoledad
zhangsoledad deleted the zhangsoledad/reexport-crossbeam branch September 1, 2020 09:03
@taiki-e taiki-e mentioned this pull request Oct 11, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jjyr jjyr Awaiting requested review from jjyr
@keroro520 keroro520 Awaiting requested review from keroro520
@TheWaWaR TheWaWaR Awaiting requested review from TheWaWaR
@quake quake Awaiting requested review from quake
2 more reviewers
@doitian doitian doitian approved these changes
@chaoticlonghair chaoticlonghair chaoticlonghair approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zhangsoledad @doitian @chaoticlonghair @quake