##// END OF EJS Templates
packaging: isolate invocation of WiX to own function...
packaging: isolate invocation of WiX to own function Like we did for Inno, we want to split out the building of Mercurial from invoking the packaging tool so that we can introduce an alternate build mechanism. As part of this refactor, there are inconsequential changes to file layouts. Before, some shared files such as the WiX binaries and merge modules would be installed under build/. Now, they are installed under build/wix-*. This is to keep implementation simpler. But it also helps keep build state more isolated. Differential Revision: https://phab.mercurial-scm.org/D8474

File last commit:

r44991:cefd130c default
r45257:11bd68a9 default
Show More
cindex.rs
179 lines | 5.6 KiB | application/rls-services+xml | RustLexer
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 // cindex.rs
//
// Copyright 2018 Georges Racinet <gracinet@anybox.fr>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Bindings to use the Index defined by the parsers C extension
//!
//! Ideally, we should use an Index entirely implemented in Rust,
//! but this will take some time to get there.
Georges Racinet
rust-index: add `append` method to cindex/Index...
r44991 use cpython::{
exc::ImportError, ObjectProtocol, PyClone, PyErr, PyObject, PyResult,
PyTuple, Python, PythonObject,
};
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989 use hg::revlog::{Node, RevlogIndex};
Georges Racinet
rust-cpython: raising error.WdirUnsupported...
r41386 use hg::{Graph, GraphError, Revision, WORKING_DIRECTORY_REVISION};
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 use libc::c_int;
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989 const REVLOG_CABI_VERSION: c_int = 2;
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 #[repr(C)]
pub struct Revlog_CAPI {
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523 abi_version: c_int,
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989 index_length:
unsafe extern "C" fn(index: *mut revlog_capi::RawPyObject) -> c_int,
index_node: unsafe extern "C" fn(
index: *mut revlog_capi::RawPyObject,
rev: c_int,
) -> *const Node,
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 index_parents: unsafe extern "C" fn(
index: *mut revlog_capi::RawPyObject,
rev: c_int,
ps: *mut [c_int; 2],
) -> c_int,
}
py_capsule!(
from mercurial.cext.parsers import revlog_CAPI
as revlog_capi for Revlog_CAPI);
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082
/// A `Graph` backed up by objects and functions from revlog.c
///
/// This implementation of the `Graph` trait, relies on (pointers to)
/// - the C index object (`index` member)
/// - the `index_get_parents()` function (`parents` member)
///
/// # Safety
///
/// The C index itself is mutable, and this Rust exposition is **not
/// protected by the GIL**, meaning that this construct isn't safe with respect
/// to Python threads.
///
/// All callers of this `Index` must acquire the GIL and must not release it
/// while working.
///
/// # TODO find a solution to make it GIL safe again.
///
/// This is non trivial, and can wait until we have a clearer picture with
/// more Rust Mercurial constructs.
///
/// One possibility would be to a `GILProtectedIndex` wrapper enclosing
/// a `Python<'p>` marker and have it be the one implementing the
/// `Graph` trait, but this would mean the `Graph` implementor would become
/// likely to change between subsequent method invocations of the `hg-core`
/// objects (a serious change of the `hg-core` API):
/// either exposing ways to mutate the `Graph`, or making it a non persistent
/// parameter in the relevant methods that need one.
///
/// Another possibility would be to introduce an abstract lock handle into
/// the core API, that would be tied to `GILGuard` / `Python<'p>`
/// in the case of the `cpython` crate bindings yet could leave room for other
/// mechanisms in other contexts.
pub struct Index {
index: PyObject,
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 capi: &'static Revlog_CAPI,
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 }
impl Index {
pub fn new(py: Python, index: PyObject) -> PyResult<Self> {
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523 let capi = unsafe { revlog_capi::retrieve(py)? };
if capi.abi_version != REVLOG_CABI_VERSION {
return Err(PyErr::new::<ImportError, _>(
py,
format!(
"ABI version mismatch: the C ABI revlog version {} \
does not match the {} expected by Rust hg-cpython",
capi.abi_version, REVLOG_CABI_VERSION
),
));
}
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 Ok(Index {
index: index,
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523 capi: capi,
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 })
}
Georges Racinet
rust-index: add a `inner` method to the Index struct...
r44412
/// return a reference to the CPython Index object in this Struct
pub fn inner(&self) -> &PyObject {
&self.index
}
Georges Racinet
rust-index: add `append` method to cindex/Index...
r44991
pub fn append(&mut self, py: Python, tup: PyTuple) -> PyResult<PyObject> {
self.index.call_method(
py,
"append",
PyTuple::new(py, &[tup.into_object()]),
None,
)
}
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 }
Georges Racinet
rust: core implementation for lazyancestors...
r41084 impl Clone for Index {
fn clone(&self) -> Self {
let guard = Python::acquire_gil();
Index {
index: self.index.clone_ref(guard.python()),
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 capi: self.capi,
Georges Racinet
rust: core implementation for lazyancestors...
r41084 }
}
}
Georges Racinet
rust-index: make it possible to clone the struct referencing the C index...
r44462 impl PyClone for Index {
fn clone_ref(&self, py: Python) -> Self {
Index {
index: self.index.clone_ref(py),
capi: self.capi,
}
}
}
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 impl Graph for Index {
/// wrap a call to the C extern parents function
fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
Georges Racinet
rust-cpython: raising error.WdirUnsupported...
r41386 if rev == WORKING_DIRECTORY_REVISION {
return Err(GraphError::WorkingDirectoryUnsupported);
}
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 let mut res: [c_int; 2] = [0; 2];
let code = unsafe {
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 (self.capi.index_parents)(
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 self.index.as_ptr(),
rev as c_int,
&mut res as *mut [c_int; 2],
)
};
match code {
0 => Ok(res),
_ => Err(GraphError::ParentOutOfRange(rev)),
}
}
}
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989
impl RevlogIndex for Index {
/// Note C return type is Py_ssize_t (hence signed), but we shall
/// force it to unsigned, because it's a length
fn len(&self) -> usize {
unsafe { (self.capi.index_length)(self.index.as_ptr()) as usize }
}
fn node<'a>(&'a self, rev: Revision) -> Option<&'a Node> {
let raw = unsafe {
(self.capi.index_node)(self.index.as_ptr(), rev as c_int)
};
if raw.is_null() {
None
} else {
// TODO it would be much better for the C layer to give us
// a length, since the hash length will change in the near
// future, but that's probably out of scope for the nodemap
// patch series.
//
// The root of that unsafety relies in the signature of
// `capi.index_node()` itself: returning a `Node` pointer
// whereas it's a `char *` in the C counterpart.
Some(unsafe { &*raw })
}
}
}