Skip to content

Optimise locking when storing types per key #913

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

Open
systemed wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

Optimise locking when storing types per key #913

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
13 changes: 11 additions & 2 deletions src/osm_lua_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <iostream>
#include <unordered_set>

#include "osm_lua_processing.h"
#include "attribute_store.h"
Expand All @@ -17,7 +18,7 @@ const std::string EMPTY_STRING = "";
thread_local kaguya::State *g_luaState = nullptr;
thread_local OsmLuaProcessing* osmLuaProcessing = nullptr;

std::mutex vectorLayerMetadataMutex;
std::deque<std::mutex> vectorLayerMetadataMutexes;
std::unordered_map<std::string, std::string> OsmLuaProcessing::dataStore;
std::mutex OsmLuaProcessing::dataStoreMutex;

Expand Down Expand Up @@ -241,6 +242,9 @@ OsmLuaProcessing::OsmLuaProcessing(
materializeGeometries(materializeGeometries) {

sigusr1Handler.initialize();
if (vectorLayerMetadataMutexes.size() <= layers.layers.size()) {
vectorLayerMetadataMutexes.resize(layers.layers.size() + 1);
}

// ---- Initialise Lua
g_luaState = &luaState;
Expand Down Expand Up @@ -1031,9 +1035,14 @@ std::string OsmLuaProcessing::FindInRelation(const std::string &key) {
}

// Record attribute name/type for vector_layers table
thread_local std::vector<std::unordered_set<std::string>> alreadySeen;

void OsmLuaProcessing::setVectorLayerMetadata(const uint_least8_t layer, const string &key, const uint type) {
std::lock_guard<std::mutex> lock(vectorLayerMetadataMutex);
if (alreadySeen.size() <= layer) alreadySeen.resize(layer + 1);
if (alreadySeen[layer].count(key)) return;
std::lock_guard<std::mutex> lock(vectorLayerMetadataMutexes[layer]);
layers.layers[layer].attributeMap[key] = type;
alreadySeen[layer].insert(key);
}

// Scan relation (but don't write geometry)
Expand Down
Loading