commit 8ec93fa0d03579b3271b08a1542daea2957af734
author Yuly Novikov <ynovikov@chromium.org> Thu Jul 18 20:31:47 2013 -0400
committer ChromeBot <chrome-bot@google.com> Fri Jul 19 18:01:56 2013 -0700
tree ae44d1991179b12ff61090d514f21fde5f7ebf45
parent 9c9e1c43d3008ce3310f75df243863b03658dc63

crash_collector: Handle compressed i915_error_state for chrome crashes

i915_error_state was previously truncated by debugd,
and will be compressed in the future to prevent that.

Because of compression, it will now be received in base64 format,
so to reduce it's size, decode it back.

Also, use xz compression, since it's more compact.
The second compression is a preparation for adding task states to the logs.

BUG=chromium:219121
TEST=Kill chrome, see the log gathered. Uploaded report id 5e5a6f9bf6ff4b5f.

Change-Id: I316cdaef8f8f42d4ac839f7c880960cdf6d7a1e8
Reviewed-on: https://gerrit.chromium.org/gerrit/62568
Reviewed-by: Albert Chaulk <achaulk@chromium.org>
Tested-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

crash_reporter/chrome_collector.cc

diff --git a/crash_reporter/chrome_collector.cc b/crash_reporter/chrome_collector.cc
index 8f5ddb3..4b0cd24 100644
--- a/crash_reporter/chrome_collector.cc
+++ b/crash_reporter/chrome_collector.cc
@@ -4,6 +4,7 @@
 
 #include "crash-reporter/chrome_collector.h"
 
+#include <glib.h>
 #include <pcrecpp.h>
 #include <string>
 #include <vector>
@@ -54,14 +55,26 @@
   std::string error_state_str(error_state);
   g_free(error_state);
 
-  if(error_state_str == "<empty>")
+  if (error_state_str == "<empty>")
     return false;
 
-  int written;
-  written = file_util::WriteFile(error_state_path, error_state_str.c_str(),
-                                 error_state_str.length());
+  const char kBase64Header[] = "<base64>: ";
+  const size_t kBase64HeaderLength = sizeof(kBase64Header) - 1;
+  if (error_state_str.compare(0, kBase64HeaderLength, kBase64Header)) {
+    LOG(ERROR) << "i915_error_state is missing base64 header";
+    return false;
+  }
 
-  if (written < 0 || (size_t)written != error_state_str.length()) {
+  gsize len;
+  guchar *decoded_error_state =
+      g_base64_decode(error_state_str.c_str() + kBase64HeaderLength, &len);
+
+  int written;
+  written = file_util::WriteFile(error_state_path,
+      reinterpret_cast<const char*>(decoded_error_state), len);
+  g_free(decoded_error_state);
+
+  if (written < 0 || (gsize)written != len) {
     LOG(ERROR) << "Could not write file " << error_state_path.value();
     file_util::Delete(error_state_path, false);
     return false;
@@ -87,13 +100,14 @@
     return false;
   }
 
-  FilePath error_state_path = log_path.DirName().Append("i915_error_state.log");
+  FilePath error_state_path =
+      log_path.DirName().Append("i915_error_state.log.xz");
   if (!GetDriErrorState(proxy, error_state_path))
     return false;
 
   chromeos::ProcessImpl tar_process;
   tar_process.AddArg(kTarPath);
-  tar_process.AddArg("cfz");
+  tar_process.AddArg("cfJ");
   tar_process.AddArg(log_path.value());
   tar_process.AddStringOption("-C", log_path.DirName().value());
   tar_process.AddArg(error_state_path.BaseName().value());
@@ -138,7 +152,7 @@
   std::string dump_basename = FormatDumpBasename(exe_name, time(NULL), pid);
   FilePath meta_path = GetCrashPath(dir, dump_basename, "meta");
   FilePath minidump_path = GetCrashPath(dir, dump_basename, "dmp");
-  FilePath log_path = GetCrashPath(dir, dump_basename, "log.tgz");
+  FilePath log_path = GetCrashPath(dir, dump_basename, "log.tar.xz");
 
   std::string data;
   if (!file_util::ReadFileToString(FilePath(file_path), &data)) {