From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 28 Mar 2019 02:23:52 +0000 (-0400)
Subject: common/buffer: hexdump should skip lines that are the same as previous
X-Git-Tag: v15.1.0~2945^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a87baa5e58ff13a0333e350d15525cb9b8a00600;p=ceph-ci.git

common/buffer: hexdump should skip lines that are the same as previous

Previously, it would only skip similar lines if the data was all zeroed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 071c385ea9f..0e9957a56f7 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -2082,26 +2082,38 @@ void buffer::list::hexdump(std::ostream &out, bool trailing_newline) const
   out.fill('0');
 
   unsigned per = 16;
-  bool was_zeros = false, did_star = false;
+  char last_row_char = '\0';
+  bool was_same = false, did_star = false;
   for (unsigned o=0; o<length(); o += per) {
+    if (o == 0) {
+      last_row_char = (*this)[o];
+    }
+
     if (o + per < length()) {
-      bool row_is_zeros = true;
+      bool row_is_same = true;
       for (unsigned i=0; i<per && o+i<length(); i++) {
-	if ((*this)[o+i]) {
-	  row_is_zeros = false;
+        char current_char = (*this)[o+i];
+        if (current_char != last_row_char) {
+          if (i == 0) {
+            last_row_char = current_char;
+            was_same = false;
+            did_star = false;
+          } else {
+	    row_is_same = false;
+          }
 	}
       }
-      if (row_is_zeros) {
-	if (was_zeros) {
+      if (row_is_same) {
+	if (was_same) {
 	  if (!did_star) {
 	    out << "\n*";
 	    did_star = true;
 	  }
 	  continue;
 	}
-	was_zeros = true;
+	was_same = true;
       } else {
-	was_zeros = false;
+	was_same = false;
 	did_star = false;
       }
     }