pieeebot/cafeberry
1
0
Fork 3
Code Issues Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

refactor(Minecraft.World): Implement LCEMP changes.

Browse Source
This commit is contained in:
pieeebot
2026-07-13 00:14:53 +03:00
parent 3fce0538c5
commit 21e2add09a
64 changed files with 655 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Connection.cpp
+86 -84
View File
@@ -29,6 +29,7 @@ void Connection::_init()
running = true;
quitting = false;
disconnected = false;
m_closeState = 0;
disconnectReason = DisconnectPacket::eDisconnect_None;
noInputTicks = 0;
estimatedRemaining = 0;
@@ -43,14 +44,21 @@ void Connection::_init()
}
// 4J Jev, need to delete the critical section.
Connection::~Connection()
{
// 4J Stu - Just to be sure, make sure the read and write threads terminate themselves before the connection object is destroyed
running = false;
if( dis ) dis->close(); // The input stream needs closed before the readThread, or the readThread
// may get stuck whilst blocking waiting on a read
readThread->WaitForCompletion(INFINITE);
writeThread->WaitForCompletion(INFINITE);
Connection::~Connection()
{
LONG closeState = InterlockedCompareExchange(&m_closeState, 1, 0);
if (closeState == 0)
{
shutdownConnectionResources();
InterlockedExchange(&m_closeState, 2);
}
else if (closeState == 1)
{
while (InterlockedCompareExchange(&m_closeState, 2, 2) != 2)
{
Sleep(0);
}
}
DeleteCriticalSection(&writeLock);
DeleteCriticalSection(&threadCounterLock);
@@ -74,6 +82,37 @@ Connection::~Connection()
dis = NULL;
}
void Connection::shutdownConnectionResources()
{
running = false;
if( dis ) dis->close();
if( readThread ) readThread->WaitForCompletion(INFINITE);
if( writeThread ) writeThread->WaitForCompletion(INFINITE);
delete dis;
dis = NULL;
if( bufferedDos )
{
bufferedDos->close();
bufferedDos->deleteChildStream();
delete bufferedDos;
bufferedDos = NULL;
}
if( byteArrayDos )
{
byteArrayDos->close();
delete byteArrayDos;
byteArrayDos = NULL;
}
if( socket )
{
socket->close(packetListener != NULL ? packetListener->isServerPacketListener() : false);
socket = NULL;
}
}
Connection::Connection(Socket *socket, const wstring& id, PacketListener *packetListener) // throws IOException
{
_init();
@@ -108,8 +147,8 @@ Connection::Connection(Socket *socket, const wstring& id, PacketListener *packet
const char *szId = wstringtofilename(id);
char readThreadName[256];
char writeThreadName[256];
sprintf(readThreadName,"%s read\n",szId);
sprintf(writeThreadName,"%s write\n",szId);
sprintf_s(readThreadName, sizeof(readThreadName), "%.240s read\n", szId);
sprintf_s(writeThreadName, sizeof(writeThreadName), "%.240s write\n", szId);
readThread = new C4JThread(runRead, (void*)this, readThreadName, READ_STACK_SIZE);
writeThread = new C4JThread(runWrite, this, writeThreadName, WRITE_STACK_SIZE);
@@ -364,80 +403,38 @@ close("disconnect.genericReason", "Internal exception: " + e.toString());
}*/
void Connection::close(DisconnectPacket::eDisconnectReason reason, ...)
{
// printf("Con:0x%x close\n",this);
if (!running) return;
// printf("Con:0x%x close doing something\n",this);
disconnected = true;
va_list input;
va_start( input, reason );
disconnectReason = reason;//va_arg( input, const wstring );
vector<void *> objs = vector<void *>();
void *i = NULL;
while (i != NULL)
{
i = va_arg( input, void* );
objs.push_back(i);
}
if( objs.size() )
{
disconnectReasonObjects = &objs[0];
}
else
{
disconnectReasonObjects = NULL;
}
// int count = 0, sum = 0, i = first;
// va_list marker;
//
// va_start( marker, first );
// while( i != -1 )
// {
// sum += i;
// count++;
// i = va_arg( marker, int);
// }
// va_end( marker );
// return( sum ? (sum / count) : 0 );
// CreateThread(NULL, 0, runClose, this, 0, &closeThreadID);
running = false;
if( dis ) dis->close(); // The input stream needs closed before the readThread, or the readThread
// may get stuck whilst blocking waiting on a read
// Make sure that the read & write threads are dead before we go and kill the streams that they depend on
readThread->WaitForCompletion(INFINITE);
writeThread->WaitForCompletion(INFINITE);
delete dis;
dis = NULL;
if( bufferedDos )
{
bufferedDos->close();
bufferedDos->deleteChildStream();
delete bufferedDos;
bufferedDos = NULL;
}
if( byteArrayDos )
{
byteArrayDos->close();
delete byteArrayDos;
byteArrayDos = NULL;
}
if( socket )
{
socket->close(packetListener->isServerPacketListener());
socket = NULL;
}
void Connection::close(DisconnectPacket::eDisconnectReason reason, ...)
{
// printf("Con:0x%x close\n",this);
if (InterlockedCompareExchange(&m_closeState, 1, 0) != 0) return;
// printf("Con:0x%x close doing something\n",this);
disconnected = true;
va_list input;
va_start( input, reason );
disconnectReason = reason;
disconnectReasonObjects = NULL;
va_end(input);
// int count = 0, sum = 0, i = first;
// va_list marker;
//
// va_start( marker, first );
// while( i != -1 )
// {
// sum += i;
// count++;
// i = va_arg( marker, int);
// }
// va_end( marker );
// return( sum ? (sum / count) : 0 );
// CreateThread(NULL, 0, runClose, this, 0, &closeThreadID);
shutdownConnectionResources();
InterlockedExchange(&m_closeState, 2);
}
void Connection::tick()
@@ -500,6 +497,11 @@ void Connection::tick()
// MGH - moved the packet handling outside of the incoming_cs block, as it was locking up sometimes when disconnecting
for(int i=0; i<packetsToHandle.size();i++)
{
// if a packet handler disconnected this connection, drop any remaining queued packets
if (disconnected || quitting || packetListener == NULL)
{
break;
}
PIXBeginNamedEvent(0,"Handling packet %d\n",packetsToHandle[i]->getId());
packetsToHandle[i]->handle(packetListener);
PIXEndNamedEvent();