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/JabberG/src/jabber_byte.cpp | 2 ++ protocols/JabberG/src/jabber_console.cpp | 2 ++ protocols/JabberG/src/jabber_file.cpp | 2 ++ protocols/JabberG/src/jabber_ibb.cpp | 2 ++ protocols/JabberG/src/jabber_iq.cpp | 3 +++ protocols/JabberG/src/jabber_opt.cpp | 2 ++ protocols/JabberG/src/jabber_proto.cpp | 4 ++++ protocols/JabberG/src/jabber_thread.cpp | 1 + protocols/JabberG/src/jabber_util.cpp | 2 ++ 9 files changed, 20 insertions(+) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp index 1861e5240b..02c7e6b611 100644 --- a/protocols/JabberG/src/jabber_byte.cpp +++ b/protocols/JabberG/src/jabber_byte.cpp @@ -148,6 +148,7 @@ void CJabberProto::ByteSendThread(JABBER_BYTE_TRANSFER *jbt) int nIqId = 0; debugLogA("Thread started: type=bytestream_send"); + Thread_SetName("Jabber: ByteSendThread"); BOOL bDirect = m_options.BsDirect; @@ -596,6 +597,7 @@ void __cdecl CJabberProto::ByteReceiveThread(JABBER_BYTE_TRANSFER *jbt) BOOL validStreamhost = FALSE; if (jbt == NULL) return; + Thread_SetName("Jabber: ByteReceiveThread"); jbt->state = JBT_INIT; diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index 4033edb1b7..f0306b9ec4 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -596,6 +596,8 @@ INT_PTR CJabberDlgConsole::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) void __cdecl CJabberProto::ConsoleThread(void*) { + Thread_SetName("Jabber: ConsoleThread"); + MSG msg; while (GetMessage(&msg, NULL, 0, 0)) { if (msg.message == WM_CREATECONSOLE) { diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index fa45e4a0e2..69951806b0 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -32,6 +32,7 @@ void __cdecl CJabberProto::FileReceiveThread(filetransfer *ft) ThreadData info(this, NULL); debugLogA("Thread started: type=file_receive server='%s' port='%d'", ft->httpHostName, ft->httpPort); + Thread_SetName("Jabber: FileReceiveThread"); ft->type = FT_OOB; @@ -234,6 +235,7 @@ void JabberFileServerConnection(JABBER_SOCKET hConnection, DWORD /*dwRemoteIP*/, void __cdecl CJabberProto::FileServerThread(filetransfer *ft) { debugLogA("Thread started: type=file_send"); + Thread_SetName("Jabber: FileServerThread"); ThreadData info(this, NULL); ft->type = FT_OOB; diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp index ae7b45b7ad..0ac2a73150 100644 --- a/protocols/JabberG/src/jabber_ibb.cpp +++ b/protocols/JabberG/src/jabber_ibb.cpp @@ -89,6 +89,7 @@ void CJabberProto::OnIbbCloseResult(HXML, CJabberIqInfo *pInfo) void CJabberProto::IbbSendThread(JABBER_IBB_TRANSFER *jibb) { debugLogA("Thread started: type=ibb_send"); + Thread_SetName("Jabber: IbbSendThread"); jibb->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); jibb->bStreamInitialized = FALSE; @@ -134,6 +135,7 @@ void CJabberProto::IbbSendThread(JABBER_IBB_TRANSFER *jibb) void __cdecl CJabberProto::IbbReceiveThread(JABBER_IBB_TRANSFER *jibb) { debugLogA("Thread started: type=ibb_recv"); + Thread_SetName("Jabber: IbbReceiveThread"); filetransfer *ft = jibb->ft; diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp index 6149d6d1e9..49192e6613 100644 --- a/protocols/JabberG/src/jabber_iq.cpp +++ b/protocols/JabberG/src/jabber_iq.cpp @@ -133,12 +133,15 @@ void CJabberIqManager::FillPermanentHandlers() void __cdecl CJabberProto::ExpirerThread(void* pParam) { + Thread_SetName("Jabber: ExpirerThread"); CJabberIqManager *pManager = (CJabberIqManager *)pParam; pManager->ExpirerThread(); } void CJabberIqManager::ExpirerThread() { + Thread_SetName("Jabber: ExpirerThread"); + while (!m_bExpirerThreadShutdownRequest) { CJabberIqInfo *pInfo = DetouchExpired(); if (!pInfo) { diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 71dd2f0eee..40f2b4fb61 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -712,6 +712,8 @@ private: static void QueryServerListThread(void *arg) { + Thread_SetName("Jabber: QueryServerListThread"); + CDlgOptAccount *wnd = (CDlgOptAccount *)arg; HWND hwnd = wnd->GetHwnd(); bool bIsError = true; diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 94706e8ca9..327415dab4 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -679,6 +679,7 @@ struct JABBER_SEARCH_BASIC void __cdecl CJabberProto::BasicSearchThread(JABBER_SEARCH_BASIC *jsb) { + Thread_SetName("Jabber: BasicSearchThread"); Sleep(100); PROTOSEARCHRESULT psr = { 0 }; @@ -938,6 +939,7 @@ struct TFakeAckParams void __cdecl CJabberProto::SendMessageAckThread(void* param) { + Thread_SetName("Jabber: SendMessageAckThread"); TFakeAckParams *par = (TFakeAckParams*)param; Sleep(100); debugLogA("Broadcast ACK"); @@ -1122,6 +1124,8 @@ int __cdecl CJabberProto::SetStatus(int iNewStatus) void __cdecl CJabberProto::GetAwayMsgThread(void *param) { + Thread_SetName("Jabber: GetAwayMsgThread"); + MCONTACT hContact = (DWORD_PTR)param; ptrT jid(getTStringA(hContact, "jid")); diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 4ab20dfab0..f4e012174f 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -222,6 +222,7 @@ void CJabberProto::ServerThread(JABBER_CONN_DATA *pParam) ThreadData info(this, pParam); debugLogA("Thread started: type=%d", info.bIsReg); + Thread_SetName("Jabber: ServerThread"); if (m_options.ManualConnect == TRUE) { ptrA szManualHost(getStringA("ManualHost")); diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index cb50955c75..ad0e2caf07 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -884,6 +884,8 @@ bool CJabberProto::IsMyOwnJID(LPCTSTR szJID) void __cdecl CJabberProto::LoadHttpAvatars(void* param) { + Thread_SetName("Jabber: LoadHttpAvatars"); + OBJLIST &avs = *(OBJLIST*)param; HANDLE hHttpCon = NULL; for (int i = 0; i < avs.getCount(); i++) { -- cgit v1.2.3