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.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 3769458371b..8294b7c272a 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -18,7 +18,7 @@
#include <Ice/Properties.h>
#include <Ice/TraceLevels.h>
-#if defined(ICE_OS_WINRT)
+#if defined(ICE_OS_UWP)
# include <Ice/StringConverter.h>
#endif
@@ -155,7 +155,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_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
_threadPool._selector.completed(this, SocketOperationRead);
#else
_threadPool._selector.ready(this, SocketOperationRead, true);
@@ -167,7 +167,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_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
_threadPool._selector.completed(this, SocketOperationRead);
#else
if(_workItems.size() == 1)
@@ -177,7 +177,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
#endif
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
bool
IceInternal::ThreadPoolWorkQueue::startAsync(SocketOperation)
{
@@ -204,7 +204,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
workItem = _workItems.front();
_workItems.pop_front();
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
else
{
assert(_destroyed);
@@ -266,14 +266,14 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
_threadIdleTime(0),
_stackSize(0),
_inUse(0),
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
_inUseIO(0),
_nextHandler(_handlers.end()),
#endif
_promote(true)
{
PropertiesPtr properties = _instance->initializationData().properties;
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
# ifdef _WIN32
SYSTEM_INFO sysInfo;
GetSystemInfo(&sysInfo);
@@ -297,7 +297,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
}
int sizeMax = properties->getPropertyAsIntWithDefault(_prefix + ".SizeMax", size);
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
if(sizeMax == -1)
{
sizeMax = nProcessors;
@@ -335,7 +335,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_WINRT
+#ifndef ICE_OS_UWP
const_cast<int&>(_sizeIO) = min(sizeMax, nProcessors);
#else
const_cast<int&>(_sizeIO) = sizeMax;
@@ -492,7 +492,7 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
{
Lock sync(*this);
assert(!_destroyed);
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
closeNow = _selector.finish(handler.get(), closeNow); // This must be called before!
_workQueue->queue(new FinishedWorkItem(handler, !closeNow));
return closeNow;
@@ -600,7 +600,7 @@ IceInternal::ThreadPool::prefix() const
void
IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
{
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
ThreadPoolCurrent current(_instance, this, thread);
bool select = false;
while(true)
@@ -751,7 +751,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
try
{
current._ioCompleted = false;
-#ifdef ICE_OS_WINRT
+#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,
@@ -770,7 +770,7 @@ 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_WINRT
+#ifndef ICE_OS_UWP
BOOL hasIO = false;
GetThreadIOPendingFlag(GetCurrentThread(), &hasIO);
if(hasIO)
@@ -801,7 +801,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
try
{
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _serverIdleTime));
#else
@@ -839,7 +839,7 @@ 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_WINRT
+#ifdef ICE_OS_UWP
catch(Platform::Exception^ ex)
{
//
@@ -883,7 +883,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
if(_sizeMax > 1)
{
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
--_inUseIO;
if(!_destroyed)
@@ -953,7 +953,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
return _serialize && current._handler.get() != _workQueue.get();
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
bool
IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
{
@@ -965,7 +965,7 @@ 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_WINRT
+#ifndef ICE_OS_UWP
AsyncInfo* info = current._handler->getNativeInfo()->getAsyncInfo(current.operation);
info->count = current._count;
info->error = current._error;
@@ -1248,7 +1248,7 @@ ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance,
_threadPool(threadPool.get()),
_thread(thread),
_ioCompleted(false)
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
, _leader(false)
#endif
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:44:29 +0000