Skip to content

Commit 0325f86

Browse files
committed
fix(sandbox): fix macOS lint and older-glibc test linking
Import HashSet only in the Linux-only process scan, and call gettid through the raw syscall in a test, since the libc wrapper needs glibc 2.30 or newer. Signed-off-by: Drew Newberry <anewberry@nvidia.com>
1 parent 65d8d56 commit 0325f86

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎crates/openshell-sandbox/src/boundary_io.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use async_trait::async_trait;
77
use openshell_isolation_interface::contract::{
88
BackendError, BoundaryDuplexStream, BoundaryLoopbackConnector, LoopbackTarget,
99
};
10-
use std::collections::{HashMap, HashSet};
10+
use std::collections::HashMap;
1111
use std::sync::atomic::{AtomicU8, Ordering};
1212
use std::sync::{Arc, Mutex};
1313

@@ -371,7 +371,7 @@ fn owned_processes(
371371
} else {
372372
roots.to_vec()
373373
};
374-
let mut visited = HashSet::new();
374+
let mut visited = std::collections::HashSet::new();
375375
let mut owned = Vec::new();
376376
while let Some(pid) = pending.pop() {
377377
if !visited.insert(pid) {

‎crates/openshell-sandbox/src/network_broker.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2455,7 +2455,7 @@ mod tests {
24552455
libc::syscall(
24562456
libc::SYS_tgkill,
24572457
libc::getpid(),
2458-
libc::gettid(),
2458+
libc::syscall(libc::SYS_gettid),
24592459
libc::SIGCONT,
24602460
)
24612461
};

0 commit comments

Comments
 (0)