tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-29 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

tokio-tls: enable Send and Sync (#1317)

Browse Source 
-  update 0 as *mut () calls to std::ptr::null_mut()
- impl Send and Sync for AllowStd
This commit is contained in:
João Oliveira
2019-07-19 10:21:26 -07:00
committed by Carl Lerche
parent d0bb16192b
commit a298472da8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio-tls/src/lib.rs
+9 -4
View File
@@ -26,6 +26,7 @@ use std::future::Future;
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
use std::marker::Unpin; use std::marker::Unpin;
use std::pin::Pin; use std::pin::Pin;
use std::ptr::null_mut;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
@@ -77,10 +78,14 @@ where
AllowStd<S>: Read + Write, AllowStd<S>: Read + Write,
{ {
fn drop(&mut self) { fn drop(&mut self) {
(self.0).0.get_mut().context = 0 as *mut (); (self.0).0.get_mut().context = null_mut();
} }
} }
// *mut () context is neither Send nor Sync
unsafe impl<S: Send> Send for AllowStd<S> {}
unsafe impl<S: Sync> Sync for AllowStd<S> {}
impl<S> AllowStd<S> impl<S> AllowStd<S>
where where
S: Unpin, S: Unpin,
@@ -234,11 +239,11 @@ where
match (inner.f)(stream) { match (inner.f)(stream) {
Ok(mut s) => { Ok(mut s) => {
s.get_mut().context = 0 as *mut (); s.get_mut().context = null_mut();
Poll::Ready(Ok(StartedHandshake::Done(TlsStream(s)))) Poll::Ready(Ok(StartedHandshake::Done(TlsStream(s))))
} }
Err(HandshakeError::WouldBlock(mut s)) => { Err(HandshakeError::WouldBlock(mut s)) => {
s.get_mut().context = 0 as *mut (); s.get_mut().context = null_mut();
Poll::Ready(Ok(StartedHandshake::Mid(s))) Poll::Ready(Ok(StartedHandshake::Mid(s)))
} }
Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)), Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
@@ -310,7 +315,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> Future for MidHandshake<S> {
Ok(stream) => Poll::Ready(Ok(TlsStream(stream))), Ok(stream) => Poll::Ready(Ok(TlsStream(stream))),
Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)), Err(HandshakeError::Failure(e)) => Poll::Ready(Err(e)),
Err(HandshakeError::WouldBlock(mut s)) => { Err(HandshakeError::WouldBlock(mut s)) => {
s.get_mut().context = 0 as *mut (); s.get_mut().context = null_mut();
mut_self.0 = Some(s); mut_self.0 = Some(s);
Poll::Pending Poll::Pending
} }