sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Declare proj_cache_ thread_local static to allow mapnik::Map to be thread-safe under certain conditions + refactor

Browse source 
(benchmark/src/test_rendering_shared_map.cpp)
This commit is contained in:
Artem Pavlenko 2021-03-18 16:05:58 +00:00
parent ebbd544d75
commit 6b9b42f314
2 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/map.hpp
View file

@ -131,7 +131,7 @@ private:
boost::optional<std::string> font_directory_; boost::optional<std::string> font_directory_;
freetype_engine::font_file_mapping_type font_file_mapping_; freetype_engine::font_file_mapping_type font_file_mapping_;
freetype_engine::font_memory_cache_type font_memory_cache_; freetype_engine::font_memory_cache_type font_memory_cache_;
mutable proj_cache_type proj_cache_; thread_local static proj_cache_type proj_cache_;
public: public:
using const_style_iterator = std::map<std::string,feature_type_style>::const_iterator; using const_style_iterator = std::map<std::string,feature_type_style>::const_iterator;
@ -534,6 +534,7 @@ public:
private: private:
friend void swap(Map & rhs, Map & lhs); friend void swap(Map & rhs, Map & lhs);
void fixAspectRatio(); void fixAspectRatio();
void init_proj_transform(std::string const& source, std::string const& dest);
void init_proj_transforms(); void init_proj_transforms();
}; };

58
src/map.cpp
View file

@ -111,8 +111,7 @@ Map::Map(Map const& rhs)
font_directory_(rhs.font_directory_), font_directory_(rhs.font_directory_),
font_file_mapping_(rhs.font_file_mapping_), font_file_mapping_(rhs.font_file_mapping_),
// on copy discard memory caches // on copy discard memory caches
font_memory_cache_(), font_memory_cache_()
proj_cache_()
{ {
init_proj_transforms(); init_proj_transforms();
} }
@ -137,11 +136,12 @@ Map::Map(Map && rhs)
extra_params_(std::move(rhs.extra_params_)), extra_params_(std::move(rhs.extra_params_)),
font_directory_(std::move(rhs.font_directory_)), font_directory_(std::move(rhs.font_directory_)),
font_file_mapping_(std::move(rhs.font_file_mapping_)), font_file_mapping_(std::move(rhs.font_file_mapping_)),
font_memory_cache_(std::move(rhs.font_memory_cache_)), font_memory_cache_(std::move(rhs.font_memory_cache_)) {}
proj_cache_(std::move(rhs.proj_cache_)) {}
Map::~Map() {} Map::~Map() {}
thread_local Map::proj_cache_type Map::proj_cache_ = proj_cache_type();
Map& Map::operator=(Map rhs) Map& Map::operator=(Map rhs)
{ {
swap(*this, rhs); swap(*this, rhs);
@ -329,6 +329,7 @@ size_t Map::layer_count() const
proj_transform * Map::get_proj_transform(std::string const& source, std::string const& dest) const proj_transform * Map::get_proj_transform(std::string const& source, std::string const& dest) const
{ {
compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(source, dest); compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(source, dest);
auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{}); auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{});
if (itr == proj_cache_.end()) if (itr == proj_cache_.end())
@ -343,29 +344,13 @@ proj_transform * Map::get_proj_transform(std::string const& source, std::string
void Map::add_layer(layer const& l) void Map::add_layer(layer const& l)
{ {
compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(srs_, l.srs()); init_proj_transform(srs_, l.srs());
auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{});
if (itr == proj_cache_.end())
{
mapnik::projection source(srs_, true);
mapnik::projection dest(l.srs(), true);
proj_cache_.emplace(std::make_pair(srs_, l.srs()),
std::make_unique<proj_transform>(source, dest));
}
layers_.emplace_back(l); layers_.emplace_back(l);
} }
void Map::add_layer(layer && l) void Map::add_layer(layer && l)
{ {
compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(srs_, l.srs()); init_proj_transform(srs_, l.srs());
auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{});
if (itr == proj_cache_.end())
{
mapnik::projection source(srs_, true);
mapnik::projection dest(l.srs(), true);
proj_cache_.emplace(make_pair(srs_, l.srs()),
std::make_unique<proj_transform>(source, dest));
}
layers_.push_back(std::move(l)); layers_.push_back(std::move(l));
} }
@ -458,8 +443,9 @@ std::string const& Map::srs() const
void Map::set_srs(std::string const& _srs) void Map::set_srs(std::string const& _srs)
{ {
if (srs_ != _srs) init_proj_transforms();
srs_ = _srs; srs_ = _srs;
init_proj_transforms();
} }
void Map::set_buffer_size(int _buffer_size) void Map::set_buffer_size(int _buffer_size)
@ -808,20 +794,28 @@ void Map::set_extra_parameters(parameters& params)
extra_params_ = params; extra_params_ = params;
} }
void Map::init_proj_transforms()
void Map::init_proj_transform(std::string const& source, std::string const& dest)
{ {
for (auto const& l : layers_) compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(source, dest);
{
compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(srs_, l.srs());
auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{}); auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{});
if (itr == proj_cache_.end()) if (itr == proj_cache_.end())
{ {
mapnik::projection source(srs_, true); mapnik::projection p0(source, true);
mapnik::projection dest(l.srs(), true); mapnik::projection p1(dest, true);
proj_cache_.emplace(std::make_pair(srs_, l.srs()), proj_cache_.emplace(std::make_pair(source, dest),
std::make_unique<proj_transform>(source, dest)); std::make_unique<proj_transform>(p0, p1));
}
} }
} }
void Map::init_proj_transforms()
{
std::for_each(layers_.begin(),
layers_.end(),
[this] (auto const& l)
{
init_proj_transform(srs_, l.srs());
});
}
} }