Skip to content

Commit

Permalink
Merge pull request #292 from nervosnetwork/bump-to-0.3.5
Browse files Browse the repository at this point in the history
chore: bump to 0.3.5
  • Loading branch information
driftluo authored Jan 7, 2021
2 parents 6b15527 + 1236227 commit 56c64b6
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.3.5

### Bug Fix
- Fix resolve cpu load issue of prepare_uninitialized_buffer

## 0.3.4

### Features
Expand Down
2 changes: 1 addition & 1 deletion secio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tentacle-secio"
version = "0.4.3"
version = "0.4.4"
license = "MIT"
description = "Secio encryption protocol for p2p"
authors = ["piaoliu <[email protected]>", "Nervos Core Dev <[email protected]>"]
Expand Down
6 changes: 3 additions & 3 deletions tentacle/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tentacle"
version = "0.3.4"
version = "0.3.5"
license = "MIT"
description = "Minimal implementation for a multiplexed p2p network framework."
authors = ["piaoliu <[email protected]>", "Nervos Core Dev <[email protected]>"]
Expand All @@ -16,8 +16,8 @@ all-features = false
no-default-features = true

[dependencies]
yamux = { path = "../yamux", version = "0.2.9", default-features = false, package = "tokio-yamux"}
secio = { path = "../secio", version = "0.4.3", package = "tentacle-secio" }
yamux = { path = "../yamux", version = "0.2.10", default-features = false, package = "tokio-yamux"}
secio = { path = "../secio", version = "0.4.4", package = "tentacle-secio" }

futures = { version = "0.3.0" }
tokio = { version = "0.2.0" }
Expand Down
7 changes: 7 additions & 0 deletions tentacle/src/runtime/async_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ mod os {
) -> Poll<Result<usize, io::Error>> {
AsyncRead::poll_read(Pin::new(&mut self.0), cx, buf)
}

unsafe fn prepare_uninitialized_buffer(
&self,
_buf: &mut [std::mem::MaybeUninit<u8>],
) -> bool {
false
}
}

impl AsyncWrite for TcpStream {
Expand Down
8 changes: 8 additions & 0 deletions tentacle/src/runtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ where
) -> Poll<io::Result<usize>> {
AsyncRead::poll_read(Pin::new(&mut self.0), cx, buf)
}

unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
false
}
}

impl<T> AsyncWrite for CompatStream<T>
Expand Down Expand Up @@ -149,6 +153,10 @@ where
) -> Poll<io::Result<usize>> {
FutureAsyncRead::poll_read(self, cx, buf)
}

unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
false
}
}

impl<T> AsyncWrite for CompatStream2<T>
Expand Down
4 changes: 4 additions & 0 deletions tentacle/src/transports/browser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ impl AsyncRead for BrowserStream {
}
}
}

unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
false
}
}

impl AsyncWrite for BrowserStream {
Expand Down
4 changes: 4 additions & 0 deletions tentacle/src/transports/ws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,10 @@ impl AsyncRead for WsStream {
Poll::Pending => Poll::Pending,
}
}

unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
false
}
}

impl AsyncWrite for WsStream {
Expand Down
2 changes: 1 addition & 1 deletion yamux/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tokio-yamux"
version = "0.2.9"
version = "0.2.10"
license = "MIT"
repository = "https://github.com/nervosnetwork/tentacle"
description = "Rust implementation of Yamux"
Expand Down
7 changes: 7 additions & 0 deletions yamux/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,13 @@ mod test {
Poll::Ready(Ok(n))
}
}

unsafe fn prepare_uninitialized_buffer(
&self,
_buf: &mut [std::mem::MaybeUninit<u8>],
) -> bool {
false
}
}

impl AsyncWrite for MockSocket {
Expand Down

0 comments on commit 56c64b6

Please sign in to comment.