BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add another very awful workaround to prevent a crash on Mingw32

Browse Source 
This appears to be the same issue as 70df3d54f37c280f7afe60f6e964b8406577f39f.
Hopefully the next MinGW update will remove the need for this.
This commit is contained in:
sfan5 2022-01-30 22:44:29 +01:00
parent 5e4a01f2de
commit 484a4b518f
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/serialization.cpp
View File

@ -208,11 +208,31 @@ struct ZSTD_Deleter {
} }
}; };
#if defined(__MINGW32__) && !defined(__MINGW64__)
/*
* This is exactly as dumb as it looks.
* Yes, this is a memory leak. No, we don't have better solution right now.
*/
template<typename T> class leaky_ptr
{
T *value;
public:
leaky_ptr(T *value) : value(value) {};
T *get() { return value; }
};
#endif
void compressZstd(const u8 *data, size_t data_size, std::ostream &os, int level) void compressZstd(const u8 *data, size_t data_size, std::ostream &os, int level)
{ {
#if defined(__MINGW32__) && !defined(__MINGW64__)
// leaks one context per thread but doesn't crash :shrug:
thread_local leaky_ptr<ZSTD_CStream> stream(ZSTD_createCStream());
#else
// reusing the context is recommended for performance // reusing the context is recommended for performance
// it will destroyed when the thread ends // it will destroyed when the thread ends
thread_local std::unique_ptr<ZSTD_CStream, ZSTD_Deleter> stream(ZSTD_createCStream()); thread_local std::unique_ptr<ZSTD_CStream, ZSTD_Deleter> stream(ZSTD_createCStream());
#endif
ZSTD_initCStream(stream.get(), level); ZSTD_initCStream(stream.get(), level);
@ -256,9 +276,14 @@ void compressZstd(const std::string &data, std::ostream &os, int level)
void decompressZstd(std::istream &is, std::ostream &os) void decompressZstd(std::istream &is, std::ostream &os)
{ {
#if defined(__MINGW32__) && !defined(__MINGW64__)
// leaks one context per thread but doesn't crash :shrug:
thread_local leaky_ptr<ZSTD_DStream> stream(ZSTD_createDStream());
#else
// reusing the context is recommended for performance // reusing the context is recommended for performance
// it will destroyed when the thread ends // it will destroyed when the thread ends
thread_local std::unique_ptr<ZSTD_DStream, ZSTD_Deleter> stream(ZSTD_createDStream()); thread_local std::unique_ptr<ZSTD_DStream, ZSTD_Deleter> stream(ZSTD_createDStream());
#endif
ZSTD_initDStream(stream.get()); ZSTD_initDStream(stream.get());