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

Commit 5791e216 authored by Josh Gao's avatar Josh Gao
Browse files

base: export GetThreadId. 

and stop using the incorrect (on Mac) version in adb..

Test: mma
Change-Id: If28f6c8d73b03db863be13ed88df81422c3aef87
parent 32caa987

adb/fdevent.cpp

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "fdevent.h"



#include <fcntl.h>

#include <stdint.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>
@@ -36,6 +37,7 @@ 
#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/thread_annotations.h>

#include <android-base/threads.h>



#include "adb_io.h"

#include "adb_trace.h"
@@ -78,7 +80,7 @@ static auto& g_poll_node_map = *new std::unordered_map<int, PollNode>(); 
static auto& g_pending_list = *new std::list<fdevent*>();

static std::atomic<bool> terminate_loop(false);

static bool main_thread_valid;

static unsigned long main_thread_id;

static uint64_t main_thread_id;



static auto& run_queue_notify_fd = *new unique_fd();

static auto& run_queue_mutex = *new std::mutex();
@@ -86,13 +88,13 @@ static auto& run_queue GUARDED_BY(run_queue_mutex) = *new std::deque<std::functi 


void check_main_thread() {

    if (main_thread_valid) {

        CHECK_EQ(main_thread_id, adb_thread_id());

        CHECK_EQ(main_thread_id, android::base::GetThreadId());

    }

}



void set_main_thread() {

    main_thread_valid = true;

    main_thread_id = adb_thread_id();

    main_thread_id = android::base::GetThreadId();

}



static std::string dump_fde(const fdevent* fde) {

adb/sysdeps.h

+0 −10
Original line number Diff line number Diff line
@@ -92,11 +92,6 @@ static __inline__ int adb_thread_setname(const std::string& name) { 
    return 0;

}



static __inline__  unsigned long adb_thread_id()

{

    return GetCurrentThreadId();

}



static __inline__ void  close_on_exec(int  fd)

{

    /* nothing really */
@@ -625,11 +620,6 @@ static __inline__ int adb_is_absolute_host_path(const char* path) { 
    return path[0] == '/';

}



static __inline__ unsigned long adb_thread_id()

{

    return (unsigned long)gettid();

}



#endif /* !_WIN32 */



static inline void disable_tcp_nagle(int fd) {

base/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ cc_defaults { 
        "quick_exit.cpp",

        "stringprintf.cpp",

        "strings.cpp",

        "threads.cpp",

        "test_utils.cpp",

    ],

base/include/android-base/threads.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_BASE_THREADS_H

#define ANDROID_BASE_THREADS_H



#include <stdint.h>



namespace android {

namespace base {

uint64_t GetThreadId();

}

}  // namespace android



#endif

base/logging.cpp

+4 −37
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "android-base/logging.h"



#include <fcntl.h>

#include <inttypes.h>

#include <libgen.h>

#include <time.h>
@@ -54,41 +55,7 @@ 


#include <android-base/macros.h>

#include <android-base/strings.h>



// For gettid.

#if defined(__APPLE__)

#include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED

#include <stdint.h>

#include <stdlib.h>

#include <sys/syscall.h>

#include <sys/time.h>

#include <unistd.h>

#elif defined(__linux__) && !defined(__ANDROID__)

#include <syscall.h>

#include <unistd.h>

#elif defined(_WIN32)

#include <windows.h>

#endif



#if defined(_WIN32)

typedef uint32_t thread_id;

#else

typedef pid_t thread_id;

#endif



static thread_id GetThreadId() {

#if defined(__BIONIC__)

  return gettid();

#elif defined(__APPLE__)

  uint64_t tid;

  pthread_threadid_np(NULL, &tid);

  return tid;

#elif defined(__linux__)

  return syscall(__NR_gettid);

#elif defined(_WIN32)

  return GetCurrentThreadId();

#endif

}

#include <android-base/threads.h>



namespace {

#if defined(__GLIBC__)
@@ -223,8 +190,8 @@ void StderrLogger(LogId, LogSeverity severity, const char* tag, const char* file 
  static_assert(arraysize(log_characters) - 1 == FATAL + 1,

                "Mismatch in size of log_characters and values in LogSeverity");

  char severity_char = log_characters[severity];

  fprintf(stderr, "%s %c %s %5d %5d %s:%u] %s\n", tag ? tag : "nullptr", severity_char, timestamp,

          getpid(), GetThreadId(), file, line, message);

  fprintf(stderr, "%s %c %s %5d %5" PRIu64 " %s:%u] %s\n", tag ? tag : "nullptr", severity_char,

          timestamp, getpid(), GetThreadId(), file, line, message);

}



void DefaultAborter(const char* abort_message) {