commit dde42d98702e0e29bad31c258bf93fc44ebdaa1d
author Elliott Hughes <enh@google.com> Thu Dec 07 23:57:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 23:57:35 2023 +0000
tree 6ee16a8cd17473069ca989cb41398f7f7084f07d
parent 0e34614378211363ebc0d1a0193c308bd8e745e9
parent b1af154e40fa4c5da3a2eced7504c8e075e1fa57

Merge "Revert "logcat: remove the -S option."" into main

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index e7a8f0f..c8fcf46 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -425,6 +425,8 @@
       within AID_SYSTEM when AID_SYSTEM is the noisiest UID.
   -P, --prune='LIST ...'
       Set prune rules, using same format as listed above. Must be quoted.
+  -S, --statistics
+      Output statistics. With --pid provides pid-specific stats.
 
   Filtering:
 
@@ -614,6 +616,7 @@
             false;  // Do not report errors on the security buffer unless it is explicitly named.
     bool getLogSize = false;
     bool getPruneList = false;
+    bool printStatistics = false;
     unsigned long setLogSize = 0;
     const char* setPruneList = nullptr;
     const char* setId = nullptr;
@@ -671,6 +674,7 @@
           { "regex",         required_argument, nullptr, 'e' },
           { "rotate-count",  required_argument, nullptr, 'n' },
           { "rotate-kbytes", required_argument, nullptr, 'r' },
+          { "statistics",    no_argument,       nullptr, 'S' },
           // hidden and undocumented reserved alias for -t
           { "tail",          required_argument, nullptr, 't' },
           { uid_str,         required_argument, nullptr, 0 },
@@ -872,6 +876,10 @@
                 }
                 break;
 
+            case 'S':
+                printStatistics = true;
+                break;
+
             case ':':
                 error(EXIT_FAILURE, 0, "Option '%s' needs an argument.", argv[optind - 1]);
                 break;
@@ -973,8 +981,8 @@
     }
 
     if (mode & ANDROID_LOG_PSTORE) {
-        if (setLogSize || getLogSize || getPruneList || setPruneList) {
-            error(EXIT_FAILURE, 0, "-L is incompatible with -g/-G and -p/-P.");
+        if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) {
+            error(EXIT_FAILURE, 0, "-L is incompatible with -g/-G, -S, and -p/-P.");
         }
         if (clearLog) {
             if (output_file_name_) {
@@ -986,8 +994,8 @@
     }
 
     if (output_file_name_) {
-        if (setLogSize || getLogSize || getPruneList || setPruneList) {
-            error(EXIT_FAILURE, 0, "-f is incompatible with -g/-G and -p/-P.");
+        if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) {
+            error(EXIT_FAILURE, 0, "-f is incompatible with -g/-G, -S, and -p/-P.");
         }
 
         if (clearLog || setId) {
@@ -1101,13 +1109,17 @@
         return EXIT_SUCCESS;
     }
 
-    if (getPruneList) {
+    if (printStatistics || getPruneList) {
         std::string buf(8192, '\0');
-        int retry = 32;
         size_t ret_length = 0;
+        int retry = 32;
 
         for (; retry >= 0; --retry) {
-            android_logger_get_prune_list(logger_list.get(), buf.data(), buf.size());
+            if (getPruneList) {
+                android_logger_get_prune_list(logger_list.get(), buf.data(), buf.size());
+            } else {
+                android_logger_get_statistics(logger_list.get(), buf.data(), buf.size());
+            }
 
             ret_length = atol(buf.c_str());
             if (ret_length < 3) {