Skip to content

[logger] Fix Kernel GP seen for any short-lived *syncd process #444

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
vaibhavhd merged 3 commits into from
Jan 12, 2021
Merged

[logger] Fix Kernel GP seen for any short-lived *syncd process #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6493509
Logger: Signal the settingthread to complete before detaching it. Use…
vaibhavhd Jan 11, 2021
ace1c2f
Join the settingThread instead of detaching it
vaibhavhd Jan 12, 2021
da6b9e2
Make the thread terminate variable volatile
vaibhavhd Jan 12, 2021
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
7 changes: 4 additions & 3 deletions common/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ void err_exit(const char *fn, int ln, int e, const char *fmt, ...)

Logger::~Logger() {
if (m_settingThread) {
m_settingThread->detach();
terminateSettingThread = true;
m_settingThread->join();
}
}

Expand Down Expand Up @@ -164,13 +165,13 @@ Logger::Priority Logger::getMinPrio()
return getInstance().m_minPrio;
}

[[ noreturn ]] void Logger::settingThread()
void Logger::settingThread()
{
Select select;
DBConnector db("LOGLEVEL_DB", 0);
std::map<std::string, std::shared_ptr<ConsumerStateTable>> selectables;

while (true)
while (!terminateSettingThread)
{
if (selectables.size() < m_settingChangeObservers.size())
{
Expand Down
3 changes: 2 additions & 1 deletion common/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class Logger
static void swssPrioNotify(const std::string &component, const std::string &prioStr);
static void swssOutputNotify(const std::string &component, const std::string &outputStr);

ATTRIBUTE_NORTEURN void settingThread();
void settingThread();

LogSettingChangeObservers m_settingChangeObservers;
std::map<std::string, std::string> m_currentPrios;
Expand All @@ -145,6 +145,7 @@ class Logger
std::atomic<Output> m_output = { SWSS_SYSLOG };
std::unique_ptr<std::thread> m_settingThread;
std::mutex m_mutex;
volatile bool terminateSettingThread = false;
};

}
Expand Down