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

Commit 8693bc7a authored by leozwang's avatar leozwang Committed by Leo Wang
Browse files

Add more debug information. 

Add socketpair debug log.
Also output thread information in log on host side.

Change-Id: I38168990d77e53eff69cb70f442cc4e7acb4b20f
parent 7f0076fa

adb/adb.h

+3 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ void put_apacket(apacket *p); 
int check_header(apacket *p);

int check_data(apacket *p);



// Define it if you want to dump packets.

#define DEBUG_PACKETS 0



#if !DEBUG_PACKETS

#define print_packet(tag,p) do {} while (0)

#endif

adb/adb_client.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int adb_connect(const char *service) 


    fd = _adb_connect(service);

    if(fd == -1) {

        D("_adb_connect error: %s\n", __adb_error);

        D("_adb_connect error: %s", __adb_error);

    } else if(fd == -2) {

        fprintf(stderr,"** daemon still not running\n");

    }

adb/adb_trace.h

+13 −11
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ void adb_trace_init(void); 
            if (ADB_TRACING) {                         \

                int save_errno = errno;                \

                adb_mutex_lock(&D_lock);               \

                fprintf(stderr, "%s::%s():",           \

                        __FILE__, __FUNCTION__);       \

                fprintf(stderr, "%16s: %5d:%5lu | ",   \

                        __FUNCTION__,                  \

                        getpid(), pthread_self());     \

                errno = save_errno;                    \

                fprintf(stderr, __VA_ARGS__ );         \

                fflush(stderr);                        \
@@ -98,8 +99,9 @@ void adb_trace_init(void); 
        do {                                           \

            int save_errno = errno;                    \

            adb_mutex_lock(&D_lock);                   \

          fprintf(stderr, "%s::%s():",                 \

                  __FILE__, __FUNCTION__);             \

            fprintf(stderr, "%16s: %5d:%5lu | ",       \

                    __FUNCTION__,                      \

                    getpid(), pthread_self());         \

            errno = save_errno;                        \

            fprintf(stderr, __VA_ARGS__ );             \

            fflush(stderr);                            \

adb/fdevent.c

+2 −0
Original line number Diff line number Diff line
@@ -661,6 +661,8 @@ void fdevent_subproc_setup() 
    if(adb_socketpair(s)) {

        FATAL("cannot create shell-exit socket-pair\n");

    }

    D("socketpair: (%d,%d)", s[0], s[1]);



    SHELL_EXIT_NOTIFY_FD = s[0];

    fdevent *fde;

    fde = fdevent_create(s[1], fdevent_subproc_event_func, NULL);

adb/jdwp_service.c

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ FoundIt: 
              __FUNCTION__, strerror(errno));

            return -1;

        }

        D("socketpair: (%d,%d)", fds[0], fds[1]);



        proc->out_fds[ proc->out_count ] = fds[1];

        if (++proc->out_count == 1)