proxmox-mirrors/proxmox-backup-qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-backup-qemu synced 2025-10-19 22:11:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup (use better name)

Browse Source
This commit is contained in:
Dietmar Maurer 2020-07-02 07:13:29 +02:00
parent 26d3718833
commit 8c1d828c02
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib.rs
View File

@ -189,7 +189,7 @@ pub extern "C" fn proxmox_backup_new(
} }
} }
fn handle_to_task(handle: *mut ProxmoxBackupHandle) -> Arc<BackupTask> { fn backup_handle_to_task(handle: *mut ProxmoxBackupHandle) -> Arc<BackupTask> {
let task = unsafe { & *(handle as *const Arc<BackupTask>) }; let task = unsafe { & *(handle as *const Arc<BackupTask>) };
// increase reference count while we use it inside rust // increase reference count while we use it inside rust
task.clone() task.clone()
@ -207,7 +207,7 @@ pub extern "C" fn proxmox_backup_connect(
handle: *mut ProxmoxBackupHandle, handle: *mut ProxmoxBackupHandle,
error: *mut *mut c_char, error: *mut *mut c_char,
) -> c_int { ) -> c_int {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let mut result: c_int = -1; let mut result: c_int = -1;
@ -240,7 +240,7 @@ pub extern "C" fn proxmox_backup_connect_async(
result: *mut c_int, result: *mut c_int,
error: *mut *mut c_char, error: *mut *mut c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let callback_info = CallbackPointers { callback, callback_data, error, result }; let callback_info = CallbackPointers { callback, callback_data, error, result };
task.runtime().spawn(async move { task.runtime().spawn(async move {
@ -260,7 +260,7 @@ pub extern "C" fn proxmox_backup_abort(
handle: *mut ProxmoxBackupHandle, handle: *mut ProxmoxBackupHandle,
reason: *const c_char, reason: *const c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let reason = unsafe { tools::utf8_c_string_lossy_non_null(reason) }; let reason = unsafe { tools::utf8_c_string_lossy_non_null(reason) };
task.abort(reason); task.abort(reason);
} }
@ -276,7 +276,7 @@ pub extern "C" fn proxmox_backup_register_image(
incremental: bool, incremental: bool,
error: * mut * mut c_char, error: * mut * mut c_char,
) -> c_int { ) -> c_int {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let mut result: c_int = -1; let mut result: c_int = -1;
@ -312,7 +312,7 @@ pub extern "C" fn proxmox_backup_register_image_async(
result: *mut c_int, result: *mut c_int,
error: * mut * mut c_char, error: * mut * mut c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let callback_info = CallbackPointers { callback, callback_data, error, result }; let callback_info = CallbackPointers { callback, callback_data, error, result };
let device_name = unsafe { tools::utf8_c_string_lossy_non_null(device_name) }; let device_name = unsafe { tools::utf8_c_string_lossy_non_null(device_name) };
@ -333,7 +333,7 @@ pub extern "C" fn proxmox_backup_add_config(
size: u64, size: u64,
error: * mut * mut c_char, error: * mut * mut c_char,
) -> c_int { ) -> c_int {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let mut result: c_int = -1; let mut result: c_int = -1;
@ -370,7 +370,7 @@ pub extern "C" fn proxmox_backup_add_config_async(
result: *mut c_int, result: *mut c_int,
error: * mut * mut c_char, error: * mut * mut c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let callback_info = CallbackPointers { callback, callback_data, error, result }; let callback_info = CallbackPointers { callback, callback_data, error, result };
@ -398,7 +398,7 @@ pub extern "C" fn proxmox_backup_write_data(
size: u64, size: u64,
error: * mut * mut c_char, error: * mut * mut c_char,
) -> c_int { ) -> c_int {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let mut result: c_int = -1; let mut result: c_int = -1;
@ -439,7 +439,7 @@ pub extern "C" fn proxmox_backup_write_data_async(
result: *mut c_int, result: *mut c_int,
error: * mut * mut c_char, error: * mut * mut c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let callback_info = CallbackPointers { callback, callback_data, error, result }; let callback_info = CallbackPointers { callback, callback_data, error, result };
let data = DataPointer(data); // fixme let data = DataPointer(data); // fixme
@ -457,7 +457,7 @@ pub extern "C" fn proxmox_backup_close_image(
dev_id: u8, dev_id: u8,
error: * mut * mut c_char, error: * mut * mut c_char,
) -> c_int { ) -> c_int {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let mut result: c_int = -1; let mut result: c_int = -1;
@ -488,7 +488,7 @@ pub extern "C" fn proxmox_backup_close_image_async(
result: *mut c_int, result: *mut c_int,
error: * mut * mut c_char, error: * mut * mut c_char,
) { ) {
let task = handle_to_task(handle); let task = backup_handle_to_task(handle);
let callback_info = CallbackPointers { callback, callback_data, error, result }; let callback_info = CallbackPointers { callback, callback_data, error, result };
task.runtime().spawn(async move { task.runtime().spawn(async move {

2
src/worker_task.rs
View File

@ -18,7 +18,7 @@ pub(crate) struct BackupTask {
crypt_config: Option<Arc<CryptConfig>>, crypt_config: Option<Arc<CryptConfig>>,
writer: Mutex<Option<Arc<BackupWriter>>>, writer: Mutex<Option<Arc<BackupWriter>>>,
last_manifest: Mutex<Option<Arc<BackupManifest>>>, last_manifest: Mutex<Option<Arc<BackupManifest>>>,
registry: Arc<Mutex<ImageRegistry>>, // fixme Arc/Mutex??? registry: Arc<Mutex<ImageRegistry>>,
known_chunks: Arc<Mutex<HashSet<[u8;32]>>>, known_chunks: Arc<Mutex<HashSet<[u8;32]>>>,
abort: tokio::sync::broadcast::Sender<()>, abort: tokio::sync::broadcast::Sender<()>,
aborted: Mutex<Option<String>>, // set on abort, conatins abort reason aborted: Mutex<Option<String>>, // set on abort, conatins abort reason