Skip to content

fix(sidecar): prefer poll() for channel #1443

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
dd-mergequeue merged 1 commit into from
Jan 19, 2026
Merged

fix(sidecar): prefer poll() for channel #1443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions datadog-ipc/src/platform/unix/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

use crate::handles::TransferHandles;
use crate::platform::{Message, PlatformHandle};
use nix::sys::select::FdSet;
use nix::sys::time::{TimeVal, TimeValLike};
use nix::poll::{poll, PollFd, PollFlags, PollTimeout};
use std::{
io::{self, ErrorKind, Read, Write},
os::{
Expand Down Expand Up @@ -61,11 +60,13 @@ impl Channel {
pub fn probe_readable(&self) -> bool {
#[allow(clippy::unwrap_used)]
let raw_fd = self.inner.as_owned_fd().unwrap().as_fd();
let mut fds = FdSet::new();
fds.insert(raw_fd);
nix::sys::select::select(None, Some(&mut fds), None, None, Some(&mut TimeVal::zero()))
.is_err()
|| fds.contains(raw_fd)

let mut fds = [PollFd::new(raw_fd, PollFlags::POLLIN)];
poll(&mut fds, PollTimeout::ZERO).is_err()
|| fds[0]
.revents()
.unwrap_or(PollFlags::empty())
.intersects(PollFlags::POLLIN | PollFlags::POLLHUP | PollFlags::POLLERR)
}

pub fn create_message<T>(&mut self, item: T) -> Result<Message<T>, io::Error>
Expand Down
Loading