From bbfe603e5ae42317a2b67d713d00882bea341c88 Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Mon, 20 Jul 2020 16:57:44 +0100
Subject: IVGCVSW-5166 Pull out the common and server side code into standalone
 libraries

Change-Id: I180f84c493a9b2be4b93b25d312ebdd9e71b1735
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 profiling/common/src/NetworkSockets.cpp | 51 +++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'profiling/common/src/NetworkSockets.cpp')

diff --git a/profiling/common/src/NetworkSockets.cpp b/profiling/common/src/NetworkSockets.cpp
index 7f47c79b31..2a656552f1 100644
--- a/profiling/common/src/NetworkSockets.cpp
+++ b/profiling/common/src/NetworkSockets.cpp
@@ -1,27 +1,35 @@
 //
-// Copyright © 2020 Arm Ltd. All rights reserved.
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
-#include "common/include/NetworkSockets.hpp"
+#include <common/include/NetworkSockets.hpp>
 
 #if defined(__unix__) || defined(__APPLE__)
 #include <unistd.h>
 #include <fcntl.h>
-#include <armnn/Conversion.hpp>
+#include <common/include/Conversion.hpp>
+#endif
+
+#if defined(__APPLE__) || defined(_MSC_VER) || defined(__MINGW32__)
+#include <common/include/IgnoreUnused.hpp>
+#endif
 
+#if defined(__MINGW32__)
+#include <common/include/Conversion.hpp>
+#include <common/include/NumericCast.hpp>
 #endif
 
-namespace armnnUtils
+namespace arm
 {
-namespace Sockets
+namespace pipe
 {
 
 bool Initialize()
 {
 #if defined(__unix__) || defined(__APPLE__)
     return true;
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__MINGW32__)
     WSADATA wsaData;
     return WSAStartup(MAKEWORD(2, 2), &wsaData) == 0;
 #endif
@@ -31,7 +39,7 @@ int Close(Socket s)
 {
 #if defined(__unix__) || defined(__APPLE__)
     return close(s);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__MINGW32__)
     return closesocket(s);
 #endif
 }
@@ -45,6 +53,9 @@ bool SetNonBlocking(Socket s)
 #elif defined(_MSC_VER)
     u_long mode = 1;
     return ioctlsocket(s, FIONBIO, &mode) == 0;
+#elif defined(__MINGW32__)
+    u_long mode = 1;
+    return ioctlsocket(s, arm::pipe::numeric_cast<long>(FIONBIO), &mode) == 0;
 #endif
 }
 
@@ -53,7 +64,7 @@ long Write(Socket s, const void* buf, size_t len)
 {
 #if defined(__unix__) || defined(__APPLE__)
     return write(s, buf, len);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__MINGW32__)
     return send(s, static_cast<const char*>(buf), static_cast<int>(len), 0);
 #endif
 }
@@ -63,7 +74,7 @@ long Read(Socket s, void* buf, size_t len)
 {
 #if defined(__unix__) || defined(__APPLE__)
     return read(s, buf, len);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__MINGW32__)
     return recv(s, static_cast<char*>(buf), static_cast<int>(len), 0);
 #endif
 }
@@ -71,11 +82,13 @@ long Read(Socket s, void* buf, size_t len)
 int Ioctl(Socket s, unsigned long int cmd, void* arg)
 {
 #if defined(__unix__) || defined(__APPLE__)
-    ARMNN_NO_CONVERSION_WARN_BEGIN
+    ARM_PIPE_NO_CONVERSION_WARN_BEGIN
     return ioctl(s, static_cast<int>(cmd), arg);
-    ARMNN_NO_CONVERSION_WARN_END
-#elif defined(_MSC_VER)
+    ARM_PIPE_NO_CONVERSION_WARN_END
+#elif defined(_MSC_VER) || defined(__MINGW32__)
+    ARM_PIPE_NO_CONVERSION_WARN_BEGIN
     return ioctlsocket(s, cmd, static_cast<u_long*>(arg));
+    ARM_PIPE_NO_CONVERSION_WARN_END
 #endif
 }
 
@@ -84,22 +97,24 @@ int Poll(PollFd* fds, nfds_t numFds, int timeout)
 {
 #if defined(__unix__) || defined(__APPLE__)
     return poll(fds, numFds, timeout);
-#elif defined(_MSC_VER)
-    return WSAPoll(fds, numFds, timeout);
+#elif defined(_MSC_VER) || defined(__MINGW32__)
+    return WSAPoll(fds, arm::pipe::numeric_cast<unsigned long>(numFds), timeout);
 #endif
 }
 
 
-armnnUtils::Sockets::Socket Accept(Socket s, sockaddr* addr, socklen_t* addrlen, int flags)
+arm::pipe::Socket Accept(Socket s, sockaddr* addr, socklen_t* addrlen, int flags)
 {
 #if defined(__unix__)
     return accept4(s, addr, addrlen, flags);
 #elif defined(__APPLE__)
+    IgnoreUnused(flags);
     return accept(s, addr, addrlen);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__MINGW32__)
+    IgnoreUnused(flags);
     return accept(s, addr, reinterpret_cast<int*>(addrlen));
 #endif
 }
 
-}
-}
+} // pipe
+} // arm
-- 
cgit v1.2.1