mirror of
https://github.com/pocoproject/poco.git
synced 2025-12-31 23:50:56 +01:00
* Add NativeThreadInfo + use in Message + test with PatternFormatter * Fix NativeThreadInfo for glibc without gettid * add new file to make * chore: formatting * fix(NativeThreadinfo): name and id #3333 * fix(NativeThread): add OS includes #3333 * fix(Message): use OS thread ID for non-POCO threads #3333 Fix Message initialization to correctly handle thread IDs for both POCO and non-POCO threads. When Thread::current() returns null (std::thread, main thread, etc.), use NativeThreadInfo to get the OS thread ID instead of leaving _tid as zero. Rename NativeThreadInfo::id() to NativeThreadInfo::osTid() to match the Thread::currentOsTid() naming convention and clarify that both return the same kernel-level thread identifier (not the POCO sequential ID). Additional changes: - Add comprehensive documentation to NativeThreadInfo explaining its purpose and when to use it vs Thread::current() - Fix LoggerTest warning by removing pessimizing std::move in return - Update all platform implementations (POSIX, WIN32, WINCE, VxWorks) This ensures the %I format specifier in PatternFormatter shows: - POCO thread ID (1, 2, 3...) for Poco::Thread instances - OS thread ID for non-POCO threads (std::thread, main thread, etc.) * fix(LoggerTest): compare thread ID against actual value #3333 testFormatThreadName was failing in CI because it expected the POCO thread ID to be 1, but in a full test run, many threads are created before this test (by ThreadingTestSuite, etc.), resulting in higher IDs. The test now compares against the actual thread's ID (thr.id()) instead of a hard-coded value, making it robust regardless of test order. * fix(NativeThreadInfo): windows compile #3333 * fix(NativeThreadInfo): mac compile fail; consolidate platform pthread functions selection #3333 * fix(NativeThreadInfo): use UTF8 #3333 * fix: remove NativeThreadInfo (not needed) #3333 * fix(Thread): proper UTF-8 handling and test robustness #3333 - Thread_WIN32: Use MultiByteToWideChar with CP_UTF8 in setCurrentNameImpl instead of byte-by-byte iterator copy. The old conversion was incorrect for non-ASCII characters (e.g., Japanese thread names). - LoggerTest: Add bounds check (parts.size() >= 5) before accessing vector elements to prevent undefined behavior if log message format is unexpected. * fix(Message): disable thread name on platforms that don't have it #3333 * fix(Thread): make getCurrentName/setCurrentName always available #3333 Move POCO_NO_THREADNAME guard inside inline implementations instead of around declarations. This ensures the API is always available on all platforms, returning empty string or no-op on platforms without thread name support (e.g., emscripten, AIX). Update Message.cpp to remove conditional compilation since the functions are now unconditionally available. * fix(Thread): Windows backward compatibility and code cleanup #3333 Thread_WIN32.cpp: - Use dynamic loading for SetThreadDescription/GetThreadDescription via GetProcAddress for compatibility with pre-Windows 10 1607 - setCurrentNameImpl tries modern API first, falls back to legacy exception method (0x406D1388) for older Windows/debuggers - Remove redundant processthreadsapi.h and stringapiset.h includes (already included via windows.h) LoggerTest.cpp: - Simplify loop condition (remove redundant npos check) - Fix code style (braces on new lines) --------- Co-authored-by: Olivier Smeesters <osm@idirect.net>
189 lines
3.5 KiB
C++
189 lines
3.5 KiB
C++
//
|
|
// Thread_WIN32.h
|
|
//
|
|
// Library: Foundation
|
|
// Package: Threading
|
|
// Module: Thread
|
|
//
|
|
// Definition of the ThreadImpl class for WIN32.
|
|
//
|
|
// Copyright (c) 2004-2009, Applied Informatics Software Engineering GmbH.
|
|
// and Contributors.
|
|
//
|
|
// SPDX-License-Identifier: BSL-1.0
|
|
//
|
|
|
|
|
|
#ifndef Foundation_Thread_WIN32_INCLUDED
|
|
#define Foundation_Thread_WIN32_INCLUDED
|
|
|
|
|
|
#include "Poco/Foundation.h"
|
|
#include "Poco/Runnable.h"
|
|
#include "Poco/SharedPtr.h"
|
|
#include "Poco/UnWindows.h"
|
|
|
|
|
|
namespace Poco {
|
|
|
|
|
|
class Foundation_API ThreadImpl
|
|
{
|
|
public:
|
|
typedef DWORD TIDImpl;
|
|
typedef void (*Callable)(void*);
|
|
|
|
#if defined(_DLL)
|
|
typedef DWORD (WINAPI *Entry)(LPVOID);
|
|
#else
|
|
typedef unsigned (__stdcall *Entry)(void*);
|
|
#endif
|
|
|
|
enum Priority
|
|
{
|
|
PRIO_LOWEST_IMPL = THREAD_PRIORITY_LOWEST,
|
|
PRIO_LOW_IMPL = THREAD_PRIORITY_BELOW_NORMAL,
|
|
PRIO_NORMAL_IMPL = THREAD_PRIORITY_NORMAL,
|
|
PRIO_HIGH_IMPL = THREAD_PRIORITY_ABOVE_NORMAL,
|
|
PRIO_HIGHEST_IMPL = THREAD_PRIORITY_HIGHEST
|
|
};
|
|
|
|
enum Policy
|
|
{
|
|
POLICY_DEFAULT_IMPL = 0
|
|
};
|
|
|
|
ThreadImpl();
|
|
~ThreadImpl();
|
|
|
|
TIDImpl tidImpl() const;
|
|
void setNameImpl(const std::string& threadName);
|
|
std::string getNameImpl() const;
|
|
std::string getOSThreadNameImpl();
|
|
/// Returns the thread's name, expressed as an operating system
|
|
/// specific name value. Return empty string if thread is not running.
|
|
/// For test used only.
|
|
void setPriorityImpl(int prio);
|
|
int getPriorityImpl() const;
|
|
void setOSPriorityImpl(int prio, int policy = 0);
|
|
int getOSPriorityImpl() const;
|
|
static int getMinOSPriorityImpl(int policy);
|
|
static int getMaxOSPriorityImpl(int policy);
|
|
void setStackSizeImpl(int size);
|
|
int getStackSizeImpl() const;
|
|
void startImpl(SharedPtr<Runnable> pTarget);
|
|
void joinImpl();
|
|
bool joinImpl(long milliseconds);
|
|
bool isRunningImpl() const;
|
|
static void yieldImpl();
|
|
static ThreadImpl* currentImpl();
|
|
static TIDImpl currentTidImpl();
|
|
static long currentOsTidImpl();
|
|
static void setCurrentNameImpl(const std::string& name);
|
|
static std::string getCurrentNameImpl();
|
|
bool setAffinityImpl(int);
|
|
int getAffinityImpl() const;
|
|
|
|
protected:
|
|
#if defined(_DLL)
|
|
static DWORD WINAPI runnableEntry(LPVOID pThread);
|
|
#else
|
|
static unsigned __stdcall runnableEntry(void* pThread);
|
|
#endif
|
|
|
|
void createImpl(Entry ent, void* pData);
|
|
void threadCleanup();
|
|
|
|
private:
|
|
class CurrentThreadHolder
|
|
{
|
|
public:
|
|
CurrentThreadHolder(): _slot(TlsAlloc())
|
|
{
|
|
if (_slot == TLS_OUT_OF_INDEXES)
|
|
throw SystemException("cannot allocate thread context key");
|
|
}
|
|
~CurrentThreadHolder()
|
|
{
|
|
TlsFree(_slot);
|
|
}
|
|
ThreadImpl* get() const
|
|
{
|
|
return reinterpret_cast<ThreadImpl*>(TlsGetValue(_slot));
|
|
}
|
|
void set(ThreadImpl* pThread)
|
|
{
|
|
TlsSetValue(_slot, pThread);
|
|
}
|
|
|
|
private:
|
|
DWORD _slot;
|
|
};
|
|
|
|
SharedPtr<Runnable> _pRunnableTarget;
|
|
HANDLE _thread;
|
|
DWORD _threadId;
|
|
int _prio;
|
|
int _stackSize;
|
|
std::string _name;
|
|
|
|
static CurrentThreadHolder _currentThreadHolder;
|
|
};
|
|
|
|
|
|
//
|
|
// inlines
|
|
//
|
|
inline int ThreadImpl::getPriorityImpl() const
|
|
{
|
|
return _prio;
|
|
}
|
|
|
|
|
|
inline int ThreadImpl::getOSPriorityImpl() const
|
|
{
|
|
return _prio;
|
|
}
|
|
|
|
|
|
inline int ThreadImpl::getMinOSPriorityImpl(int /* policy */)
|
|
{
|
|
return PRIO_LOWEST_IMPL;
|
|
}
|
|
|
|
|
|
inline int ThreadImpl::getMaxOSPriorityImpl(int /* policy */)
|
|
{
|
|
return PRIO_HIGHEST_IMPL;
|
|
}
|
|
|
|
|
|
inline void ThreadImpl::yieldImpl()
|
|
{
|
|
Sleep(0);
|
|
}
|
|
|
|
|
|
inline void ThreadImpl::setStackSizeImpl(int size)
|
|
{
|
|
_stackSize = size;
|
|
}
|
|
|
|
|
|
inline int ThreadImpl::getStackSizeImpl() const
|
|
{
|
|
return _stackSize;
|
|
}
|
|
|
|
|
|
inline ThreadImpl::TIDImpl ThreadImpl::tidImpl() const
|
|
{
|
|
return _threadId;
|
|
}
|
|
|
|
|
|
} // namespace Poco
|
|
|
|
|
|
#endif // Foundation_Thread_WIN32_INCLUDED
|