commit f34f18e0a177b6a7126da4e3d15b9cc87d83cc6d
author Daniel Rosenberg <drosen@google.com> Fri Aug 27 15:31:43 2021 -0700
committer Daniel Rosenberg <drosen@google.com> Fri Aug 27 15:40:53 2021 -0700
tree a3334e2428b3086795327a95ebfadf8bfc3e16d8
parent 2ed2f814fa5feaedda4e80f1d0e34048678d5159

inspect_cow: Add -o to view Sequence Data

This allows inspecting sequence op data while viewing cow ops. Data will
be displayed per op.

Test: inspect_cow -o [CowFile]
Change-Id: I0029838ddc265c1aaeba2bbfa70241dea0b8ff20

fs_mgr/libsnapshot/inspect_cow.cpp

diff --git a/fs_mgr/libsnapshot/inspect_cow.cpp b/fs_mgr/libsnapshot/inspect_cow.cpp
index ed86c87..0adeb83 100644
--- a/fs_mgr/libsnapshot/inspect_cow.cpp
+++ b/fs_mgr/libsnapshot/inspect_cow.cpp
@@ -16,8 +16,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <iomanip>
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include <android-base/logging.h>
 #include <android-base/unique_fd.h>
@@ -39,8 +41,9 @@
     LOG(ERROR) << "Usage: inspect_cow [-sd] <COW_FILE>";
     LOG(ERROR) << "\t -s Run Silent";
     LOG(ERROR) << "\t -d Attempt to decompress";
-    LOG(ERROR) << "\t -b Show data for failed decompress\n";
-    LOG(ERROR) << "\t -m Show ops in reverse merge order\n";
+    LOG(ERROR) << "\t -b Show data for failed decompress";
+    LOG(ERROR) << "\t -m Show ops in reverse merge order";
+    LOG(ERROR) << "\t -o Shows sequence op block order\n";
 }
 
 enum OpIter { Normal, RevMerge };
@@ -49,6 +52,7 @@
     bool silent;
     bool decompress;
     bool show_bad;
+    bool show_seq;
     OpIter iter_type;
 };
 
@@ -148,6 +152,24 @@
             sink.Reset();
         }
 
+        if (op.type == kCowSequenceOp && opt.show_seq) {
+            size_t read;
+            std::vector<uint32_t> merge_op_blocks;
+            size_t seq_len = op.data_length / sizeof(uint32_t);
+            merge_op_blocks.resize(seq_len);
+            if (!reader.GetRawBytes(op.source, merge_op_blocks.data(), op.data_length, &read)) {
+                PLOG(ERROR) << "Failed to read sequence op!";
+                return false;
+            }
+            if (!opt.silent) {
+                std::cout << "Sequence for " << op << " is :\n";
+                for (size_t i = 0; i < seq_len; i++) {
+                    std::cout << std::setfill('0') << std::setw(6) << merge_op_blocks[i] << ", ";
+                    if ((i + 1) % 10 == 0 || i + 1 == seq_len) std::cout << "\n";
+                }
+            }
+        }
+
         iter->Next();
     }
 
@@ -164,7 +186,7 @@
     opt.decompress = false;
     opt.show_bad = false;
     opt.iter_type = android::snapshot::Normal;
-    while ((ch = getopt(argc, argv, "sdbm")) != -1) {
+    while ((ch = getopt(argc, argv, "sdbmo")) != -1) {
         switch (ch) {
             case 's':
                 opt.silent = true;
@@ -178,6 +200,9 @@
             case 'm':
                 opt.iter_type = android::snapshot::RevMerge;
                 break;
+            case 'o':
+                opt.show_seq = true;
+                break;
             default:
                 android::snapshot::usage();
         }