Skip to content

logging: Assert fail on pthread without log lock #2619

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
ggreenway merged 2 commits into from
Feb 15, 2018
Merged

logging: Assert fail on pthread without log lock #2619

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
adc04b0
Assert fail if we attempt to create a thread without having initializ…
jmarantz Feb 15, 2018
c99ec22
Merge branch 'master' into assert-fail-on-pthread-without-log-lock
jmarantz Feb 15, 2018
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
10 changes: 10 additions & 0 deletions source/common/common/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ class LockingStderrOrFileSink : public spdlog::sinks::sink {
void log(const spdlog::details::log_msg& msg) override;
void flush() override;

/**
* @return bool whether a lock has been established.
*/
bool hasLock() const { return lock_ != nullptr; }

private:
Thread::BasicLockable* lock_{};
Filesystem::FileSharedPtr log_file_;
Expand Down Expand Up @@ -132,6 +137,11 @@ class Registry {
*/
static const std::vector<Logger>& loggers() { return allLoggers(); }

/**
* @Return bool whether the registry has been initialized.
*/
static bool initialized() { return getSink()->hasLock(); }

private:
/*
* @return std::vector<Logger>& return the installed loggers.
Expand Down
2 changes: 2 additions & 0 deletions source/common/common/thread.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
#include <functional>

#include "common/common/assert.h"
#include "common/common/logger.h"
#include "common/common/macros.h"

namespace Envoy {
namespace Thread {

Thread::Thread(std::function<void()> thread_routine) : thread_routine_(thread_routine) {
RELEASE_ASSERT(Logger::Registry::initialized());
int rc = pthread_create(&thread_id_, nullptr,
[](void* arg) -> void* {
static_cast<Thread*>(arg)->thread_routine_();
Expand Down