summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp66
1 files changed, 15 insertions, 51 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index a9181b17e90..5a56c74f4c4 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -13,10 +13,6 @@
#include <Ice/Properties.h>
#include <Ice/TraceLevels.h>
-#if defined(ICE_OS_UWP)
-# include <Ice/StringConverter.h>
-#endif
-
#if defined(__FreeBSD__)
# include <sys/sysctl.h>
#endif
@@ -177,7 +173,7 @@ IceInternal::ThreadPoolWorkQueue::destroy()
//Lock sync(*this); Called with the thread pool locked
assert(!_destroyed);
_destroyed = true;
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
_threadPool._selector.completed(this, SocketOperationRead);
#else
_threadPool._selector.ready(this, SocketOperationRead, true);
@@ -189,7 +185,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
{
//Lock sync(*this); Called with the thread pool locked
_workItems.push_back(item);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
_threadPool._selector.completed(this, SocketOperationRead);
#else
if(_workItems.size() == 1)
@@ -199,7 +195,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
#endif
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
bool
IceInternal::ThreadPoolWorkQueue::startAsync(SocketOperation)
{
@@ -226,7 +222,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
workItem = _workItems.front();
_workItems.pop_front();
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
else
{
assert(_destroyed);
@@ -293,19 +289,18 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
_threadIdleTime(0),
_stackSize(0),
_inUse(0),
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
_inUseIO(0),
_nextHandler(_handlers.end()),
#endif
_promote(true)
{
PropertiesPtr properties = _instance->initializationData().properties;
-#ifndef ICE_OS_UWP
-# ifdef _WIN32
+#ifdef _WIN32
SYSTEM_INFO sysInfo;
GetSystemInfo(&sysInfo);
int nProcessors = sysInfo.dwNumberOfProcessors;
-# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static int ncpu[2] = { CTL_HW, HW_NCPU };
int nProcessors;
size_t sz = sizeof(nProcessors);
@@ -313,13 +308,12 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
{
nProcessors = 1;
}
-# else
+#else
int nProcessors = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
if(nProcessors == -1)
{
nProcessors = 1;
}
-# endif
#endif
//
@@ -336,12 +330,11 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
}
int sizeMax = properties->getPropertyAsIntWithDefault(_prefix + ".SizeMax", size);
-#ifndef ICE_OS_UWP
if(sizeMax == -1)
{
sizeMax = nProcessors;
}
-#endif
+
if(sizeMax < size)
{
Warning out(_instance->initializationData().logger);
@@ -374,11 +367,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
const_cast<int&>(_size) = size;
const_cast<int&>(_sizeMax) = sizeMax;
const_cast<int&>(_sizeWarn) = sizeWarn;
-#ifndef ICE_OS_UWP
const_cast<int&>(_sizeIO) = min(sizeMax, nProcessors);
-#else
- const_cast<int&>(_sizeIO) = sizeMax;
-#endif
const_cast<int&>(_threadIdleTime) = threadIdleTime;
#ifdef ICE_USE_IOCP
@@ -543,7 +532,7 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
{
Lock sync(*this);
assert(!_destroyed);
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
closeNow = _selector.finish(handler.get(), closeNow); // This must be called before!
_workQueue->queue(new FinishedWorkItem(handler, !closeNow));
return closeNow;
@@ -670,7 +659,7 @@ IceInternal::ThreadPool::getDispatchQueue() const ICE_NOEXCEPT
void
IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
{
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
ThreadPoolCurrent current(_instance, this, thread);
bool select = false;
while(true)
@@ -824,12 +813,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
try
{
current._ioCompleted = false;
-#ifdef ICE_OS_UWP
- current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _threadIdleTime));
-#else
current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
current._error, _threadIdleTime));
-#endif
}
catch(const SelectorTimeoutException&)
{
@@ -843,14 +828,13 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
}
else if(_inUse < static_cast<int>(_threads.size() - 1)) // If not the last idle thread, we can exit.
{
-#ifndef ICE_OS_UWP
BOOL hasIO = false;
GetThreadIOPendingFlag(GetCurrentThread(), &hasIO);
if(hasIO)
{
continue;
}
-#endif
+
if(_instance->traceLevels()->threadPool >= 1)
{
Trace out(_instance->initializationData().logger, _instance->traceLevels()->threadPoolCat);
@@ -874,13 +858,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
try
{
-#ifdef ICE_OS_UWP
- current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _serverIdleTime));
-#else
-
current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
current._error, _serverIdleTime));
-#endif
}
catch(const SelectorTimeoutException&)
{
@@ -912,19 +891,6 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
Error out(_instance->initializationData().logger);
out << "exception in `" << _prefix << "':\n" << ex << "\nevent handler: " << current._handler->toString();
}
-#ifdef ICE_OS_UWP
- catch(Platform::Exception^ ex)
- {
- //
- // We don't need to pass the wide string converter in the call to wstringToString
- // because the wide string is using the platform default encoding.
- //
- Error out(_instance->initializationData().logger);
- out << "exception in `" << _prefix << "':\n"
- << wstringToString(ex->Message->Data(), _instance->getStringConverter())
- << "\nevent handler: " << current._handler->toString();
- }
-#endif
catch(...)
{
Error out(_instance->initializationData().logger);
@@ -956,7 +922,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
if(_sizeMax > 1)
{
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
--_inUseIO;
if(!_destroyed)
@@ -1026,7 +992,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
return _serialize && current._handler.get() != _workQueue.get();
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
bool
IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
{
@@ -1038,11 +1004,9 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
current._handler->_completed = static_cast<SocketOperation>(current._handler->_completed | current.operation);
current._handler->_started = static_cast<SocketOperation>(current._handler->_started & ~current.operation);
-#ifndef ICE_OS_UWP
AsyncInfo* info = current._handler->getNativeInfo()->getAsyncInfo(current.operation);
info->count = current._count;
info->error = current._error;
-#endif
if(!current._handler->finishAsync(current.operation)) // Returns false if the handler is finished.
{
@@ -1321,7 +1285,7 @@ ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance,
_threadPool(threadPool.get()),
_thread(thread),
_ioCompleted(false)
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
, _leader(false)
#endif
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 22:48:31 +0000