Skip to content

Commit 9c50278

Browse files
committed
Auto merge of #3441 - RalfJung:fds, r=RalfJung
shims/unix: split general FD management from FS access `fd.rs` was a mix of general file descriptor infrastructure and file system access. Split those things up properly. Also add a `socket.rs` file where support for sockets can go eventually. For now it just contains the socketpair stub.
2 parents 82d9326 + 229d417 commit 9c50278

File tree

12 files changed

+663
-633
lines changed

12 files changed

+663
-633
lines changed

src/tools/miri/src/machine.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use rustc_target::spec::abi::Abi;
3131

3232
use crate::{
3333
concurrency::{data_race, weak_memory},
34-
shims::unix::FileHandler,
34+
shims::unix::FdTable,
3535
*,
3636
};
3737

@@ -463,9 +463,9 @@ pub struct MiriMachine<'mir, 'tcx> {
463463
pub(crate) validate: bool,
464464

465465
/// The table of file descriptors.
466-
pub(crate) file_handler: shims::unix::FileHandler,
466+
pub(crate) fds: shims::unix::FdTable,
467467
/// The table of directory descriptors.
468-
pub(crate) dir_handler: shims::unix::DirHandler,
468+
pub(crate) dirs: shims::unix::DirTable,
469469

470470
/// This machine's monotone clock.
471471
pub(crate) clock: Clock,
@@ -640,8 +640,8 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
640640
tls: TlsData::default(),
641641
isolated_op: config.isolated_op,
642642
validate: config.validate,
643-
file_handler: FileHandler::new(config.mute_stdout_stderr),
644-
dir_handler: Default::default(),
643+
fds: FdTable::new(config.mute_stdout_stderr),
644+
dirs: Default::default(),
645645
layouts,
646646
threads: ThreadManager::default(),
647647
static_roots: Vec::new(),
@@ -774,11 +774,11 @@ impl VisitProvenance for MiriMachine<'_, '_> {
774774
argv,
775775
cmd_line,
776776
extern_statics,
777-
dir_handler,
777+
dirs,
778778
borrow_tracker,
779779
data_race,
780780
alloc_addresses,
781-
file_handler,
781+
fds,
782782
tcx: _,
783783
isolated_op: _,
784784
validate: _,
@@ -817,8 +817,8 @@ impl VisitProvenance for MiriMachine<'_, '_> {
817817
threads.visit_provenance(visit);
818818
tls.visit_provenance(visit);
819819
env_vars.visit_provenance(visit);
820-
dir_handler.visit_provenance(visit);
821-
file_handler.visit_provenance(visit);
820+
dirs.visit_provenance(visit);
821+
fds.visit_provenance(visit);
822822
data_race.visit_provenance(visit);
823823
borrow_tracker.visit_provenance(visit);
824824
alloc_addresses.visit_provenance(visit);

0 commit comments

Comments
 (0)