comparison rust/hg-core/src/errors.rs @ 52183:96b113d22b34 stable

rust-update: handle SIGINT from long-running update threads The current code does not respond to ^C until after the Rust bit is finished doing its work. This is expected, since Rust holds the GIL for the duration of the call and does not call `PyErr_CheckSignals`. Freeing the GIL to do our work does not really improve anything since the Rust threads are still going, and the only way of cancelling a thread is by making it cooperate. So we do the following: - remember the SIGINT handler in hg-cpython and reset it after the call into core (see inline comment in `update.rs` about this) - make all update threads watch for a global `AtomicBool` being `true`, and if so stop their work - reset the global bool and exit early (i.e. before writing the dirstate) - raise SIGINT from `hg-cpython` if update returns `InterruptReceived`
author Rapha?l Gom?s <rgomes@octobus.net>
date Tue, 12 Nov 2024 12:52:13 +0100
parents de317a87ea6a
children 65d516db7309
comparison
equal deleted inserted replaced
52182:fa58f4f97337 52183:96b113d22b34
50 /// A race condition has been detected. This *must* be handled locally 50 /// A race condition has been detected. This *must* be handled locally
51 /// and not directly surface to the user. 51 /// and not directly surface to the user.
52 RaceDetected(String), 52 RaceDetected(String),
53 /// An invalid path was found 53 /// An invalid path was found
54 Path(HgPathError), 54 Path(HgPathError),
55 /// An interrupt was received and we need to stop whatever we're doing
56 InterruptReceived,
55 } 57 }
56 58
57 /// Details about where an I/O error happened 59 /// Details about where an I/O error happened
58 #[derive(Debug)] 60 #[derive(Debug)]
59 pub enum IoErrorContext { 61 pub enum IoErrorContext {
119 HgError::ConfigValueParseError(error) => error.fmt(f), 121 HgError::ConfigValueParseError(error) => error.fmt(f),
120 HgError::RaceDetected(context) => { 122 HgError::RaceDetected(context) => {
121 write!(f, "encountered a race condition {context}") 123 write!(f, "encountered a race condition {context}")
122 } 124 }
123 HgError::Path(hg_path_error) => write!(f, "{}", hg_path_error), 125 HgError::Path(hg_path_error) => write!(f, "{}", hg_path_error),
126 HgError::InterruptReceived => write!(f, "interrupt received"),
124 } 127 }
125 } 128 }
126 } 129 }
127 130
128 // TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly? 131 // TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly?