crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
Mark Mentovai d5ddd14ee1 Improve map insertion operations.
Add MapInsertOrReplace<>() to insert a key-value pair into a map if the
key is not already present, or replace the existing value for key if the
key is present. The original value can optionally be returned to the
caller in this case.

Map insertions now use either MapInsertOrReplace<>() or
std::map<>::insert() directly.

Use MapInsertOrReplace<>() when the map should be updated to contain a
mapping from a key to a value regardless of whether the key is already
present.

Use std::map<>::insert() to insert a mapping from a key to a value
without replacing any existing mapping from a key, if present. If it is
important to know whether an existing mapping from a key was present,
use the returned std::pair<>.second. If it is important to know the
existing value, use the returned std::pair<>.first->second.

This change has a slight positive impact on performance.

TEST=crashpad_util_test MapInsert.MapInsertOrReplace and others
BUG=
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/1044273002
2015-03-31 14:29:32 -04:00

87 lines
2.5 KiB
C++

// Copyright 2015 The Crashpad Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "snapshot/minidump/minidump_simple_string_dictionary_reader.h"
#include <vector>
#include <utility>
#include "base/logging.h"
#include "minidump/minidump_extensions.h"
#include "snapshot/minidump/minidump_string_reader.h"
namespace crashpad {
namespace internal {
bool ReadMinidumpSimpleStringDictionary(
FileReaderInterface* file_reader,
const MINIDUMP_LOCATION_DESCRIPTOR& location,
std::map<std::string, std::string>* dictionary) {
if (location.Rva == 0) {
dictionary->clear();
return true;
}
if (location.DataSize < sizeof(MinidumpSimpleStringDictionary)) {
LOG(ERROR) << "simple_string_dictionary size mismatch";
return false;
}
if (!file_reader->SeekSet(location.Rva)) {
return false;
}
uint32_t entry_count;
if (!file_reader->ReadExactly(&entry_count, sizeof(entry_count))) {
return false;
}
if (location.DataSize !=
sizeof(MinidumpSimpleStringDictionary) +
entry_count * sizeof(MinidumpSimpleStringDictionaryEntry)) {
LOG(ERROR) << "simple_string_dictionary size mismatch";
return false;
}
std::vector<MinidumpSimpleStringDictionaryEntry> entries(entry_count);
if (!file_reader->ReadExactly(&entries[0],
entry_count * sizeof(entries[0]))) {
return false;
}
std::map<std::string, std::string> local_dictionary;
for (const MinidumpSimpleStringDictionaryEntry& entry : entries) {
std::string key;
if (!ReadMinidumpUTF8String(file_reader, entry.key, &key)) {
return false;
}
std::string value;
if (!ReadMinidumpUTF8String(file_reader, entry.value, &value)) {
return false;
}
if (!local_dictionary.insert(std::make_pair(key, value)).second) {
LOG(ERROR) << "duplicate key " << key;
return false;
}
}
dictionary->swap(local_dictionary);
return true;
}
} // namespace internal
} // namespace crashpad