Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d66c9ea authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Remove libbacktrace definition of gettid."

parents f24e49ad 23f750b0

libbacktrace/Backtrace.cpp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>



#include <cutils/threads.h>



#include "BacktraceLog.h"

#include "thread_utils.h"

#include "UnwindCurrent.h"

libbacktrace/BacktraceCurrent.cpp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>



#include <cutils/threads.h>



#include "BacktraceCurrent.h"

#include "BacktraceLog.h"

#include "ThreadEntry.h"

libbacktrace/backtrace_test.cpp

+9 −8
Original line number Diff line number Diff line
@@ -30,20 +30,21 @@ 
#include <time.h>

#include <unistd.h>



#include <algorithm>

#include <memory>

#include <string>

#include <vector>



#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>



// For the THREAD_SIGNAL definition.

#include "BacktraceCurrent.h"



#include <cutils/atomic.h>

#include <gtest/gtest.h>

#include <cutils/threads.h>



#include <algorithm>

#include <memory>

#include <string>

#include <vector>

#include <gtest/gtest.h>



// For the THREAD_SIGNAL definition.

#include "BacktraceCurrent.h"

#include "thread_utils.h"



// Number of microseconds per milliseconds.

libbacktrace/thread_utils.c

+2 −15
Original line number Diff line number Diff line
@@ -16,25 +16,12 @@ 


#include "thread_utils.h"



#if defined(__APPLE__)

#if !defined(__BIONIC__)



#include <sys/syscall.h>



// Mac OS >= 10.6 has a system call equivalent to Linux's gettid().

pid_t gettid() {

  return syscall(SYS_thread_selfid);

}



#elif !defined(__BIONIC__)



// glibc doesn't implement or export either gettid or tgkill.

// glibc doesn't implement or export tgkill.

#include <unistd.h>

#include <sys/syscall.h>



pid_t gettid() {

  return syscall(__NR_gettid);

}



int tgkill(int tgid, int tid, int sig) {

  return syscall(__NR_tgkill, tgid, tid, sig);

}

libbacktrace/thread_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ __BEGIN_DECLS 


int tgkill(int tgid, int tid, int sig);



pid_t gettid();



__END_DECLS



#endif /* _LIBBACKTRACE_THREAD_UTILS_H */