luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #651 from xkszltl/initapi

Browse Source 
Expose `IsGoogleLoggingInitialized()` in public API.
This commit is contained in:
Sergiu Deitsch 2021-05-14 13:23:01 +02:00 committed by GitHub
commit 0b3d4cb471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/glog/logging.h.in
View File

@ -594,6 +594,9 @@ GOOGLE_GLOG_DLL_DECL void InitGoogleLogging(const char* argv0,
void* prefix_callback_data = NULL); void* prefix_callback_data = NULL);
#endif #endif
// Check if google's logging library has been initialized.
GOOGLE_GLOG_DLL_DECL bool IsGoogleLoggingInitialized();
// Shutdown google's logging library. // Shutdown google's logging library.
GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging(); GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();

6
src/logging_custom_prefix_unittest.cc
View File

@ -221,11 +221,15 @@ int main(int argc, char **argv) {
LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
const string early_stderr = GetCapturedTestStderr(); const string early_stderr = GetCapturedTestStderr();
EXPECT_FALSE(IsGoogleLoggingInitialized());
// Setting a custom prefix generator (it will use the default format so that // Setting a custom prefix generator (it will use the default format so that
// the golden outputs can be reused): // the golden outputs can be reused):
string prefix_attacher_data = "good data"; string prefix_attacher_data = "good data";
InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data)); InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data));
EXPECT_TRUE(IsGoogleLoggingInitialized());
RunSpecifiedBenchmarks(); RunSpecifiedBenchmarks();
FLAGS_logtostderr = true; FLAGS_logtostderr = true;
@ -992,8 +996,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
base::SetLogger(GLOG_INFO, base::SetLogger(GLOG_INFO,
new RecordDeletionLogger(&custom_logger_deleted, new RecordDeletionLogger(&custom_logger_deleted,
base::GetLogger(GLOG_INFO))); base::GetLogger(GLOG_INFO)));
EXPECT_TRUE(IsGoogleLoggingInitialized());
ShutdownGoogleLogging(); ShutdownGoogleLogging();
EXPECT_TRUE(custom_logger_deleted); EXPECT_TRUE(custom_logger_deleted);
EXPECT_FALSE(IsGoogleLoggingInitialized());
} }
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

6
src/logging_unittest.cc
View File

@ -197,8 +197,12 @@ int main(int argc, char **argv) {
LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
const string early_stderr = GetCapturedTestStderr(); const string early_stderr = GetCapturedTestStderr();
EXPECT_FALSE(IsGoogleLoggingInitialized());
InitGoogleLogging(argv[0]); InitGoogleLogging(argv[0]);
EXPECT_TRUE(IsGoogleLoggingInitialized());
RunSpecifiedBenchmarks(); RunSpecifiedBenchmarks();
FLAGS_logtostderr = true; FLAGS_logtostderr = true;
@ -965,8 +969,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
base::SetLogger(GLOG_INFO, base::SetLogger(GLOG_INFO,
new RecordDeletionLogger(&custom_logger_deleted, new RecordDeletionLogger(&custom_logger_deleted,
base::GetLogger(GLOG_INFO))); base::GetLogger(GLOG_INFO)));
EXPECT_TRUE(IsGoogleLoggingInitialized());
ShutdownGoogleLogging(); ShutdownGoogleLogging();
EXPECT_TRUE(custom_logger_deleted); EXPECT_TRUE(custom_logger_deleted);
EXPECT_FALSE(IsGoogleLoggingInitialized());
} }
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

8
src/utilities.cc
View File

@ -62,6 +62,10 @@ _START_GOOGLE_NAMESPACE_
static const char* g_program_invocation_short_name = NULL; static const char* g_program_invocation_short_name = NULL;
bool IsGoogleLoggingInitialized() {
return g_program_invocation_short_name != NULL;
}
_END_GOOGLE_NAMESPACE_ _END_GOOGLE_NAMESPACE_
// The following APIs are all internal. // The following APIs are all internal.
@ -176,10 +180,6 @@ const char* ProgramInvocationShortName() {
} }
} }
bool IsGoogleLoggingInitialized() {
return g_program_invocation_short_name != NULL;
}
#ifdef OS_WINDOWS #ifdef OS_WINDOWS
struct timeval { struct timeval {
long tv_sec, tv_usec; long tv_sec, tv_usec;

2
src/utilities.h
View File

@ -163,8 +163,6 @@ namespace glog_internal_namespace_ {
const char* ProgramInvocationShortName(); const char* ProgramInvocationShortName();
bool IsGoogleLoggingInitialized();
int64 CycleClock_Now(); int64 CycleClock_Now();
int64 UsecToCycles(int64 usec); int64 UsecToCycles(int64 usec);