packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Add concurrency=send 

Ultimately a repo is just a file descriptor wrapper with some
cached data, etc.  We can send it between threads, much like how
`gio::File` is `Send`.

Motivated by trying to write to a repo from a separate thread
in https://github.com/cgwalters/ostree-container
This commit is contained in:
Colin Walters 2021-04-02 13:47:02 +00:00
parent 0718f433a2
commit b5496f70f6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rust-bindings/rust/conf/ostree.toml
View File

@ -139,6 +139,7 @@ status = "generate"
[[object]] [[object]]
name = "OSTree.Repo" name = "OSTree.Repo"
status = "generate" status = "generate"
concurrency = "send"
[[object.function]] [[object.function]]
# [MANUAL] we special-case the checksum value # [MANUAL] we special-case the checksum value
pattern = "^(write_content|write_content_async|write_metadata|write_metadata_async)$" pattern = "^(write_content|write_content_async|write_metadata|write_metadata_async)$"

6
rust-bindings/rust/src/auto/repo.rs
View File

@ -1060,8 +1060,8 @@ impl Repo {
// unsafe { TODO: call ostree_sys:ostree_repo_traverse_parents_get_commits() } // unsafe { TODO: call ostree_sys:ostree_repo_traverse_parents_get_commits() }
//} //}
pub fn connect_gpg_verify_result<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(&self, f: F) -> SignalHandlerId { pub fn connect_gpg_verify_result<F: Fn(&Repo, &str, &GpgVerifyResult) + Send + 'static>(&self, f: F) -> SignalHandlerId {
unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(this: *mut ostree_sys::OstreeRepo, checksum: *mut libc::c_char, result: *mut ostree_sys::OstreeGpgVerifyResult, f: glib_sys::gpointer) { unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + Send + 'static>(this: *mut ostree_sys::OstreeRepo, checksum: *mut libc::c_char, result: *mut ostree_sys::OstreeGpgVerifyResult, f: glib_sys::gpointer) {
let f: &F = &*(f as *const F); let f: &F = &*(f as *const F);
f(&from_glib_borrow(this), &GString::from_glib_borrow(checksum), &from_glib_borrow(result)) f(&from_glib_borrow(this), &GString::from_glib_borrow(checksum), &from_glib_borrow(result))
} }
@ -1073,6 +1073,8 @@ impl Repo {
} }
} }
unsafe impl Send for Repo {}
impl fmt::Display for Repo { impl fmt::Display for Repo {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "Repo") write!(f, "Repo")

2
rust-bindings/rust/src/auto/versions.txt
View File

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab)
from gir-files (https://github.com/gtk-rs/gir-files @ b3c601f) from gir-files (https://github.com/gtk-rs/gir-files @ 9fe8b26)

2
rust-bindings/rust/sys/src/auto/versions.txt
View File

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab)
from gir-files (https://github.com/gtk-rs/gir-files @ b3c601f) from gir-files (https://github.com/gtk-rs/gir-files @ 9fe8b26)