archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mapnik-geometry

Browse Source
This commit is contained in:
artemp 2015-02-24 09:30:02 +01:00
commit ab151a095e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugin.cpp
View File

@ -80,7 +80,21 @@ PluginInfo::~PluginInfo()
if (module_)
{
#ifdef MAPNIK_SUPPORTS_DLOPEN
if (module_->dl) dlclose(module_->dl),module_->dl=0;
/*
We do not call dlclose for plugins that link libgdal.
This is a terrible hack, but necessary to prevent crashes
at exit when gdal attempts to shutdown. The problem arises
when Mapnik is used with another library that uses thread-local
storage (like libuv). In this case GDAL also tries to cleanup thread
local storage and leaves things in a state that causes libuv to crash.
This is partially fixed by http://trac.osgeo.org/gdal/ticket/5509 but only
in the case that gdal is linked as a shared library. This workaround therefore
prevents crashes with gdal 1.11.x and gdal 2.x when using a static libgdal.
*/
if (module_->dl && name_ != "gdal" && name_ != "ogr")
{
dlclose(module_->dl),module_->dl=0;
}
#endif
delete module_;
}