use mutex instead of Rc and Cell as callbacks might be called from on…

…e another from CAPI component or omp server (related #6)
Sreyas-Sreelal · Nov 18, 2024 · a7ab30d · a7ab30d
1 parent 75848ef
commit a7ab30d
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 70 deletions.
diff --git a/omp-gdk/src/runtime.rs b/omp-gdk/src/runtime.rs
@@ -1,7 +1,7 @@
 use crate::events::Events;
-use std::{cell::RefCell, rc::Rc};
+use std::sync::{Arc, Mutex};
 
-type OMPRSModule = Rc<RefCell<dyn Events + 'static>>;
+type OMPRSModule = Arc<Mutex<dyn Events + 'static>>;
 
 /// Runtime global object that implements all the callbacks and gamemode data
 pub static mut Runtime: Option<Vec<Box<OMPRSModule>>> = None;

diff --git a/omp-gdk/src/scripting/actors/events.rs b/omp-gdk/src/scripting/actors/events.rs
@@ -20,7 +20,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerGiveDamageActor(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_give_damage_actor(
+        script.lock().unwrap().on_player_give_damage_actor(
             Player::new(*(*(*args).list).player),
             Actor::new(*(*(*args).list).actor),
             *(*(*args).list).amount,
@@ -40,7 +40,7 @@ pub struct OnActorStreamInArgs {
 pub unsafe extern "C" fn OMPRS_OnActorStreamIn(args: *const EventArgs<OnActorStreamInArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_actor_stream_in(
+        script.lock().unwrap().on_actor_stream_in(
             Actor::new(*(*(*args).list).actor),
             Player::new(*(*(*args).list).forPlayer),
         );
@@ -57,7 +57,7 @@ pub struct OnActorStreamOutArgs {
 pub unsafe extern "C" fn OMPRS_OnActorStreamOut(args: *const EventArgs<OnActorStreamOutArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_actor_stream_out(
+        script.lock().unwrap().on_actor_stream_out(
             Actor::new(*(*(*args).list).actor),
             Player::new(*(*(*args).list).forPlayer),
         );

diff --git a/omp-gdk/src/scripting/checkpoints/events.rs b/omp-gdk/src/scripting/checkpoints/events.rs
@@ -13,7 +13,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterCheckpoint(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_enter_checkpoint(Player::new(*(*(*args).list).player));
     }
 }
@@ -30,7 +31,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveCheckpoint(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_leave_checkpoint(Player::new(*(*(*args).list).player));
     }
 }
@@ -47,7 +49,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterRaceCheckpoint(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_enter_race_checkpoint(Player::new(*(*(*args).list).player));
     }
 }
@@ -64,7 +67,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveRaceCheckpoint(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_leave_race_checkpoint(Player::new(*(*(*args).list).player));
     }
 }
diff --git a/omp-gdk/src/scripting/classes/events.rs b/omp-gdk/src/scripting/classes/events.rs
@@ -14,7 +14,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerRequestClass(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     let mut ret = false;
     for script in scripts.iter_mut() {
-        ret = script.borrow_mut().on_player_request_class(
+        ret = script.lock().unwrap().on_player_request_class(
             Player::new(*(*(*args).list).player),
             *(*(*args).list).classId,
         );

diff --git a/omp-gdk/src/scripting/core/events.rs b/omp-gdk/src/scripting/core/events.rs
@@ -10,7 +10,7 @@ pub struct OnTickArgs {
 pub unsafe extern "C" fn OMPRS_OnTick(args: *const EventArgs<OnTickArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_tick(*(*(*args).list).elapsed);
+        script.lock().unwrap().on_tick(*(*(*args).list).elapsed);
     }
 }
 
@@ -25,7 +25,7 @@ pub unsafe extern "C" fn OMPRS_OnConsoleText(args: *const EventArgs<OnConsoleTex
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     let mut ret = false;
     for script in scripts.iter_mut() {
-        ret = script.borrow_mut().on_console_text(
+        ret = script.lock().unwrap().on_console_text(
             (*(*(*args).list).command).get_data(),
             (*(*(*args).list).parameters).get_data(),
         );
@@ -51,7 +51,7 @@ pub unsafe extern "C" fn OMPRS_OnRconLoginAttempt(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     let mut ret = false;
     for script in scripts.iter_mut() {
-        ret = script.borrow_mut().on_rcon_login_attempt(
+        ret = script.lock().unwrap().on_rcon_login_attempt(
             (*(*(*args).list).address).get_data(),
             (*(*(*args).list).password).get_data(),
             *(*(*args).list).success,

diff --git a/omp-gdk/src/scripting/dialogs/events.rs b/omp-gdk/src/scripting/dialogs/events.rs
@@ -15,7 +15,7 @@ pub struct OnDialogResponseArgs {
 pub unsafe extern "C" fn OMPRS_OnDialogResponse(args: *const EventArgs<OnDialogResponseArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_dialog_response(
+        script.lock().unwrap().on_dialog_response(
             Player::new(*(*(*args).list).player),
             *(*(*args).list).dialogId,
             transmute(*(*(*args).list).response),

diff --git a/omp-gdk/src/scripting/gangzones/events.rs b/omp-gdk/src/scripting/gangzones/events.rs
@@ -15,7 +15,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterGangZone(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_enter_gang_zone(
+        script.lock().unwrap().on_player_enter_gang_zone(
             Player::new(*(*(*args).list).player),
             GangZone::new(*(*(*args).list).zone),
         );
@@ -34,7 +34,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveGangZone(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_leave_gang_zone(
+        script.lock().unwrap().on_player_leave_gang_zone(
             Player::new(*(*(*args).list).player),
             GangZone::new(*(*(*args).list).zone),
         );
@@ -53,7 +53,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerClickGangZone(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_click_gang_zone(
+        script.lock().unwrap().on_player_click_gang_zone(
             Player::new(*(*(*args).list).player),
             GangZone::new(*(*(*args).list).zone),
         );

diff --git a/omp-gdk/src/scripting/menus/events.rs b/omp-gdk/src/scripting/menus/events.rs
@@ -13,7 +13,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerSelectedMenuRow(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_selected_menu_row(
+        script.lock().unwrap().on_player_selected_menu_row(
             Player::new(*(*(*args).list).player),
             *(*(*args).list).row,
         );
@@ -30,7 +30,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerExitedMenu(args: *const EventArgs<OnPlaye
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_exited_menu(Player::new(*(*(*args).list).player));
     }
 }
diff --git a/omp-gdk/src/scripting/models/events.rs b/omp-gdk/src/scripting/models/events.rs
@@ -15,7 +15,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerFinishedDownloading(
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_player_finished_downloading(Player::new(*(*(*args).list).player));
     }
 }
@@ -33,7 +34,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerRequestDownload(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_request_download(
+        script.lock().unwrap().on_player_request_download(
             Player::new(*(*(*args).list).player),
             transmute(*(*(*args).list).model_type),
             *(*(*args).list).checksum,

diff --git a/omp-gdk/src/scripting/objects/events.rs b/omp-gdk/src/scripting/objects/events.rs
@@ -15,7 +15,8 @@ pub unsafe extern "C" fn OMPRS_OnObjectMove(args: *const EventArgs<OnObjectMoveA
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
         script
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .on_object_moved(Object::new(*(*(*args).list).object));
     }
 }
@@ -30,7 +31,7 @@ pub struct OnPlayerObjectMoveArgs {
 pub unsafe extern "C" fn OMPRS_OnPlayerObjectMove(args: *const EventArgs<OnPlayerObjectMoveArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_object_moved(
+        script.lock().unwrap().on_player_object_moved(
             Player::new(*(*(*args).list).player),
             PlayerObject::new(
                 *(*(*args).list).object,
@@ -57,7 +58,7 @@ pub struct OnPlayerEditObjectArgs {
 pub unsafe extern "C" fn OMPRS_OnPlayerEditObject(args: *const EventArgs<OnPlayerEditObjectArgs>) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_edit_object(
+        script.lock().unwrap().on_player_edit_object(
             Player::new(*(*(*args).list).player),
             Object::new(*(*(*args).list).object),
             transmute(*(*(*args).list).response),
@@ -112,7 +113,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEditAttachedObject(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_edit_attached_object(
+        script.lock().unwrap().on_player_edit_attached_object(
             Player::new(*(*(*args).list).player),
             *(*(*args).list).index,
             *(*(*args).list).saved,
@@ -156,7 +157,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerSelectObject(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_select_object(
+        script.lock().unwrap().on_player_select_object(
             Player::new(*(*(*args).list).player),
             Object::new(*(*(*args).list).object),
             *(*(*args).list).model,

diff --git a/omp-gdk/src/scripting/pickups/events.rs b/omp-gdk/src/scripting/pickups/events.rs
@@ -15,7 +15,7 @@ pub unsafe extern "C" fn OMPRS_OnPlayerPickUpPickup(
 ) {
     let scripts = crate::runtime::Runtime.as_mut().unwrap();
     for script in scripts.iter_mut() {
-        script.borrow_mut().on_player_pick_up_pickup(
+        script.lock().unwrap().on_player_pick_up_pickup(
             Player::new(*(*(*args).list).player),
             Pickup::new(*(*(*args).list).pickup),
         );