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

fixed OpenBSD support (#921)

Browse Source 
- Usage of syscall() is not allowed
- Use getthrid() to retreive the thread ID
This commit is contained in:
Brad Smith 2023-05-10 07:41:38 -04:00 committed by GitHub
parent 6742834201
commit aca9a23c83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/raw_logging.cc
View File

@ -60,7 +60,8 @@
#endif #endif
#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \ #if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \
(!(defined(GLOG_OS_MACOSX))) && !defined(GLOG_OS_EMSCRIPTEN) (!(defined(GLOG_OS_MACOSX)) && !(defined(GLOG_OS_OPENBSD))) && \
!defined(GLOG_OS_EMSCRIPTEN)
#define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) #define safe_write(fd, s, len) syscall(SYS_write, fd, s, len)
#else #else
// Not so safe, but what can you do? // Not so safe, but what can you do?

2
src/utilities.cc
View File

@ -292,6 +292,8 @@ pid_t GetTID() {
return getpid(); // Linux: getpid returns thread ID when gettid is absent return getpid(); // Linux: getpid returns thread ID when gettid is absent
#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN #elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN
return static_cast<pid_t>(GetCurrentThreadId()); return static_cast<pid_t>(GetCurrentThreadId());
#elif defined GLOG_OS_OPENBSD
return getthrid();
#elif defined(HAVE_PTHREAD) #elif defined(HAVE_PTHREAD)
// If none of the techniques above worked, we use pthread_self(). // If none of the techniques above worked, we use pthread_self().
return (pid_t)(uintptr_t)pthread_self(); return (pid_t)(uintptr_t)pthread_self();