Mercurial > public > mercurial-scm > hg-stable

diff rust/hg-cpython/src/ref_sharing.rs @ 43286:f8c114f20d2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-cpython: require GIL to borrow immutable reference from PySharedRefCell Since the inner value may be leaked, we probably need GIL to guarantee that there's no data race. inner(py).borrow() is replaced with inner_shared(py).borrow(), which basically means any PySharedRefCell data should be accessed through PySharedRef wrapper.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 21 Sep 2019 17:15:50 +0900
parents ffc1fbd7d1f5
children 0df8312463ae
line wrap: on
line diff
--- a/rust/hg-cpython/src/ref_sharing.rs	Sun Sep 15 22:19:10 2019 +0900
+++ b/rust/hg-cpython/src/ref_sharing.rs	Sat Sep 21 17:15:50 2019 +0900
@@ -136,7 +136,7 @@
         }
     }
 
-    pub fn borrow(&self) -> Ref<T> {
+    pub fn borrow<'a>(&'a self, _py: Python<'a>) -> Ref<'a, T> {
         // py_shared_state isn't involved since
         // - inner.borrow() would fail if self is mutably borrowed,
         // - and inner.borrow_mut() would fail while self is borrowed.
@@ -180,7 +180,7 @@
     }
 
     pub fn borrow(&self) -> Ref<'a, T> {
-        self.data.borrow()
+        self.data.borrow(self.py)
     }
 
     pub fn borrow_mut(&self) -> PyResult<PyRefMut<'a, T>> {