##// END OF EJS Templates
dirstate: drop all logic around the "non-normal" sets...
dirstate: drop all logic around the "non-normal" sets The dirstate has a lot of code to compute a set of all "non-normal" and "from_other_parent" entries. This is all used in one, unique, location, when `setparent` is called and moved from a merge to a non merge. At that time, any "merge related" information has to be dropped. This is mostly useful for command like `graft` or `shelve` that move to a single-parent state -before- the commit. Otherwise the commit will already have removed all traces of the merge information in the dirstate (e.g. for a regular merges). The bookkeeping for these sets is quite invasive. And it seems simpler to just drop it and do the full computation in the single location where we actually use it (since we have to do the computation at least once anyway). This simplify the code a lot, and clarify why this kind of computation is needed. The possible drawback compared to the previous code are: - if the operation happens in a loop, we will end up doing it multiple time, - the C code to detect entry of interest have been dropped, for now. It will be re-introduced later, with a processing code directly in C for even faster operation. Differential Revision: https://phab.mercurial-scm.org/D11507

File last commit:

r48765:8f031a27 default
r48875:060cd909 default
Show More
copy_tracing.rs
194 lines | 7.0 KiB | application/rls-services+xml | RustLexer
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 use cpython::ObjectProtocol;
use cpython::PyBytes;
use cpython::PyDict;
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 use cpython::PyDrop;
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 use cpython::PyList;
use cpython::PyModule;
use cpython::PyObject;
use cpython::PyResult;
use cpython::PyTuple;
use cpython::Python;
use hg::copy_tracing::ChangedFiles;
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329 use hg::copy_tracing::CombineChangesetCopies;
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 use hg::Revision;
Simon Sapin
rust: Move PyBytesWithData out of copy-tracing code...
r48765 use crate::pybytes_deref::PyBytesDeref;
Simon Sapin
copies-rust: introduce PyBytesWithData to reduce GIL requirement...
r47331
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 /// Combines copies information contained into revision `revs` to build a copy
/// map.
///
/// See mercurial/copies.py for details
pub fn combine_changeset_copies_wrapper(
py: Python,
revs: PyList,
copies: iterate over children directly (instead of parents)...
r46764 children_count: PyDict,
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 target_rev: Revision,
rev_info: PyObject,
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 multi_thread: bool,
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 ) -> PyResult<PyDict> {
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329 let children_count = children_count
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 .items(py)
.iter()
copies: iterate over children directly (instead of parents)...
r46764 .map(|(k, v)| Ok((k.extract(py)?, v.extract(py)?)))
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329 .collect::<PyResult<_>>()?;
/// (Revision number, parent 1, parent 2, copy data for this revision)
Simon Sapin
copies-rust: introduce PyBytesWithData to reduce GIL requirement...
r47331 type RevInfo<Bytes> = (Revision, Revision, Revision, Option<Bytes>);
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329
Simon Sapin
copies-rust: introduce PyBytesWithData to reduce GIL requirement...
r47331 let revs_info =
revs.iter(py).map(|rev_py| -> PyResult<RevInfo<PyBytes>> {
let rev = rev_py.extract(py)?;
let tuple: PyTuple =
rev_info.call(py, (rev_py,), None)?.cast_into(py)?;
let p1 = tuple.get_item(py, 0).extract(py)?;
let p2 = tuple.get_item(py, 1).extract(py)?;
let opt_bytes = tuple.get_item(py, 2).extract(py)?;
Ok((rev, p1, p2, opt_bytes))
});
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 let path_copies;
if !multi_thread {
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 let mut combine_changeset_copies =
CombineChangesetCopies::new(children_count);
for rev_info in revs_info {
let (rev, p1, p2, opt_bytes) = rev_info?;
let files = match &opt_bytes {
Some(bytes) => ChangedFiles::new(bytes.data(py)),
// Python None was extracted to Option::None,
// meaning there was no copy data.
None => ChangedFiles::new_empty(),
};
combine_changeset_copies.add_revision(rev, p1, p2, files)
}
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 path_copies = combine_changeset_copies.finish(target_rev)
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 } else {
// Use a bounded channel to provide back-pressure:
// if the child thread is slower to process revisions than this thread
// is to gather data for them, an unbounded channel would keep
// growing and eat memory.
//
// TODO: tweak the bound?
let (rev_info_sender, rev_info_receiver) =
Simon Sapin
rust: Move PyBytesWithData out of copy-tracing code...
r48765 crossbeam_channel::bounded::<RevInfo<PyBytesDeref>>(1000);
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 // This channel (going the other way around) however is unbounded.
// If they were both bounded, there might potentially be deadlocks
// where both channels are full and both threads are waiting on each
// other.
let (pybytes_sender, pybytes_receiver) =
crossbeam_channel::unbounded();
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 // Start a thread that does CPU-heavy processing in parallel with the
// loop below.
//
// If the parent thread panics, `rev_info_sender` will be dropped and
// “disconnected”. `rev_info_receiver` will be notified of this and
// exit its own loop.
let thread = std::thread::spawn(move || {
let mut combine_changeset_copies =
CombineChangesetCopies::new(children_count);
for (rev, p1, p2, opt_bytes) in rev_info_receiver {
let files = match &opt_bytes {
Simon Sapin
rust: Move PyBytesWithData out of copy-tracing code...
r48765 Some(raw) => ChangedFiles::new(raw.as_ref()),
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 // Python None was extracted to Option::None,
// meaning there was no copy data.
None => ChangedFiles::new_empty(),
};
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 combine_changeset_copies.add_revision(rev, p1, p2, files);
Simon Sapin
copies-rust: introduce PyBytesWithData to reduce GIL requirement...
r47331
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 // Send `PyBytes` back to the parent thread so the parent
// thread can drop it. Otherwise the GIL would be implicitly
// acquired here through `impl Drop for PyBytes`.
if let Some(bytes) = opt_bytes {
if let Err(_) = pybytes_sender.send(bytes.unwrap()) {
// The channel is disconnected, meaning the parent
// thread panicked or returned
// early through
// `?` to propagate a Python exception.
break;
}
}
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 }
combine_changeset_copies.finish(target_rev)
});
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 for rev_info in revs_info {
let (rev, p1, p2, opt_bytes) = rev_info?;
Simon Sapin
rust: Move PyBytesWithData out of copy-tracing code...
r48765 let opt_bytes = opt_bytes.map(|b| PyBytesDeref::new(py, b));
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330
// We’d prefer to avoid the child thread calling into Python code,
// but this avoids a potential deadlock on the GIL if it does:
py.allow_threads(|| {
rev_info_sender.send((rev, p1, p2, opt_bytes)).expect(
"combine_changeset_copies: channel is disconnected",
);
});
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332
// Drop anything in the channel, without blocking
for pybytes in pybytes_receiver.try_iter() {
pybytes.release_ref(py)
}
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 }
// We’d prefer to avoid the child thread calling into Python code,
// but this avoids a potential deadlock on the GIL if it does:
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 path_copies = py.allow_threads(|| {
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 // Disconnect the channel to signal the child thread to stop:
// the `for … in rev_info_receiver` loop will end.
drop(rev_info_sender);
// Wait for the child thread to stop, and propagate any panic.
thread.join().unwrap_or_else(|panic_payload| {
std::panic::resume_unwind(panic_payload)
})
Simon Sapin
copies-rust: send PyBytes values back be dropped ino the parent thread...
r47332 });
// Drop anything left in the channel
for pybytes in pybytes_receiver.iter() {
pybytes.release_ref(py)
}
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 };
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 let out = PyDict::new(py);
Simon Sapin
copies-rust: split up combine_changeset_copies function into a struct...
r47329 for (dest, source) in path_copies.into_iter() {
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 out.set_item(
py,
PyBytes::new(py, &dest.into_vec()),
PyBytes::new(py, &source.into_vec()),
)?;
}
Ok(out)
}
/// Create the module, with `__package__` given from parent
pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
let dotted_name = &format!("{}.copy_tracing", package);
let m = PyModule::new(py, dotted_name)?;
m.add(py, "__package__", package)?;
m.add(py, "__doc__", "Copy tracing - Rust implementation")?;
m.add(
py,
"combine_changeset_copies",
py_fn!(
py,
combine_changeset_copies_wrapper(
revs: PyList,
children: PyDict,
target_rev: Revision,
Simon Sapin
copies-rust: move CPU-heavy Rust processing into a child thread...
r47330 rev_info: PyObject,
multi_thread: bool
copies: introduce the hg-cpython wrapper for `combine_changeset_copies`...
r46557 )
),
)?;
let sys = PyModule::import(py, "sys")?;
let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
sys_modules.set_item(py, dotted_name, &m)?;
Ok(m)
}