Index: src/client/linux/handler/minidump_descriptor.h |
diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h |
index ed656cee937cabd484f5b3d5d22f8c91a4c660a9..3584c6922a34f885f7cf510e372fdce460a9cf27 100644 |
--- a/src/client/linux/handler/minidump_descriptor.h |
+++ b/src/client/linux/handler/minidump_descriptor.h |
@@ -51,14 +51,18 @@ class MinidumpDescriptor { |
MinidumpDescriptor() : mode_(kUninitialized), |
fd_(-1), |
- size_limit_(-1) {} |
+ size_limit_(-1), |
+ microdump_build_fingerprint_(NULL), |
+ microdump_product_info_(NULL) {} |
explicit MinidumpDescriptor(const string& directory) |
: mode_(kWriteMinidumpToFile), |
fd_(-1), |
directory_(directory), |
c_path_(NULL), |
- size_limit_(-1) { |
+ size_limit_(-1), |
+ microdump_build_fingerprint_(NULL), |
+ microdump_product_info_(NULL) { |
assert(!directory.empty()); |
} |
@@ -66,14 +70,18 @@ class MinidumpDescriptor { |
: mode_(kWriteMinidumpToFd), |
fd_(fd), |
c_path_(NULL), |
- size_limit_(-1) { |
+ size_limit_(-1), |
+ microdump_build_fingerprint_(NULL), |
+ microdump_product_info_(NULL) { |
assert(fd != -1); |
} |
explicit MinidumpDescriptor(const MicrodumpOnConsole&) |
: mode_(kWriteMicrodumpToConsole), |
fd_(-1), |
- size_limit_(-1) {} |
+ size_limit_(-1), |
+ microdump_build_fingerprint_(NULL), |
+ microdump_product_info_(NULL) {} |
explicit MinidumpDescriptor(const MinidumpDescriptor& descriptor); |
MinidumpDescriptor& operator=(const MinidumpDescriptor& descriptor); |
@@ -99,6 +107,18 @@ class MinidumpDescriptor { |
off_t size_limit() const { return size_limit_; } |
void set_size_limit(off_t limit) { size_limit_ = limit; } |
+ // TODO(primiano): make this and product info (below) just part of the |
+ // microdump ctor once it is rolled stably into Chrome. ETA: June 2015. |
+ void SetMicrodumpBuildFingerprint(const char* build_fingerprint); |
+ const char* microdump_build_fingerprint() const { |
+ return microdump_build_fingerprint_; |
+ } |
+ |
+ void SetMicrodumpProductInfo(const char* product_info); |
+ const char* microdump_product_info() const { |
+ return microdump_product_info_; |
+ } |
+ |
private: |
enum DumpMode { |
kUninitialized = 0, |
@@ -115,13 +135,25 @@ class MinidumpDescriptor { |
// The directory where the minidump should be generated. |
string directory_; |
+ |
// The full path to the generated minidump. |
string path_; |
+ |
// The C string of |path_|. Precomputed so it can be access from a compromised |
// context. |
const char* c_path_; |
off_t size_limit_; |
+ |
+ // The product name/version and build fingerprint that should be appended to |
+ // the dump (microdump only). Microdumps don't have the ability of appending |
+ // extra metadata after the dump is generated (as opposite to minidumps |
+ // MIME fields), therefore the product details must be provided upfront. |
+ // The string pointers are supposed to be valid through all the lifetime of |
+ // the process (read: the caller has to guarantee that they are stored in |
+ // global static storage). |
+ const char* microdump_build_fingerprint_; |
+ const char* microdump_product_info_; |
}; |
} // namespace google_breakpad |