From: Eunki, Hong Date: Wed, 3 Jul 2024 07:44:08 +0000 (+0900) Subject: Check adaptor validation at ProcessController.Initialize() time X-Git-Tag: dali_2.3.31~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54f153b56618cf2cba781c1b0cf641ef504a90a7;p=platform%2Fcore%2Fuifw%2Fdali-csharp-binder.git Check adaptor validation at ProcessController.Initialize() time Since we don't allow to call Initialize() and Awake() at worker thread, we need to check the thread safety at that time. Change-Id: I647ca286aa240080161f457b4e484ac4310357e7 Signed-off-by: Eunki, Hong --- diff --git a/dali-csharp-binder/common/processor-controller.cpp b/dali-csharp-binder/common/processor-controller.cpp index d4ef8519..51fb89dd 100644 --- a/dali-csharp-binder/common/processor-controller.cpp +++ b/dali-csharp-binder/common/processor-controller.cpp @@ -83,26 +83,26 @@ void ProcessorController::Process(bool postProcessor) mKeepRenderingApplied = false; // Clean up processing and events idle request flag. - mProcessingEvents = false; + mProcessingEvents = false; mProcessEventsIdleRequested = false; } } -void ProcessorController::SetCallback( ProcessorControllerProcessCallback callback ) +void ProcessorController::SetCallback(ProcessorControllerProcessCallback callback) { mHandler = callback; } -void ProcessorController::SetPostCallback( ProcessorControllerProcessCallback postCallback ) +void ProcessorController::SetPostCallback(ProcessorControllerProcessCallback postCallback) { mPostHandler = postCallback; } -void ProcessorController::RemoveCallback( ProcessorControllerProcessCallback callback ) +void ProcessorController::RemoveCallback(ProcessorControllerProcessCallback callback) { mHandler = nullptr; } -void ProcessorController::RemovePostCallback( ProcessorControllerProcessCallback postCallback ) +void ProcessorController::RemovePostCallback(ProcessorControllerProcessCallback postCallback) { mPostHandler = nullptr; } @@ -137,10 +137,13 @@ void ProcessorController::RegisterProcess() { try { - Dali::Adaptor::Get().RegisterProcessor(*this); - Dali::Adaptor::Get().RegisterProcessor(*this, true); + if(DALI_LIKELY(Dali::Adaptor::IsAvailable())) + { + Dali::Adaptor::Get().RegisterProcessor(*this); + Dali::Adaptor::Get().RegisterProcessor(*this, true); - mProcessRegistered = true; + mProcessRegistered = true; + } } CALL_CATCH_EXCEPTION(); } @@ -151,98 +154,104 @@ extern "C" { #endif // ProcessorController Bindings -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProcessorController() { - - ProcessorController *result = 0 ; +SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ProcessorController() +{ + ProcessorController* result = 0; { - try { - result = (ProcessorController *)new ProcessorController(); + try + { + result = (ProcessorController*)new ProcessorController(); result->RegisterProcess(); - } CALL_CATCH_EXCEPTION(0); + } + CALL_CATCH_EXCEPTION(0); } - return (void *)result; + return (void*)result; } -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProcessorController_Without_Initialize() { - - ProcessorController *result = 0 ; +SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ProcessorController_Without_Initialize() +{ + ProcessorController* result = 0; { - try { - result = (ProcessorController *)new ProcessorController(); - } CALL_CATCH_EXCEPTION(0); + try + { + result = (ProcessorController*)new ProcessorController(); + } + CALL_CATCH_EXCEPTION(0); } - return (void *)result; + return (void*)result; } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ProcessorController(void * jarg1) { - - ProcessorController * arg1 = (ProcessorController *)jarg1; +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ProcessorController(void* jarg1) +{ + ProcessorController* arg1 = (ProcessorController*)jarg1; { - try { + try + { delete arg1; - } CALL_CATCH_EXCEPTION(); + } + CALL_CATCH_EXCEPTION(); } } SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_Initialize(void* jarg1) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { processorController->RegisterProcess(); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_SetCallback( void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback ) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_SetCallback(void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { - processorController->SetCallback( callback ); + processorController->SetCallback(callback); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_SetPostCallback( void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback ) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_SetPostCallback(void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { - processorController->SetPostCallback( callback ); + processorController->SetPostCallback(callback); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_RemoveCallback( void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback ) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_RemoveCallback(void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { - processorController->RemoveCallback( callback ); + processorController->RemoveCallback(callback); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_RemovePostCallback( void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback ) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_RemovePostCallback(void* jarg1, ProcessorController::ProcessorControllerProcessCallback callback) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { - processorController->RemovePostCallback( callback ); + processorController->RemovePostCallback(callback); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_Awake( void* jarg1 ) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProcessorController_Awake(void* jarg1) { - ProcessorController* processorController = (ProcessorController *) jarg1; + ProcessorController* processorController = (ProcessorController*)jarg1; - if( processorController ) + if(processorController) { processorController->Awake(); }