admin/SimpleRemoter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: client threads number excceeding bug

Browse Source
This commit is contained in:
yuanyuanxiang
2024-12-24 18:08:26 +08:00
parent 727bbd395b
commit 5b86910cb2
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
client/KernelManager.cpp
View File

@@ -18,7 +18,7 @@ CKernelManager::~CKernelManager()
{ {
printf("~CKernelManager begin\n"); printf("~CKernelManager begin\n");
int i = 0; int i = 0;
for (i=0;i<0x1000;++i) for (i=0;i<MAX_THREADNUM;++i)
{ {
if (m_hThread[i].h!=0) if (m_hThread[i].h!=0)
{ {
@@ -33,10 +33,33 @@ CKernelManager::~CKernelManager()
printf("~CKernelManager end\n"); printf("~CKernelManager end\n");
} }
// <20><>ȡ<EFBFBD><C8A1><EFBFBD>õ<EFBFBD><C3B5>߳<EFBFBD><DFB3>±<EFBFBD>
UINT CKernelManager::GetAvailableIndex() {
if (m_ulThreadCount < MAX_THREADNUM) {
return m_ulThreadCount;
}
for (int i = 0; i < MAX_THREADNUM; ++i)
{
if (m_hThread[i].p == NULL) {
return i;
}
}
return -1;
}
VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
{ {
IOCPClient *pNew = szBuffer[0] == COMMAND_BYE ? NULL : new IOCPClient(true); bool isExit = szBuffer[0] == COMMAND_BYE || szBuffer[0] == SERVER_EXIT;
m_hThread[m_ulThreadCount].p = pNew; if ((m_ulThreadCount = GetAvailableIndex()) == -1) {
if (!isExit) {
printf("CKernelManager: The number of threads exceeds the limit.\n");
return;
}
}
else if (!isExit){
m_hThread[m_ulThreadCount].p = new IOCPClient(true);
}
switch(szBuffer[0]) switch(szBuffer[0])
{ {
@@ -78,9 +101,6 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
m_ClientObject->OnServerSending((char*)&bToken, 1); m_ClientObject->OnServerSending((char*)&bToken, 1);
m_bIsDead = 1; m_bIsDead = 1;
OutputDebugStringA("======> Client exit \n"); OutputDebugStringA("======> Client exit \n");
m_hThread[m_ulThreadCount].p = NULL;
delete pNew;
pNew = NULL;
break; break;
} }
@@ -90,9 +110,6 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
m_ClientObject->OnServerSending((char*)&bToken, 1); m_ClientObject->OnServerSending((char*)&bToken, 1);
m_bIsDead = 2; m_bIsDead = 2;
OutputDebugStringA("======> Server exit \n"); OutputDebugStringA("======> Server exit \n");
m_hThread[m_ulThreadCount].p = NULL;
delete pNew;
pNew = NULL;
break; break;
} }
@@ -147,9 +164,10 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
default: default:
{ {
OutputDebugStringA("======> Error operator\n"); OutputDebugStringA("======> Error operator\n");
m_hThread[m_ulThreadCount].p = NULL; if (m_ulThreadCount != -1) {
delete pNew; delete m_hThread[m_ulThreadCount].p;
pNew = NULL; m_hThread[m_ulThreadCount].p = NULL;
}
break; break;
} }
} }

9
client/KernelManager.h
View File

@@ -12,7 +12,9 @@
#include "Manager.h" #include "Manager.h"
#include <vector> #include <vector>
// <20>߳<EFBFBD><DFB3><EFBFBD>Ϣ<EFBFBD>ṹ<EFBFBD><E1B9B9> #define MAX_THREADNUM 0x1000
// <20>߳<EFBFBD><DFB3><EFBFBD>Ϣ<EFBFBD>ṹ<EFBFBD><E1B9B9>, <20><><EFBFBD><EFBFBD>3<EFBFBD><33><EFBFBD><EFBFBD>Ա: <20><><EFBFBD><EFBFBD>״̬(run)<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(h)<29><>ͨѶ<CDA8>ͻ<EFBFBD><CDBB><EFBFBD>(p).
struct ThreadInfo struct ThreadInfo
{ {
BOOL run; BOOL run;
@@ -28,8 +30,11 @@ public:
virtual ~CKernelManager(); virtual ~CKernelManager();
VOID OnReceive(PBYTE szBuffer, ULONG ulLength); VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
ThreadInfo m_hThread[0x1000]; ThreadInfo m_hThread[MAX_THREADNUM];
// <20><>ֵ<EFBFBD><D6B5>ԭ<EFBFBD><D4AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD>¼<EFBFBD>߳<EFBFBD><DFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱm_hThread<61><64>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>³<EFBFBD><C2B3><EFBFBD><EFBFBD>쳣
// <20><><EFBFBD><EFBFBD><EFBFBD>ҽ<EFBFBD><D2BD><EFBFBD>ֵ<EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD><EFBFBD>޸<EFBFBD>Ϊ"<22><><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3>±<EFBFBD>"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>m_hThread<61><64><EFBFBD><EFBFBD>ָλ<D6B8>ÿ<EFBFBD><C3BF>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD><C2B5>̷߳<DFB3><CCB7><EFBFBD><EFBFBD>ڸ<EFBFBD>λ<EFBFBD><CEBB>
ULONG m_ulThreadCount; ULONG m_ulThreadCount;
UINT GetAvailableIndex();
}; };
#endif // !defined(AFX_KERNELMANAGER_H__B1186DC0_E4D7_4D1A_A8B8_08A01B87B89E__INCLUDED_) #endif // !defined(AFX_KERNELMANAGER_H__B1186DC0_E4D7_4D1A_A8B8_08A01B87B89E__INCLUDED_)