From 3e4284bb32b1515cdcac6741d2c2e94f64f08063 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sat, 11 Jun 2016 23:45:23 +0000 Subject: MRA: change avatars load threads count default value from 4 to 1 add threads names git-svn-id: http://svn.miranda-ng.org/main/trunk@16948 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/icq_avatar.cpp | 1 + protocols/IcqOscarJ/src/icq_direct.cpp | 2 ++ protocols/IcqOscarJ/src/icq_infoupdate.cpp | 1 + protocols/IcqOscarJ/src/icq_proto.cpp | 4 ++++ protocols/IcqOscarJ/src/icq_rates.cpp | 1 + protocols/IcqOscarJ/src/icq_server.cpp | 3 +++ protocols/IcqOscarJ/src/icq_servlist.cpp | 1 + protocols/IcqOscarJ/src/log.cpp | 1 + protocols/IcqOscarJ/src/oscar_filetransfer.cpp | 2 ++ protocols/IcqOscarJ/src/utilities.cpp | 2 ++ 10 files changed, 18 insertions(+) (limited to 'protocols/IcqOscarJ') diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index a48ba14ee5..c1d1b30564 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -671,6 +671,7 @@ void CIcqProto::requestAvatarConnection() void __cdecl CIcqProto::AvatarThread(avatars_server_connection *pInfo) { debugLogA("%s thread started.", "Avatar"); + Thread_SetName("ICQ: AvatarThread"); // Execute connection handler pInfo->connectionThread(); diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp index 7131dc5b70..0cc7a372ea 100644 --- a/protocols/IcqOscarJ/src/icq_direct.cpp +++ b/protocols/IcqOscarJ/src/icq_direct.cpp @@ -192,6 +192,8 @@ void CIcqProto::CloseDirectConnection(directconnect *dc) void __cdecl CIcqProto::icq_directThread(directthreadstartinfo *dtsi) { + Thread_SetName("ICQ: directThread"); + directconnect dc = { 0 }; NETLIBPACKETRECVER packetRecv = { 0 }; HANDLE hPacketRecver; diff --git a/protocols/IcqOscarJ/src/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp index 64cbaeb4cd..8e4fc2f753 100644 --- a/protocols/IcqOscarJ/src/icq_infoupdate.cpp +++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp @@ -151,6 +151,7 @@ void __cdecl CIcqProto::InfoUpdateThread( void* ) DWORD dwWait = WAIT_OBJECT_0; debugLogA("%s thread starting.", "Info-Update"); + Thread_SetName("ICQ: InfoUpdateThread"); bInfoUpdateRunning = TRUE; diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 444772d9f9..12c8b99307 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -716,6 +716,8 @@ void CIcqProto::CheekySearchThread(void*) ICQSEARCHRESULT isr = { 0 }; isr.hdr.cbSize = sizeof(isr); + Thread_SetName("ICQ: CheekySearchThread"); + if (cheekySearchUin) { _itoa(cheekySearchUin, szUin, 10); isr.hdr.id.t = (TCHAR*)szUin; @@ -1633,6 +1635,8 @@ struct status_message_thread_data void __cdecl CIcqProto::GetAwayMsgThread(void *pStatusData) { + Thread_SetName("ICQ: GetAwayMsgThread"); + status_message_thread_data *pThreadData = (status_message_thread_data*)pStatusData; if (pThreadData) { // wait a little diff --git a/protocols/IcqOscarJ/src/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp index b0e7d20b57..6a130e3b03 100644 --- a/protocols/IcqOscarJ/src/icq_rates.cpp +++ b/protocols/IcqOscarJ/src/icq_rates.cpp @@ -301,6 +301,7 @@ rates_queue::~rates_queue() static void rateDelayThread(void *param) { + Thread_SetName("ICQ: rateDelayThread"); rates_queue *pQueue = (rates_queue*)param; pQueue->handleDelay(); } diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp index 3a891b0a5d..87e1007267 100644 --- a/protocols/IcqOscarJ/src/icq_server.cpp +++ b/protocols/IcqOscarJ/src/icq_server.cpp @@ -36,6 +36,8 @@ void icq_newConnectionReceived(HANDLE hNewConnection, DWORD dwRemoteIP, void *pE void __cdecl CIcqProto::ServerThread(serverthread_start_info *infoParam) { + Thread_SetName("ICQ: ServerThread"); + serverthread_info info = { 0 }; info.isLoginServer = info.bReinitRecver = true; info.wAuthKeyLen = infoParam->wPassLen; @@ -333,6 +335,7 @@ void CIcqProto::sendServPacket(icq_packet *pPacket) void __cdecl CIcqProto::SendPacketAsyncThread(icq_packet* pkt) { + Thread_SetName("ICQ: SendPacketAsyncThread"); sendServPacket( pkt ); SAFE_FREE((void**)&pkt); } diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index 1c1ea58350..0769d7b69c 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -65,6 +65,7 @@ void CIcqProto::servlistEndOperation(int operationCount) void __cdecl CIcqProto::servlistQueueThread(void *param) { debugLogA("Server-List: Starting Update board."); + Thread_SetName("ICQ: servlistQueueThread"); int *queueState = (int*)param; SleepEx(50, FALSE); diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp index 235a752f9c..ee39798610 100644 --- a/protocols/IcqOscarJ/src/log.cpp +++ b/protocols/IcqOscarJ/src/log.cpp @@ -42,6 +42,7 @@ void __cdecl CIcqProto::icq_LogMessageThread(void* arg) LogMessageInfo *err = (LogMessageInfo*)arg; if (!err) return; + Thread_SetName("ICQ: LogMessageThread"); if (bPopupService && getByte("PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED)) { ShowPopupMsg(NULL, err->szTitle, err->szMsg, err->bLevel); diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp index 6305536dcb..143a1e715e 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp @@ -1104,6 +1104,8 @@ void __cdecl CIcqProto::oft_connectionThread(oscarthreadstartinfo *otsi) NETLIBPACKETRECVER packetRecv = { 0 }; HANDLE hPacketRecver; + Thread_SetName("ICQ: oft_connectionThread"); + oc.hContact = otsi->hContact; oc.hConnection = otsi->hConnection; oc.type = otsi->type; diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 26ffc7ed66..85a3c36114 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -906,6 +906,7 @@ bool IsStringUIN(const char *pszString) void __cdecl CIcqProto::ProtocolAckThread(icq_ack_args* pArguments) { + Thread_SetName("ICQ: ProtocolAckThread"); Sleep(150); if (pArguments->nAckResult == ACKRESULT_SUCCESS) @@ -988,6 +989,7 @@ int CIcqProto::IsMetaInfoChanged(MCONTACT hContact) void __cdecl CIcqProto::SetStatusNoteThread(void *pDelay) { + Thread_SetName("ICQ: SetStatusNoteThread"); if (pDelay) SleepEx((UINT_PTR)pDelay, TRUE); -- cgit v1.2.3