backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-19 07:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use platform TLS keys in old chunk storage

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 07:52:23 +11:00
parent a08cb8d190
commit 78fdd89f9d
2 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Minecraft.World/Level/Storage/OldChunkStorage.cpp
View file

@ -8,7 +8,45 @@
#include "../../Headers/net.minecraft.world.level.storage.h"
#include "../../IO/Files/FileHeader.h"
#include "OldChunkStorage.h"
DWORD OldChunkStorage::tlsIdx = 0;
#if defined(_WIN32)
namespace
{
inline void *OldChunkStorageTlsGetValue(DWORD key)
{
return TlsGetValue(key);
}
inline void OldChunkStorageTlsSetValue(DWORD key, void *value)
{
TlsSetValue(key, value);
}
}
DWORD OldChunkStorage::tlsIdx = TlsAlloc();
#else
namespace
{
pthread_key_t CreateOldChunkStorageTlsKey()
{
pthread_key_t key;
const int result = pthread_key_create(&key, nullptr);
assert(result == 0);
return key;
}
inline void *OldChunkStorageTlsGetValue(pthread_key_t key)
{
return pthread_getspecific(key);
}
inline void OldChunkStorageTlsSetValue(pthread_key_t key, void *value)
{
pthread_setspecific(key, value);
}
}
pthread_key_t OldChunkStorage::tlsIdx = CreateOldChunkStorageTlsKey();
#endif
OldChunkStorage::ThreadStorage *OldChunkStorage::tlsDefault = NULL;
OldChunkStorage::ThreadStorage::ThreadStorage()
@ -32,20 +70,19 @@ void OldChunkStorage::CreateNewThreadStorage()
ThreadStorage *tls = new ThreadStorage();
if(tlsDefault == NULL )
{
tlsIdx = TlsAlloc();
tlsDefault = tls;
}
TlsSetValue(tlsIdx, tls);
OldChunkStorageTlsSetValue(tlsIdx, tls);
}
void OldChunkStorage::UseDefaultThreadStorage()
{
TlsSetValue(tlsIdx, tlsDefault);
OldChunkStorageTlsSetValue(tlsIdx, tlsDefault);
}
void OldChunkStorage::ReleaseThreadStorage()
{
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(tlsIdx);
ThreadStorage *tls = static_cast<ThreadStorage *>(OldChunkStorageTlsGetValue(tlsIdx));
if( tls == tlsDefault ) return;
delete tls;
@ -321,7 +358,7 @@ void OldChunkStorage::save(LevelChunk *lc, Level *level, CompoundTag *tag)
// Will be fine so long as we only actually create tags for once chunk at a time.
// 4J Stu - As we now save on multiple threads, the static data has been moved to TLS
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(tlsIdx);
ThreadStorage *tls = static_cast<ThreadStorage *>(OldChunkStorageTlsGetValue(tlsIdx));
PIXBeginNamedEvent(0,"Getting block data");
//static byteArray blockData = byteArray(32768);

7
Minecraft.World/Level/Storage/OldChunkStorage.h
View file

@ -4,6 +4,9 @@
#include "../../IO/Files/File.h"
#include "../../IO/NBT/CompoundTag.h"
#include "../../Headers/com.mojang.nbt.h"
#if !defined(_WIN32)
#include <pthread.h>
#endif
class Level;
@ -22,7 +25,11 @@ private:
ThreadStorage();
~ThreadStorage();
};
#if defined(_WIN32)
static DWORD tlsIdx;
#else
static pthread_key_t tlsIdx;
#endif
static ThreadStorage *tlsDefault;
public:
// Each new thread that needs to use Compression will need to call one of the following 2 functions, to either create its own