diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
| commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
| tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/sql/sql_memory_dump_provider.cc | |
| parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
| download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz | |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/sql/sql_memory_dump_provider.cc')
| -rw-r--r-- | chromium/sql/sql_memory_dump_provider.cc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/chromium/sql/sql_memory_dump_provider.cc b/chromium/sql/sql_memory_dump_provider.cc index f59f811aee3..33e170c7f62 100644 --- a/chromium/sql/sql_memory_dump_provider.cc +++ b/chromium/sql/sql_memory_dump_provider.cc @@ -6,6 +6,8 @@ #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/process_memory_dump.h" +#include "sql/sqlite_result_code.h" +#include "sql/sqlite_result_code_values.h" #include "third_party/sqlite/sqlite3.h" namespace sql { @@ -26,10 +28,11 @@ bool SqlMemoryDumpProvider::OnMemoryDump( base::trace_event::ProcessMemoryDump* pmd) { sqlite3_int64 memory_used = 0; sqlite3_int64 memory_high_water = 0; - int status = sqlite3_status64(SQLITE_STATUS_MEMORY_USED, &memory_used, - &memory_high_water, /* resetFlag= */ 1); - if (status != SQLITE_OK) - return false; + auto sqlite_result_code = ToSqliteResultCode(sqlite3_status64( + SQLITE_STATUS_MEMORY_USED, &memory_used, &memory_high_water, + /*resetFlag=*/1)); + DCHECK_EQ(sqlite_result_code, SqliteResultCode::kOk) + << "sqlite3_status64(SQLITE_STATUS_MEMORY_USED) failed"; base::trace_event::MemoryAllocatorDump* dump = pmd->CreateAllocatorDump("sqlite"); @@ -42,13 +45,14 @@ bool SqlMemoryDumpProvider::OnMemoryDump( sqlite3_int64 dummy_high_water = -1; sqlite3_int64 malloc_count = -1; - status = sqlite3_status64(SQLITE_STATUS_MALLOC_COUNT, &malloc_count, - &dummy_high_water, /* resetFlag= */ 0); - if (status == SQLITE_OK) { - dump->AddScalar("malloc_count", - base::trace_event::MemoryAllocatorDump::kUnitsObjects, - malloc_count); - } + sqlite_result_code = ToSqliteResultCode(sqlite3_status64( + SQLITE_STATUS_MALLOC_COUNT, &malloc_count, &dummy_high_water, + /*resetFlag=*/0)); + DCHECK_EQ(sqlite_result_code, SqliteResultCode::kOk) + << "sqlite3_status64(SQLITE_STATUS_MALLOC_COUNT) failed"; + dump->AddScalar("malloc_count", + base::trace_event::MemoryAllocatorDump::kUnitsObjects, + malloc_count); const char* system_allocator_name = base::trace_event::MemoryDumpManager::GetInstance() |