Skip to content

Commit

Permalink
Merge branch 'master' of github.com:systemed/tilemaker
Browse files Browse the repository at this point in the history
  • Loading branch information
systemed committed Mar 8, 2023
2 parents 3c4fdb8 + 653ffb8 commit 7b7c14b
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ add_executable(tilemaker vector_tile.pb.cc osmformat.pb.cc ${tilemaker_src_files
target_link_libraries(tilemaker ${PROTOBUF_LIBRARY} ${LIBSHP_LIBRARIES} ${SQLITE3_LIBRARIES} ${LUAJIT_LIBRARY} ${LUA_LIBRARIES} ${ZLIB_LIBRARY} ${THREAD_LIB} ${CMAKE_DL_LIBS}
Boost::system Boost::filesystem Boost::program_options Boost::iostreams)

include(CheckCxxAtomic)
if(NOT HAVE_CXX11_ATOMIC)
string(APPEND CMAKE_CXX_STANDARD_LIBRARIES
" ${LIBATOMIC_LINK_FLAGS}")
endif()

if(MSVC)
target_link_libraries(tilemaker unofficial::sqlite3::sqlite3)
endif()
Expand Down
66 changes: 66 additions & 0 deletions cmake/CheckCxxAtomic.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# some platforms do not offer support for atomic primitive for all integer
# types, in that case we need to link against libatomic

include(CheckCXXSourceCompiles)
include(CMakePushCheckState)


function(check_cxx_atomics var)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
check_cxx_source_compiles("
#include <atomic>
#include <cstdint>
#include <cstddef>
#if defined(__SIZEOF_INT128__)
// Boost needs 16-byte atomics for tagged pointers.
// These are implemented via inline instructions on the platform
// if 16-byte alignment can be proven, and are delegated to libatomic
// library routines otherwise. Whether or not alignment is provably
// OK for a std::atomic unfortunately depends on compiler version and
// optimization levels, and also on the details of the expression.
// We specifically test access via an otherwise unknown pointer here
// to ensure we get the most complex case. If this access can be
// done without libatomic, then all accesses can be done.
struct tagged_ptr {
int* ptr;
std::size_t tag;
};
void atomic16(std::atomic<tagged_ptr> *ptr)
{
tagged_ptr p{nullptr, 1};
ptr->store(p);
tagged_ptr f = ptr->load();
tagged_ptr new_tag{nullptr, 0};
ptr->compare_exchange_strong(f, new_tag);
}
#endif
int main() {
#if defined(__SIZEOF_INT128__)
std::atomic<tagged_ptr> ptr;
atomic16(&ptr);
#endif
std::atomic<uint8_t> w1;
std::atomic<uint16_t> w2;
std::atomic<uint32_t> w4;
std::atomic<uint64_t> w8;
return w1 + w2 + w4 + w8;
}
" ${var})
endfunction(check_cxx_atomics)

cmake_push_check_state()
check_cxx_atomics(HAVE_CXX11_ATOMIC)
cmake_pop_check_state()

if(NOT HAVE_CXX11_ATOMIC)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES "atomic")
check_cxx_atomics(HAVE_LIBATOMIC)
cmake_pop_check_state()
if(HAVE_LIBATOMIC)
set(LIBATOMIC_LINK_FLAGS "-latomic")
else()
message(FATAL_ERROR
"Host compiler ${CMAKE_CXX_COMPILER} requires libatomic, but it is not found")
endif()
endif()
2 changes: 1 addition & 1 deletion src/osm_lua_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ void OsmLuaProcessing::LayerAsCentroid(const string &layerName) {
cout << "Couldn't find " << (isRelation ? "relation " : isWay ? "way " : "node " ) << originalOsmID << ": " << err.what() << endl;
return;
} catch (geom::centroid_exception &err) {
cerr << "Problem geometry " << (isRelation ? "relation " : isWay ? "way " : "node " ) << originalOsmID << ": " << err.what() << endl;
if (verbose) cerr << "Problem geometry " << (isRelation ? "relation " : isWay ? "way " : "node " ) << originalOsmID << ": " << err.what() << endl;
return;
} catch (std::invalid_argument &err) {
cerr << "Error in OutputObjectOsmStore constructor for " << (isRelation ? "relation " : isWay ? "way " : "node " ) << originalOsmID << ": " << err.what() << endl;
Expand Down

0 comments on commit 7b7c14b

Please sign in to comment.