Skip to content

Make OpaqueIpcReceiver useful #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Make OpaqueIpcReceiver useful #249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b46bbe4
Factor out os ipc receiver ser/de code
Manishearth Dec 18, 2019
794076b
Add to() and ser/de to OpaqueIpcReceiver
Manishearth Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 52 additions & 32 deletions src/ipc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,7 @@ impl<T> IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {

impl<'de, T> Deserialize<'de> for IpcReceiver<T> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = Deserialize::deserialize(deserializer)?;
let os_receiver =
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
// FIXME(pcwalton): This could panic if the data was corrupt and the index was out
// of bounds. We should return an `Err` result instead.
os_ipc_channels_for_deserialization.borrow_mut()[index].to_receiver()
});
let os_receiver = deserialize_os_ipc_receiver(deserializer)?;
Ok(IpcReceiver {
os_receiver: os_receiver,
phantom: PhantomData,
Expand All @@ -234,15 +228,7 @@ impl<'de, T> Deserialize<'de> for IpcReceiver<T> {

impl<T> Serialize for IpcReceiver<T> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let index = OS_IPC_CHANNELS_FOR_SERIALIZATION.with(|os_ipc_channels_for_serialization| {
let mut os_ipc_channels_for_serialization =
os_ipc_channels_for_serialization.borrow_mut();
let index = os_ipc_channels_for_serialization.len();
os_ipc_channels_for_serialization.push(OsIpcChannel::Receiver(self.os_receiver
.consume()));
index
});
index.serialize(serializer)
serialize_os_ipc_receiver(&self.os_receiver, serializer)
}
}

Expand Down Expand Up @@ -644,6 +630,30 @@ pub struct OpaqueIpcReceiver {
os_receiver: OsIpcReceiver,
}

impl OpaqueIpcReceiver {
pub fn to<'de, T>(self) -> IpcReceiver<T> where T: Deserialize<'de> + Serialize {
IpcReceiver {
os_receiver: self.os_receiver,
phantom: PhantomData,
}
}
}

impl<'de> Deserialize<'de> for OpaqueIpcReceiver {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let os_receiver = deserialize_os_ipc_receiver(deserializer)?;
Ok(OpaqueIpcReceiver {
os_receiver: os_receiver,
})
}
}

impl Serialize for OpaqueIpcReceiver {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
serialize_os_ipc_receiver(&self.os_receiver, serializer)
}
}

/// A server associated with a given name.
///
/// # Examples
Expand Down Expand Up @@ -736,13 +746,7 @@ impl IpcBytesReceiver {

impl<'de> Deserialize<'de> for IpcBytesReceiver {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = Deserialize::deserialize(deserializer)?;
let os_receiver =
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
// FIXME(pcwalton): This could panic if the data was corrupt and the index was out
// of bounds. We should return an `Err` result instead.
os_ipc_channels_for_deserialization.borrow_mut()[index].to_receiver()
});
let os_receiver = deserialize_os_ipc_receiver(deserializer)?;
Ok(IpcBytesReceiver {
os_receiver: os_receiver,
})
Expand All @@ -751,15 +755,7 @@ impl<'de> Deserialize<'de> for IpcBytesReceiver {

impl Serialize for IpcBytesReceiver {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let index = OS_IPC_CHANNELS_FOR_SERIALIZATION.with(|os_ipc_channels_for_serialization| {
let mut os_ipc_channels_for_serialization =
os_ipc_channels_for_serialization.borrow_mut();
let index = os_ipc_channels_for_serialization.len();
os_ipc_channels_for_serialization.push(OsIpcChannel::Receiver(self.os_receiver
.consume()));
index
});
index.serialize(serializer)
serialize_os_ipc_receiver(&self.os_receiver, serializer)
}
}

Expand Down Expand Up @@ -820,3 +816,27 @@ fn deserialize_os_ipc_sender<'de, D>(deserializer: D)
Ok(os_ipc_channels_for_deserialization.borrow_mut()[index].to_sender())
})
}

fn serialize_os_ipc_receiver<S>(os_receiver: &OsIpcReceiver, serializer: S)
-> Result<S::Ok, S::Error> where S: Serializer {
let index = OS_IPC_CHANNELS_FOR_SERIALIZATION.with(|os_ipc_channels_for_serialization| {
let mut os_ipc_channels_for_serialization =
os_ipc_channels_for_serialization.borrow_mut();
let index = os_ipc_channels_for_serialization.len();
os_ipc_channels_for_serialization.push(OsIpcChannel::Receiver(os_receiver
.consume()));
index
});
index.serialize(serializer)
}

fn deserialize_os_ipc_receiver<'de, D>(deserializer: D)
-> Result<OsIpcReceiver, D::Error> where D: Deserializer<'de> {
let index: usize = Deserialize::deserialize(deserializer)?;

OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
// FIXME(pcwalton): This could panic if the data was corrupt and the index was out
// of bounds. We should return an `Err` result instead.
Ok(os_ipc_channels_for_deserialization.borrow_mut()[index].to_receiver())
})
}