Skip to content

Commit

Permalink
src/utilities: fix build without pthread
Browse files Browse the repository at this point in the history
- Remove is_default_thread function which is an internal and not used
  function
- Remove g_main_thread_id as it was used only by is_default_thread

Fixes:
 - http://autobuild.buildroot.net/results/5320bbe1205e782e3516d9bead8d1ed825bcbaad

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  • Loading branch information
ffontaine authored and sergiud committed Nov 2, 2019
1 parent fd3dc2c commit 9630e0e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
16 changes: 3 additions & 13 deletions src/utilities.cc
Expand Up @@ -61,7 +61,6 @@ using std::string;
_START_GOOGLE_NAMESPACE_

static const char* g_program_invocation_short_name = NULL;
static pthread_t g_main_thread_id;

_END_GOOGLE_NAMESPACE_

Expand Down Expand Up @@ -181,16 +180,6 @@ bool IsGoogleLoggingInitialized() {
return g_program_invocation_short_name != NULL;
}

bool is_default_thread() {
if (g_program_invocation_short_name == NULL) {
// InitGoogleLogging() not yet called, so unlikely to be in a different
// thread
return true;
} else {
return pthread_equal(pthread_self(), g_main_thread_id);
}
}

#ifdef OS_WINDOWS
struct timeval {
long tv_sec, tv_usec;
Expand Down Expand Up @@ -276,9 +265,11 @@ pid_t GetTID() {
return getpid(); // Linux: getpid returns thread ID when gettid is absent
#elif defined OS_WINDOWS && !defined OS_CYGWIN
return GetCurrentThreadId();
#else
#elif defined(HAVE_PTHREAD)
// If none of the techniques above worked, we use pthread_self().
return (pid_t)(uintptr_t)pthread_self();
#else
return -1;
#endif
}

Expand Down Expand Up @@ -350,7 +341,6 @@ void InitGoogleLoggingUtilities(const char* argv0) {
if (!slash) slash = strrchr(argv0, '\\');
#endif
g_program_invocation_short_name = slash ? slash + 1 : argv0;
g_main_thread_id = pthread_self();

#ifdef HAVE_STACKTRACE
InstallFailureFunction(&DumpStackTraceAndExit);
Expand Down
2 changes: 0 additions & 2 deletions src/utilities.h
Expand Up @@ -163,8 +163,6 @@ const char* ProgramInvocationShortName();

bool IsGoogleLoggingInitialized();

bool is_default_thread();

int64 CycleClock_Now();

int64 UsecToCycles(int64 usec);
Expand Down

0 comments on commit 9630e0e

Please sign in to comment.