Skip to content

RDKTV-40024: Fix proper cleanup service #2100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SatheeshkumarG15 wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −8
Open

RDKTV-40024: Fix proper cleanup service #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd02deb
Used an atomic bool and compare_exchange_strong to make sure either R…
SatheeshkumarG15 Apr 21, 2026
0e7f6cf
Moving atomic variable to Channel class member Initialiser list
SatheeshkumarG15 Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Source/Thunder/PluginServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,7 @@ namespace PluginHost {
, _service()
, _requestClose(false)
, _jobs()
, _serviceCleanedUp(false)
{
TRACE(Activity, (_T("Construct a link with ID: [%d] to [%s]"), Id(), remoteId.QualifiedName().c_str()));

Expand All @@ -1214,11 +1215,8 @@ namespace PluginHost {
TRACE(Activity, (_T("Destruct a link with ID [%d] to [%s]"), Id(), RemoteId().c_str()));

// If we are still atatched to a service, detach, we are out of scope...
if (_service.IsValid() == true) {
_service->Unsubscribe(*this);
CleanupService();

_service.Release();
}
if (_security != nullptr) {
_security->Release();
_security = nullptr;
Expand Down
19 changes: 15 additions & 4 deletions Source/Thunder/PluginServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "IRemoteInstantiation.h"
#include "WarningReportingCategories.h"
#include "PostMortem.h"
#include <atomic>

#ifndef HOSTING_COMPROCESS
#error "Please define the name of the COM process!!!"
Expand Down Expand Up @@ -5353,11 +5354,8 @@ namespace PluginHost {

// If we are closing (or closed) do the clean up
if (IsOpen() == false) {
if (_service.IsValid() == true) {
_service->Detach(*this);

_service.Release();
}
CleanupService();

State(CLOSED, false);

Expand Down Expand Up @@ -5427,11 +5425,24 @@ namespace PluginHost {
SetId(id);
}

void CleanupService()
{
bool expected = false;
if (_serviceCleanedUp.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
if (_service.IsValid() == true) {
_service->Unsubscribe(*this);
_service->Detach(*this);
_service.Release();
}
}
}

Server& _parent;
PluginHost::ISecurity* _security;
Core::ProxyType<Service> _service;
bool _requestClose;
Jobs _jobs;
std::atomic<bool> _serviceCleanedUp;

// Factories for creating jobs that can be placed on the PluginHost Worker pool.
static Core::ProxyPoolType<WebRequestJob> _webJobs;
Expand Down
Loading