3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an implicit 64-bit to 32-bit conversion.

Browse Source 
../../third_party/crashpad/crashpad/util/misc/metrics.cc(66,35):  error: implicit conversion loses integer precision: 'crashpad::FileOffset' (aka 'long long') to 'base::HistogramBase::Sample' (aka 'int') [-Werror,-Wshorten-64-to-32]
      "Crashpad.CrashReportSize", size, 0, 20 * 1024 * 1024, 50);
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Also, remove some unneeded static_casts.

BUG=588506

Change-Id: I0c12079db173e44c07e2f1d02322747cb2d69535
Reviewed-on: https://chromium-review.googlesource.com/1184227
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Will Harris 2018-08-22 10:23:24 -07:00 committed by Commit Bot
parent 7198015c73
commit 2c6c0935e2
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
util/misc/metrics.cc
View File

@ -16,6 +16,7 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "build/build_config.h"
#if defined(OS_MACOSX)
@ -55,43 +56,40 @@ void ExceptionProcessing(ExceptionProcessingState state) {
// static
void Metrics::CrashReportPending(PendingReportReason reason) {
UMA_HISTOGRAM_ENUMERATION(
"Crashpad.CrashReportPending",
static_cast<int32_t>(reason),
static_cast<int32_t>(PendingReportReason::kMaxValue));
"Crashpad.CrashReportPending", reason, PendingReportReason::kMaxValue);
}
// static
void Metrics::CrashReportSize(FileOffset size) {
UMA_HISTOGRAM_CUSTOM_COUNTS(
"Crashpad.CrashReportSize", size, 0, 20 * 1024 * 1024, 50);
UMA_HISTOGRAM_CUSTOM_COUNTS("Crashpad.CrashReportSize",
base::saturated_cast<uint32_t>(size),
0,
20 * 1024 * 1024,
50);
}
// static
void Metrics::CrashUploadAttempted(bool successful) {
UMA_HISTOGRAM_COUNTS("Crashpad.CrashUpload.AttemptSuccessful",
static_cast<int32_t>(successful));
UMA_HISTOGRAM_COUNTS("Crashpad.CrashUpload.AttemptSuccessful", successful);
}
// static
void Metrics::CrashUploadSkipped(CrashSkippedReason reason) {
UMA_HISTOGRAM_ENUMERATION(
"Crashpad.CrashUpload.Skipped",
static_cast<int32_t>(reason),
static_cast<int32_t>(CrashSkippedReason::kMaxValue));
"Crashpad.CrashUpload.Skipped", reason, CrashSkippedReason::kMaxValue);
}
// static
void Metrics::ExceptionCaptureResult(CaptureResult result) {
ExceptionProcessing(ExceptionProcessingState::kFinished);
UMA_HISTOGRAM_ENUMERATION("Crashpad.ExceptionCaptureResult",
static_cast<int32_t>(result),
static_cast<int32_t>(CaptureResult::kMaxValue));
UMA_HISTOGRAM_ENUMERATION(
"Crashpad.ExceptionCaptureResult", result, CaptureResult::kMaxValue);
}
// static
void Metrics::ExceptionCode(uint32_t exception_code) {
base::UmaHistogramSparse("Crashpad.ExceptionCode." METRICS_OS_NAME,
static_cast<int32_t>(exception_code));
exception_code);
}
// static
@ -102,15 +100,14 @@ void Metrics::ExceptionEncountered() {
// static
void Metrics::HandlerLifetimeMilestone(LifetimeMilestone milestone) {
UMA_HISTOGRAM_ENUMERATION("Crashpad.HandlerLifetimeMilestone",
static_cast<int32_t>(milestone),
static_cast<int32_t>(LifetimeMilestone::kMaxValue));
milestone,
LifetimeMilestone::kMaxValue);
}
// static
void Metrics::HandlerCrashed(uint32_t exception_code) {
base::UmaHistogramSparse(
"Crashpad.HandlerCrash.ExceptionCode." METRICS_OS_NAME,
static_cast<int32_t>(exception_code));
"Crashpad.HandlerCrash.ExceptionCode." METRICS_OS_NAME, exception_code);
}
} // namespace crashpad