Skip to content

Automated Code Change #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
copybara-service wants to merge 1 commit into from
Closed

Automated Code Change #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cc/google/fhir/json_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ const std::unordered_map<std::string, const FieldDescriptor*>& GetFieldMap(
const intptr_t memo_key = reinterpret_cast<intptr_t>(descriptor);

{
absl::ReaderMutexLock reader_lock(&memos_mutex);
absl::ReaderMutexLock reader_lock(memos_mutex);
const auto iter = memos->find(memo_key);
if (iter != memos->end()) {
return *iter->second;
}
}

absl::MutexLock lock(&memos_mutex);
absl::MutexLock lock(memos_mutex);

// Check if anything created and wrote the new entry while we were waiting
// on the lock
Expand Down Expand Up @@ -176,7 +176,7 @@ absl::StatusOr<const FieldDescriptor*> GetContainedResourceField(
const std::string contained_resource_name(
contained_resource_desc->full_name());
{
absl::ReaderMutexLock reader_lock(&field_table_mutex);
absl::ReaderMutexLock reader_lock(field_table_mutex);
auto field_table_iter = field_table->find(contained_resource_name);
if (field_table_iter != field_table->end()) {
const FieldDescriptor* field = (*field_table_iter->second)[resource_type];
Expand All @@ -189,7 +189,7 @@ absl::StatusOr<const FieldDescriptor*> GetContainedResourceField(
}
}

absl::MutexLock lock(&field_table_mutex);
absl::MutexLock lock(field_table_mutex);
auto field_map = BuildResourceTypeMap(contained_resource_desc);
const FieldDescriptor* field = (*field_map)[resource_type];
(*field_table)[contained_resource_name] = std::move(field_map);
Expand Down
6 changes: 3 additions & 3 deletions cc/google/fhir/profiles_lib.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const bool SharesCommonAncestor(const ::google::protobuf::Descriptor* first,
const std::string& first_url = GetStructureDefinitionUrl(first);
const std::string& second_url = GetStructureDefinitionUrl(second);

absl::MutexLock lock(&memos_mutex);
absl::MutexLock lock(memos_mutex);
const auto& first_url_memo_entry = memos[first_url];
const auto& memo_entry = first_url_memo_entry.find(second_url);
if (memo_entry != first_url_memo_entry.end()) {
Expand Down Expand Up @@ -100,14 +100,14 @@ const std::unordered_map<std::string, const FieldDescriptor*> GetExtensionMap(
const intptr_t memo_key = (intptr_t)descriptor;

{
absl::ReaderMutexLock l(&memos_mutex);
absl::ReaderMutexLock l(memos_mutex);
const auto iter = memos->find(memo_key);
if (iter != memos->end()) {
return iter->second;
}
}

absl::MutexLock lock(&memos_mutex);
absl::MutexLock lock(memos_mutex);
auto& extension_map = (*memos)[memo_key];
for (int i = 0; i < descriptor->field_count(); i++) {
const FieldDescriptor* field = descriptor->field(i);
Expand Down