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

Commit b6dbe287 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a 

am: b13d0ce1

Change-Id: I2b6d0772a5e3db4b539db0c4facca583cabe92c1
parents a8dbadd5 b13d0ce1

include/log/logprint.h

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ extern "C" { 
#endif



typedef enum {

    /* Verbs */

    FORMAT_OFF = 0,

    FORMAT_BRIEF,

    FORMAT_PROCESS,
@@ -36,7 +37,7 @@ typedef enum { 
    FORMAT_TIME,

    FORMAT_THREADTIME,

    FORMAT_LONG,

    /* The following are modifiers to above formats */

    /* Adverbs. The following are modifiers to above format verbs */

    FORMAT_MODIFIER_COLOR,     /* converts priority to color */

    FORMAT_MODIFIER_TIME_USEC, /* switches from msec to usec time precision */

    FORMAT_MODIFIER_PRINTABLE, /* converts non-printable to printable escapes */

logcat/logcat.cpp

+4 −3
Original line number Diff line number Diff line
@@ -285,9 +285,10 @@ static void show_help(const char *cmd) 
                    "  -n <count>, --rotate-count=<count>\n"

                    "                  Sets max number of rotated logs to <count>, default 4\n"

                    "  -v <format>, --format=<format>\n"

                    "                  Sets the log print format, where <format> is:\n"

                    "                    brief color epoch long monotonic printable process raw\n"

                    "                    tag thread threadtime time uid usec UTC year zone\n"

                    "                  Sets log print format verb and adverbs, where <format> is:\n"

                    "                    brief long process raw tag thread theadtime time\n"

                    "                  and modifying adverbs can be:\n"

                    "                    color epoch monotonic printable uid usec UTC year zone\n"

                    "  -D, --dividers  Print dividers between each log buffer\n"

                    "  -c, --clear     Clear (flush) the entire log and exit\n"

                    "                  if Log to File specified, clear fileset instead\n"