Skip to content

RDKEMW-8952 : Switching between Xumo Fast Channels and Vipa activated… #71

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

Merged
vjain008 merged 1 commit into from
Oct 8, 2025
Merged

RDKEMW-8952 : Switching between Xumo Fast Channels and Vipa activated… #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/jsc/JavaScriptContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ static AAMPJSBindings* gAAMPJSBindings = nullptr;
//BIG CHANGE
extern void functionLoadModule(JSGlobalContextRef ref, JSObjectRef globalObjectRef, char* buffer, int len, char* name);

static const char* envValue = std::getenv("NATIVEJS_DUMP_NETWORKMETRIC");

JSContextGroupRef globalContextGroup()
{
static JSContextGroupRef gGroupRef = JSContextGroupCreate();
Expand Down Expand Up @@ -134,13 +132,17 @@ void JavaScriptContext::loadAAMPJSBindingsLib()
if (nullptr == gAAMPJSBindings->PlayerLibHandle)
{
static const char *aampJSBindingsLib = "libaampjsbindings.so";
// This is required for NativeJS Plugin
#if 0
static const char *jscLib = "libJavaScriptCore.so";
jscLibHandle = dlopen(jscLib, RTLD_NOW | RTLD_GLOBAL);
if (!jscLibHandle)
{
std::cout<<"dlopen error for jsc library " << dlerror() << std::endl;
}
void *aampJSBindingsLibHandle = dlopen(aampJSBindingsLib, RTLD_NOW | RTLD_GLOBAL);
#endif

void *aampJSBindingsLibHandle = dlopen(aampJSBindingsLib, RTLD_NOW | RTLD_GLOBAL);
if (aampJSBindingsLibHandle)
{
gAAMPJSBindings->PlayerLibHandle = aampJSBindingsLibHandle;
Expand All @@ -165,7 +167,7 @@ void JavaScriptContext::unloadAAMPJSBindingsLib()
if (nullptr != gAAMPJSBindings->PlayerLibHandle)
{
dlclose(gAAMPJSBindings->PlayerLibHandle);
dlclose(jscLibHandle);
//dlclose(jscLibHandle);

}
}
Expand Down Expand Up @@ -481,9 +483,7 @@ void JavaScriptContext::onMetricsData (NetworkMetrics *net)
rtString key = net->url;
mNetworkMetricsData->set(key, rtValue((void *)net));

if (envValue) {
dumpNetworkMetricData(net, this->getUrl());
}
dumpNetworkMetricData(net, this->getUrl());
}

void JavaScriptContext::dumpNetworkMetricData(NetworkMetrics *metrics, std::string appUrl)
Expand Down
3 changes: 2 additions & 1 deletion src/jsc/JavaScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ void JavaScriptEngine::collectGarbage()
{
if (gTopLevelContext)
{
JSSynchronousGarbageCollectForDebugging(gTopLevelContext);
//JSSynchronousGarbageCollectForDebugging(gTopLevelContext);
JSGarbageCollect(gTopLevelContext);
}
}
3 changes: 2 additions & 1 deletion src/jsc/JavaScriptUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ std::thread::id gMainThreadId;

static std::list<std::function<void ()>> gPendingFun;
static std::mutex gDispatchMutex;
static const char* envValue = std::getenv("NATIVEJS_DUMP_NETWORKMETRIC");

struct TimeoutInfo
{
Expand Down Expand Up @@ -232,7 +233,7 @@ class rtHttpRequestEx : public rtHttpRequest
resp->setHeaders(downloadRequest->headerData(), downloadRequest->headerDataSize());
resp->setDownloadedData(downloadRequest->downloadedData(), downloadRequest->downloadedDataSize());

if (mMetricsListener)
if (mMetricsListener && envValue)
{
rtLogWarn("metriclistener");
NetworkMetrics *metrics = new NetworkMetrics();
Expand Down