Skip to content

[ONEM-40864] Release all the structures related to crashed client pro… #456

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
aiswarya-krishnan-infosys wants to merge 5 commits into
base: lgi-thunder4.2-20230922
Choose a base branch
from
Open

[ONEM-40864] Release all the structures related to crashed client pro… #456

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d51428
[ONEM-40864] Release all the structures related to crashed client pro…
aiswarya-krishnan-infosys Jul 8, 2025
aca960c
[ONEM-40864] Release all structures related to client when it is cras…
aiswarya-krishnan-infosys Jul 11, 2025
ac49d66
[ONEM-40864] Release all structures related to client when it is crashed
aiswarya-krishnan-infosys Jul 11, 2025
fd7f535
[ONEM-40864] Release all structures related to client when it is crashed
aiswarya-krishnan-infosys Jul 14, 2025
827faf3
[ONEM-40864] Release all structures related to client when it is crashed
aiswarya-krishnan-infosys Jul 16, 2025
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
52 changes: 49 additions & 3 deletions OpenCDMi/FrameworkRPC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ namespace Plugin {
private:
Exchange::IAccessorOCDM* _parentInterface;
};

class AccessorOCDM : public Exchange::IAccessorOCDM {
private:
AccessorOCDM() = delete;
Expand Down Expand Up @@ -253,7 +252,47 @@ namespace Plugin {
string _basePath;
uint16_t _occupation;
};
class SystemInstance : public Core::IUnknown {
private:
SystemInstance() = delete;
SystemInstance(const SystemInstance&) = delete;
SystemInstance& operator=(const SystemInstance&) = delete;
public:
SystemInstance(CDMi::IMediaKeysExt* _system, const std::string& keySystem)
: _system(_system)
, _keySystem(keySystem)
, _initResult(CDMi::CDMi_RESULT::CDMi_FAIL) // Default to failure
, _refCount(1)
, _cleanOnDestroy(true) // Default to clean on destroy

{
_initResult = _system->InitializeCtx(keySystem);
TRACE_L1("Constructed the SystemInstance for keySystem %s", _keySystem.c_str());
}
virtual ~SystemInstance()
{
TRACE_L1("Destructing SystemInstance %p for keySystem %s", this, _keySystem.c_str());
if (_system != nullptr) {
TRACE_L1("Destructed the systemInstance for keySystem %s", _keySystem.c_str());
_system->DeinitializeCtx(_keySystem, _cleanOnDestroy);
}
}

CDMi::CDMi_RESULT GetInitResult() const {
return _initResult;
}

BEGIN_INTERFACE_MAP(SystemInstance)
INTERFACE_ENTRY(Core::IUnknown)
END_INTERFACE_MAP

private:
CDMi::IMediaKeysExt* _system;
std::string _keySystem;
bool _cleanOnDestroy;
CDMi::CDMi_RESULT _initResult;
mutable std::atomic<uint32_t> _refCount;
};
// IMediaKeys defines the MediaKeys interface.
class SessionImplementation : public Exchange::ISession, public Exchange::ISessionExt {
private:
Expand Down Expand Up @@ -1148,7 +1187,9 @@ namespace Plugin {
{
CDMi::IMediaKeysExt* systemExt = dynamic_cast<CDMi::IMediaKeysExt*>(_parent.KeySystem(keySystem));
if (systemExt) {
return (Exchange::OCDM_RESULT)systemExt->InitializeCtx(keySystem);
SystemInstance *systemInstance = Core::Service<SystemInstance>::Create<SystemInstance>(systemExt, keySystem);
_systemInstances[keySystem] = systemInstance;
return (Exchange::OCDM_RESULT)systemInstance->GetInitResult();
}
return Exchange::OCDM_RESULT::OCDM_S_FALSE;
}
Expand All @@ -1157,6 +1198,11 @@ namespace Plugin {
{
CDMi::IMediaKeysExt* systemExt = dynamic_cast<CDMi::IMediaKeysExt*>(_parent.KeySystem(keySystem));
if (systemExt) {
auto it = _systemInstances.find(keySystem);
if (it != _systemInstances.end()) {
it->second->Release();
_systemInstances.erase(it);
}
return (Exchange::OCDM_RESULT)systemExt->DeinitializeCtx(keySystem, cleanOnDestroy);
}
return Exchange::OCDM_RESULT::OCDM_S_FALSE;
Expand Down Expand Up @@ -1246,7 +1292,6 @@ namespace Plugin {
_sessionList.erase(index);
}
}

_adminLock.Unlock();
}

Expand All @@ -1256,6 +1301,7 @@ namespace Plugin {
BufferAdministrator _administrator;
uint32_t _defaultSize;
std::list<SessionImplementation*> _sessionList;
std::map<std::string, SystemInstance*> _systemInstances;
};

class Config : public Core::JSON::Container {
Expand Down