Merge remote-tracking branch 'origin/ParallelReactor' into develop

pprindeville · Jan 5, 2013 · 0d9e18b · 0d9e18b
2 parents c61f8d3 + 6b832a2
commit 0d9e18b
Show file tree

Hide file tree

Showing 18 changed files with 403 additions and 4 deletions.
diff --git a/Net/Net_CE_vs90.vcproj b/Net/Net_CE_vs90.vcproj
@@ -803,6 +803,8 @@
 				Name="Header Files">
 				<File
 					RelativePath=".\include\Poco\Net\SocketAcceptor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketAcceptor.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketConnector.h"/>
 				<File
@@ -811,6 +813,8 @@
 					RelativePath=".\include\Poco\Net\SocketNotifier.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketReactor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketReactor.h"/>
 			</Filter>
 			<Filter
 				Name="Source Files">

diff --git a/Net/Net_vs100.vcxproj b/Net/Net_vs100.vcxproj
@@ -273,6 +273,8 @@
     <ClInclude Include="include\Poco\Net\Net.h" />
     <ClInclude Include="include\Poco\Net\NetException.h" />
     <ClInclude Include="include\Poco\Net\NetworkInterface.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h" />
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h" />
     <ClInclude Include="include\Poco\Net\SocketAddress.h" />
     <ClInclude Include="include\Poco\Net\SocketDefs.h" />
     <ClInclude Include="include\Poco\Net\DatagramSocket.h" />

diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters
@@ -414,6 +414,12 @@
     <ClInclude Include="include\Poco\Net\WebSocketImpl.h">
       <Filter>WebSocket\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\DNS.cpp">

diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj
@@ -347,10 +347,12 @@
     <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
     <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
     <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
     <ClInclude Include="include\Poco\Net\MailMessage.h"/>
     <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
     <ClInclude Include="include\Poco\Net\MailStream.h"/>

diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters
@@ -351,6 +351,9 @@
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\SocketConnector.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
@@ -363,6 +366,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>

diff --git a/Net/Net_vs71.vcproj b/Net/Net_vs71.vcproj
@@ -735,6 +735,8 @@
 				Name="Header Files">
 				<File
 					RelativePath=".\include\Poco\Net\SocketAcceptor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketAcceptor.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketConnector.h"/>
 				<File
@@ -743,6 +745,8 @@
 					RelativePath=".\include\Poco\Net\SocketNotifier.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketReactor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketReactor.h"/>
 			</Filter>
 			<Filter
 				Name="Source Files">

diff --git a/Net/Net_vs80.vcproj b/Net/Net_vs80.vcproj
@@ -756,6 +756,8 @@
 				Name="Header Files">
 				<File
 					RelativePath=".\include\Poco\Net\SocketAcceptor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketAcceptor.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketConnector.h"/>
 				<File
@@ -764,6 +766,8 @@
 					RelativePath=".\include\Poco\Net\SocketNotifier.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketReactor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketReactor.h"/>
 			</Filter>
 			<Filter
 				Name="Source Files">

diff --git a/Net/Net_vs90.vcproj b/Net/Net_vs90.vcproj
@@ -755,6 +755,8 @@
 				Name="Header Files">
 				<File
 					RelativePath=".\include\Poco\Net\SocketAcceptor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketAcceptor.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketConnector.h"/>
 				<File
@@ -763,6 +765,8 @@
 					RelativePath=".\include\Poco\Net\SocketNotifier.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketReactor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketReactor.h"/>
 			</Filter>
 			<Filter
 				Name="Source Files">

diff --git a/Net/Net_x64_vs100.vcxproj b/Net/Net_x64_vs100.vcxproj
@@ -339,10 +339,12 @@
     <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
     <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
     <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
     <ClInclude Include="include\Poco\Net\MailMessage.h"/>
     <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
     <ClInclude Include="include\Poco\Net\MailStream.h"/>

diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters
@@ -351,6 +351,9 @@
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\SocketConnector.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
@@ -363,6 +366,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>

diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj
@@ -345,10 +345,12 @@
     <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
     <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
     <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
     <ClInclude Include="include\Poco\Net\MailMessage.h"/>
     <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
     <ClInclude Include="include\Poco\Net\MailStream.h"/>

diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters
@@ -351,6 +351,9 @@
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\SocketConnector.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
@@ -363,6 +366,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
+      <Filter>Reactor\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>

diff --git a/Net/Net_x64_vs90.vcproj b/Net/Net_x64_vs90.vcproj
@@ -760,6 +760,8 @@
 				Name="Header Files">
 				<File
 					RelativePath=".\include\Poco\Net\SocketAcceptor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketAcceptor.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketConnector.h"/>
 				<File
@@ -768,6 +770,8 @@
 					RelativePath=".\include\Poco\Net\SocketNotifier.h"/>
 				<File
 					RelativePath=".\include\Poco\Net\SocketReactor.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\ParallelSocketReactor.h"/>
 			</Filter>
 			<Filter
 				Name="Source Files">