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

Commit aed3c61c authored by Yabin Cui's avatar Yabin Cui
Browse files

Adb: use VLOG() to replace D() for verbose logging. 

As there are too many D(), we can keep both VLOG() and D() now, and get
rid of D() gradually.

Change-Id: I2f1cb70bcab3e82c99fed939341d03f6b2216076
parent 65744003

adb/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ LIBADB_SRC_FILES := \ 
    adb_auth.cpp \

    adb_io.cpp \

    adb_listeners.cpp \

    adb_trace.cpp \

    adb_utils.cpp \

    sockets.cpp \

    transport.cpp \

adb/adb.cpp

+1 −140
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_ADB

#define TRACE_TAG ADB



#include "sysdeps.h"

#include "adb.h"
@@ -32,7 +32,6 @@ 


#include <string>

#include <vector>

#include <unordered_map>



#include <base/logging.h>

#include <base/macros.h>
@@ -53,22 +52,6 @@ 
#include <sys/mount.h>

#endif



#if !ADB_HOST

const char* adb_device_banner = "device";

static android::base::LogdLogger gLogdLogger;

#else

const char* adb_device_banner = "host";

#endif



void AdbLogger(android::base::LogId id, android::base::LogSeverity severity,

               const char* tag, const char* file, unsigned int line,

               const char* message) {

    android::base::StderrLogger(id, severity, tag, file, line, message);

#if !ADB_HOST

    gLogdLogger(id, severity, tag, file, line, message);

#endif

}



std::string adb_version() {

    // Don't change the format of this --- it's parsed by ddmlib.

    return android::base::StringPrintf("Android Debug Bridge version %d.%d.%d\n"
@@ -97,128 +80,6 @@ void fatal_errno(const char* fmt, ...) { 
    exit(-1);

}



#if !ADB_HOST

static std::string get_log_file_name() {

    struct tm now;

    time_t t;

    tzset();

    time(&t);

    localtime_r(&t, &now);



    char timestamp[PATH_MAX];

    strftime(timestamp, sizeof(timestamp), "%Y-%m-%d-%H-%M-%S", &now);



    return android::base::StringPrintf("/data/adb/adb-%s-%d", timestamp,

                                       getpid());

}



void start_device_log(void) {

    int fd = unix_open(get_log_file_name().c_str(),

                       O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0640);

    if (fd == -1) {

        return;

    }



    // Redirect stdout and stderr to the log file.

    dup2(fd, STDOUT_FILENO);

    dup2(fd, STDERR_FILENO);

    fprintf(stderr, "--- adb starting (pid %d) ---\n", getpid());

    unix_close(fd);

}

#endif



int adb_trace_mask;



std::string get_trace_setting_from_env() {

    const char* setting = getenv("ADB_TRACE");

    if (setting == nullptr) {

        setting = "";

    }



    return std::string(setting);

}



#if !ADB_HOST

std::string get_trace_setting_from_prop() {

    char buf[PROPERTY_VALUE_MAX];

    property_get("persist.adb.trace_mask", buf, "");

    return std::string(buf);

}

#endif



std::string get_trace_setting() {

#if ADB_HOST

    return get_trace_setting_from_env();

#else

    return get_trace_setting_from_prop();

#endif

}



// Split the space separated list of tags from the trace setting and build the

// trace mask from it. note that '1' and 'all' are special cases to enable all

// tracing.

//

// adb's trace setting comes from the ADB_TRACE environment variable, whereas

// adbd's comes from the system property persist.adb.trace_mask.

static void setup_trace_mask() {

    const std::string trace_setting = get_trace_setting();

    if (trace_setting.empty()) {

        return;

    }



    std::unordered_map<std::string, int> trace_flags = {

        {"1", 0},

        {"all", 0},

        {"adb", TRACE_ADB},

        {"sockets", TRACE_SOCKETS},

        {"packets", TRACE_PACKETS},

        {"rwx", TRACE_RWX},

        {"usb", TRACE_USB},

        {"sync", TRACE_SYNC},

        {"sysdeps", TRACE_SYSDEPS},

        {"transport", TRACE_TRANSPORT},

        {"jdwp", TRACE_JDWP},

        {"services", TRACE_SERVICES},

        {"auth", TRACE_AUTH},

        {"fdevent", TRACE_FDEVENT},

        {"shell", TRACE_SHELL}};



    std::vector<std::string> elements = android::base::Split(trace_setting, " ");

    for (const auto& elem : elements) {

        const auto& flag = trace_flags.find(elem);

        if (flag == trace_flags.end()) {

            D("Unknown trace flag: %s", elem.c_str());

            continue;

        }



        if (flag->second == 0) {

            // 0 is used for the special values "1" and "all" that enable all

            // tracing.

            adb_trace_mask = ~0;

            return;

        } else {

            adb_trace_mask |= 1 << flag->second;

        }

    }

}



void adb_trace_init(char** argv) {

#if !ADB_HOST

    // Don't open log file if no tracing, since this will block

    // the crypto unmount of /data

    if (!get_trace_setting().empty()) {

        if (isatty(STDOUT_FILENO) == 0) {

            start_device_log();

        }

    }

#endif



    setup_trace_mask();

    android::base::InitLogging(argv, AdbLogger);



    D("%s", adb_version().c_str());

}



apacket* get_apacket(void)

{

    apacket* p = reinterpret_cast<apacket*>(malloc(sizeof(apacket)));

adb/adb_auth.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_ADB

#define TRACE_TAG ADB



#include "sysdeps.h"

#include "adb_auth.h"

adb/adb_auth_client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_AUTH

#define TRACE_TAG AUTH



#include "sysdeps.h"

#include "adb_auth.h"

adb/adb_auth_host.cpp

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define TRACE_TAG TRACE_AUTH

#define TRACE_TAG AUTH



#include "sysdeps.h"

#include "adb_auth.h"
@@ -452,7 +452,6 @@ int adb_auth_get_userkey(unsigned char *data, size_t len) 
}



int adb_auth_keygen(const char* filename) {

    adb_trace_mask |= (1 << TRACE_AUTH);

    return (generate_key(filename) == 0);

}