Skip to content

RDKEMW-20646 : Using Thread::WorkerPool to send the events #322

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
karuna2git wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKEMW-20646 : Using Thread::WorkerPool to send the events #322

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
2 changes: 1 addition & 1 deletion interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_link_libraries(${PROXYLIB} PRIVATE
CompileSettingsDebug::CompileSettingsDebug)

set_target_properties(${PROXYLIB} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES
FRAMEWORK FALSE)

Expand Down
7 changes: 5 additions & 2 deletions legacy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ set(PLUGIN_LEGACY_WIFI ${NAMESPACE}WiFiManager)
set(PLUGIN_LEGACY_NW_STARTUPORDER "35" CACHE STRING "To configure startup order of Legacy Network plugin")
set(PLUGIN_LEGACY_WIFI_STARTUPORDER "35" CACHE STRING "To configure startup order of Legacy WiFi plugin")

set(PLUGIN_LEGACY_NW_AUTOSTART "false" CACHE STRING "The autostart of Legacy Network plugin")
set(PLUGIN_LEGACY_WIFI_AUTOSTART "false" CACHE STRING "The autostart of Legacy WiFi plugin")

set(PLUGIN_BUILD_REFERENCE ${PROJECT_VERSION} CACHE STRING "To Set the Hash for the plugin")
add_definitions(-DPLUGIN_BUILD_REFERENCE=${PLUGIN_BUILD_REFERENCE})

Expand All @@ -53,7 +56,7 @@ if (USE_RDK_LOGGER)
endif (USE_RDK_LOGGER)

set_target_properties(${PLUGIN_LEGACY_NETWORK} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES)

install(TARGETS ${PLUGIN_LEGACY_NETWORK} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGE_DIRECTORY}/plugins)
Expand All @@ -71,7 +74,7 @@ if (USE_RDK_LOGGER)
endif (USE_RDK_LOGGER)

set_target_properties(${PLUGIN_LEGACY_WIFI} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES)

install(TARGETS ${PLUGIN_LEGACY_WIFI} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGE_DIRECTORY}/plugins)
Expand Down
2 changes: 1 addition & 1 deletion legacy/LegacyNetworkAPIs.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
precondition = ["Platform"]
callsign = "org.rdk.Network"
autostart = "false"
autostart = "@PLUGIN_LEGACY_NW_AUTOSTART@"
startuporder = "@PLUGIN_LEGACY_NW_STARTUPORDER@"
4 changes: 0 additions & 4 deletions legacy/LegacyNetworkAPIs.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion legacy/LegacyWiFiManagerAPIs.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
precondition = ["Platform"]
callsign = "org.rdk.Wifi"
autostart = "false"
autostart = "@PLUGIN_LEGACY_WIFI_AUTOSTART@"
startuporder = "@PLUGIN_LEGACY_WIFI_STARTUPORDER@"
4 changes: 0 additions & 4 deletions legacy/LegacyWiFiManagerAPIs.config
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ else()
find_package(IARMBus REQUIRED)
endif ()

set(PLUGIN_NETWORKMANAGER_LOGLEVEL "5" CACHE STRING "To configure default loglevel NetworkManager plugin")
set(PLUGIN_NETWORKMANAGER_LOGLEVEL "3" CACHE STRING "To configure default loglevel NetworkManager plugin")
set(PLUGIN_NETWORKMANAGER_STARTUPORDER "25" CACHE STRING "To configure startup order of Unified NetworkManager plugin")

set(PLUGIN_NETWORKMANAGER_AUTOSTART "false" CACHE STRING "Set the default AutoStart of NetworkManager Plugin")
set(PLUGIN_BUILD_REFERENCE ${PROJECT_VERSION} CACHE STRING "To Set the Hash for the plugin")
add_definitions(-DPLUGIN_BUILD_REFERENCE=${PLUGIN_BUILD_REFERENCE})

Expand All @@ -71,7 +72,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE
)

set_target_properties(${MODULE_NAME} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES
FRAMEWORK FALSE)
Comment thread
karuna2git marked this conversation as resolved.
Comment thread
karuna2git marked this conversation as resolved.
Comment on lines 74 to 77

Expand Down Expand Up @@ -128,7 +129,7 @@ else()
endif()

set_target_properties(${MODULE_IMPL_NAME} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES
FRAMEWORK FALSE)
Comment on lines 131 to 134

Expand Down
2 changes: 1 addition & 1 deletion plugin/NetworkManager.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
callsign= "org.rdk.NetworkManager"
startuporder = "@PLUGIN_NETWORKMANAGER_STARTUPORDER@"
autostart = "false"
autostart = "@PLUGIN_NETWORKMANAGER_AUTOSTART@"
Comment thread
karuna2git marked this conversation as resolved.

process= JSON()
process.add("outofprocess", "true")
Expand Down
27 changes: 0 additions & 27 deletions plugin/NetworkManager.config
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions plugin/NetworkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ namespace WPEFramework
// Still running inside the main WPEFramework process - the child process will have now been spawned and registered if necessary
if (_networkManager != nullptr)
{

// Set the plugin log level
Exchange::INetworkManager::Logging _loglevel;
_networkManager->GetLogLevel(_loglevel);
NetworkManagerLogger::SetLevel(static_cast <NetworkManagerLogger::LogLevel>(_loglevel));

// Register Notifications
SYSLOG(Logging::Startup, (_T("Registering Notification to NetworkManager")));
_networkManager->Register(&_notification);
Expand All @@ -103,6 +97,12 @@ namespace WPEFramework
{
SYSLOG(Logging::Startup, (_T("Configuring successful")));
}

// Set the plugin log level
Exchange::INetworkManager::Logging _loglevel;
_networkManager->GetLogLevel(_loglevel);
NetworkManagerLogger::SetLevel(static_cast <NetworkManagerLogger::LogLevel>(_loglevel));

// Register all custom JSON-RPC methods
SYSLOG(Logging::Startup, (_T("Registering JSONRPC Methods")));
RegisterAllMethods();
Expand Down
Loading
Loading