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

Commit 538bc12c authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logcat: add hidden --debug flag and cleanup 

Allow us to debug corrupted log messages. Fix liblog to propagate
errors correctly and repair a gtest that failed.

Test: liblog-unit-tests --gtest_filter=liblog.__android_log_bswrite_and_print___max
      logcat -b events --debug -t 50
Bug: 32903864
Change-Id: Ib4eb9f466777cd23b8b54728d36354590d07869a
parent e631e470

liblog/logprint.c

+2 −1
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ LIBLOG_ABI_PUBLIC int android_log_processBinaryLogBuffer( 
        outRemaining--;

        /* pretend we ate all the data to prevent log stutter */

        inCount = 0;

        if (result > 0) result = 0;

    }



    /* eat the silly terminating '\n' */
@@ -1078,7 +1079,7 @@ LIBLOG_ABI_PUBLIC int android_log_processBinaryLogBuffer( 


    entry->message = messageBuf;



    return 0;

    return result;

}



/*

liblog/tests/liblog_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ static void bswrite_test(const char *message) { 
            EXPECT_TRUE(NULL != logformat);

            AndroidLogEntry entry;

            char msgBuf[1024];

            if (length != total) {

                fprintf(stderr, "Expect \"Binary log entry conversion failed\"\n");

            }

            int processBinaryLogBuffer = android_log_processBinaryLogBuffer(

                &log_msg.entry_v1, &entry, NULL, msgBuf, sizeof(msgBuf));

            EXPECT_EQ((length == total) ? 0 : -1, processBinaryLogBuffer);

logcat/logcat.cpp

+8 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static pcrecpp::RE* g_regex; 
static size_t g_maxCount;

static size_t g_printCount;

static bool g_printItAnyways;

static bool g_debug;



enum helpType {

    HELP_FALSE,
@@ -188,7 +189,7 @@ static void processBuffer(log_device_t* dev, struct log_msg *buf) 
    } else {

        err = android_log_processLogBuffer(&buf->entry_v1, &entry);

    }

    if (err < 0) {

    if ((err < 0) && !g_debug) {

        goto error;

    }
@@ -619,6 +620,7 @@ int main(int argc, char **argv) 
        int option_index = 0;

        // list of long-argument only strings for later comparison

        static const char pid_str[] = "pid";

        static const char debug_str[] = "debug";

        static const char id_str[] = "id";

        static const char wrap_str[] = "wrap";

        static const char print_str[] = "print";
@@ -627,6 +629,7 @@ int main(int argc, char **argv) 
          { "buffer",        required_argument, NULL,   'b' },

          { "buffer-size",   optional_argument, NULL,   'g' },

          { "clear",         no_argument,       NULL,   'c' },

          { debug_str,       no_argument,       NULL,   0 },

          { "dividers",      no_argument,       NULL,   'D' },

          { "file",          required_argument, NULL,   'f' },

          { "format",        required_argument, NULL,   'v' },
@@ -691,6 +694,10 @@ int main(int argc, char **argv) 
                    g_printItAnyways = true;

                    break;

                }

                if (long_options[option_index].name == debug_str) {

                    g_debug = true;

                    break;

                }

                if (long_options[option_index].name == id_str) {

                    setId = optarg && optarg[0] ? optarg : NULL;

                    break;