Win32 corrections

diff --git a/base/ReByteBuffer.cpp b/base/ReByteBuffer.cpp
index 431e3248677cd4807175199ae70c6b5dc9b23a26..9d19ff3997d76559e46534b07b796a0125c73753 100644 (file)
--- a/base/ReByteBuffer.cpp
+++ b/base/ReByteBuffer.cpp
@@ -220,12 +220,12 @@ ReByteBuffer& ReByteBuffer::appendDump(const char* data, size_t length, int maxL
        if (length == size_t(-1)){
                length = strlen(data);
        }
-       if (length > maxLength)
+       if ((int) length > maxLength)
                length = maxLength;
        // test if text or binary:
        bool isBinary = false;
        unsigned char cc;
-       for (int ii = 0; ii < length; ii++){
+       for (size_t ii = 0; ii < length; ii++){
                if ( (cc = (unsigned char) data[ii]) > 126
                        || (cc < ' ' && cc != '\n' && cc != '\r' && cc != '\t')){
                        isBinary = true;

diff --git a/base/ReLogger.cpp b/base/ReLogger.cpp
index d2acda4c7235d2f3d8ac56966557e20b9ea46e5c..2471b564916fd5ec8e07fc18f60dcba496a23303 100644 (file)
--- a/base/ReLogger.cpp
+++ b/base/ReLogger.cpp
@@ -466,11 +466,13 @@ const char* ReLogger::standardPrefix(char charPrefix) {
  *
  */
 void ReLogger::end(void) {
+       m_mutex.lock();
        for (size_t ii = 0; ii < m_appenderListLength; ii++) {
                ReAppender* app = m_appenderList[ii];
                if (app->accept(m_mode))
                        app->say(this, NULL);
        }
+       m_mutex.unlock();
        m_locationOfOpenSayF = 0;
 }
 

diff --git a/base/ReMutex.cpp b/base/ReMutex.cpp
index dae5259e56ee7eb989519f63abd50d7dea2e462e..e6427b24c284595b34aef62c53fb1a6cc0774a84 100644 (file)
--- a/base/ReMutex.cpp
+++ b/base/ReMutex.cpp
@@ -13,18 +13,22 @@
  * Constructor.
  *
  * @param maxWaitSec   maximal timeout. If reached an error occurres
+ * @param assignments  time units for busy wait before waiting. Only used in WIN32<br>
+ *                                             use it for very short critical sections like variable assignment
+ *                                             0: wait at once<br>
+ *                                             otherwise: wait spinCount time (3 instructions) units before wait
  */
-ReMutex::ReMutex(int location, int maxWaitSec) :
+ReMutex::ReMutex(int location, int maxWaitSec, int assignments) :
 #if defined __linux__
            m_mutex(),
 #elif defined __WIN32__
-           m_mutex(0),
+           m_mutex(),
 #endif
            m_maxWaitSec(maxWaitSec) {
 #if defined __linux__
        sem_init(&m_mutex, 0, 1);
 #elif defined __WIN32__
-       m_mutex = CreateMutex(NULL, FALSE, NULL);
+       InitializeCriticalSectionAndSpinCount(&m_mutex, min (assignments, 8) * 0x100);
 #endif
 }
 
@@ -35,7 +39,7 @@ ReMutex::~ReMutex() {
 #if defined __linux__
        sem_destroy(&m_mutex);
 #elif defined __WIN32__
-       CloseMutex(m_mutex);
+       DeleteCriticalSection(&m_mutex);
 #endif
 }
 
@@ -47,7 +51,12 @@ bool ReMutex::timedLock(int sec) {
        time.tv_nsec = 0;
        rc = sem_timedwait(&m_mutex, &time) == 0;
 #elif defined __WIN32__
-
+       int maxCount = sec * 50;
+       int count = 0;
+       while(TryEnterCriticalSection(&m_mutex) != 0 && ++count < maxCount){
+               Sleep(20);
+       }
+       rc = count < maxCount;
 #endif
        return rc;
 }

diff --git a/base/ReMutex.hpp b/base/ReMutex.hpp
index 138a05b9ef744b74456d4028dfbc35b4ac2eaf54..04310b652eb7d70cd0f07c6faca964877d5df42f 100644 (file)
--- a/base/ReMutex.hpp
+++ b/base/ReMutex.hpp
@@ -12,7 +12,7 @@
 
 class ReMutex {
 public:
-       ReMutex(int location, int maxWaitSec = -1);
+       ReMutex(int location, int maxWaitSec = -1, int spinCount = 0);
        virtual ~ReMutex();
 public:
        bool timedLock(int sec = -1);
@@ -20,21 +20,21 @@ public:
 #if defined __linux__
                sem_wait(&m_mutex);
 #elif defined __WIN32__
-#error "mutex in ReMutex missed"
+               EnterCriticalSection(&m_mutex);
 #endif
        }
        inline void unlock() {
 #if defined __linux__
                sem_post(&m_mutex);
 #elif defined __WIN32__
-#error "mutex in ReMutex missed"
+               LeaveCriticalSection(&m_mutex);
 #endif
        }
 private:
 #if defined __linux__
        sem_t m_mutex;
 #elif defined __WIN32__
-       HANDLE m_mutex;
+       CRITICAL_SECTION m_mutex;
 #endif
        int m_maxWaitSec;
 };

diff --git a/base/ReThread.cpp b/base/ReThread.cpp
index 7a06693ad0ec6f4f7cec1fc858f6ed7b8f333c43..95706a90e160b2cd5a830343cf526bb0fe2a0b0e 100644 (file)
--- a/base/ReThread.cpp
+++ b/base/ReThread.cpp
@@ -32,7 +32,8 @@ ReThread::ReThread(bool autoDelete) :
 #if defined __linux__\r
            m_threadInfo(),\r
 #elif defined __WIN32__\r
-           m_threadInfo(UNDEF_HANDLE),\r
+           m_threadInfo(NULL),\r
+               m_osThreadId(0),\r
 #endif\r
            m_shouldStop(false),\r
            m_isStopped(false),\r
@@ -69,7 +70,7 @@ void ReThread::kill() {
 #if defined __linux__\r
        pthread_kill(m_threadInfo, SIGKILL);\r
 #elif defined __WIN32__\r
-       KillThread(m_threadInfo);\r
+       TerminateThread(m_threadInfo, 254);\r
 #endif\r
 }\r
 /**\r
@@ -110,7 +111,7 @@ void ReThread::runAndFinish() {
 #if defined __linux__\r
        pthread_exit(NULL);\r
 #elif defined __WIN32__\r
-       StopThread(m_threadInfo);\r
+       // Nothing to do\r
 #endif\r
        m_isStopped = true;\r
 }\r
@@ -220,7 +221,7 @@ void ReThreadPool::killAllThreads() {
                }\r
                m_mutexThreads.unlock();\r
                if (countWaiting > 0)\r
-                       sleep(1);\r
+                       millisecSleep(1000);\r
        }\r
        // now we kill:\r
        countWaiting = 0;\r
@@ -240,7 +241,7 @@ void ReThreadPool::killAllThreads() {
        }\r
        if (countWaiting > 0)\r
                // wait 1 msec for end of kill:\r
-               usleep(1000);\r
+               millisecSleep(1);\r
        // we destroy all threads marked with auto delete:\r
        m_mutexThreads.lock();\r
        for (int ii = 0; ii < m_maxThreads; ii++) {\r
@@ -282,7 +283,7 @@ void* globalThreadStarterFunction(void *pConnection) {
        return NULL;\r
 }\r
 #elif defined __WIN32__\r
-DWORD WINAPI globalThreadStarterFunction(_In_ LPVOID pParameter) {\r
+DWORD WINAPI globalThreadStarterFunction(_In_ LPVOID pConnection) {\r
        ReThread* thread = reinterpret_cast<ReThread*>(pConnection);\r
        thread->runAndFinish();\r
        return 0;\r
@@ -310,9 +311,8 @@ bool ReThreadPool::startThread(ReThread* thread) {
                            globalThreadStarterFunction, reinterpret_cast<void*>(thread))\r
                            >= 0;\r
 #elif defined __WIN32__\r
-                       HANDLE threadHandle;\r
-                       ok = (threadHandle = CreateThread(NULL, 0, globalThreadStarterFunction,\r
-                                       &thread, 0)) != NULL;\r
+                       ok = (thread->m_threadInfo = CreateThread(NULL, 0, globalThreadStarterFunction,\r
+                                       reinterpret_cast<void*>(thread), 0, &thread->m_osThreadId)) != NULL;\r
 #endif\r
                        if (!ok)\r
                                m_logger->sayF(LOG_ERROR | CAT_PROCESS, LC_START_THREAD_1,\r
@@ -350,7 +350,7 @@ bool ReThreadPool::waitForAlmostAll(int mayResist, int timeoutSec) {
                        rc = true;\r
                        break;\r
                }\r
-               usleep(200 * 1000);\r
+               millisecSleep(200);\r
                now = time(NULL);\r
        } while (now < start + timeoutSec);\r
        return rc;\r

diff --git a/base/ReThread.hpp b/base/ReThread.hpp
index e9ea9730619752b4b34e42f94208a68e8984d5ee..0d970e7c4083dc9d4f930049a3bc770a2107b906 100644 (file)
--- a/base/ReThread.hpp
+++ b/base/ReThread.hpp
@@ -39,7 +39,6 @@ public:
        inline void setShouldStop(bool value) {\r
                m_shouldStop = value;\r
        }\r
-private:\r
 private:\r
        friend class ReThreadPool;\r
        void kill();\r
@@ -59,6 +58,7 @@ protected:
        pthread_t m_threadInfo;\r
 #elif defined __WIN32__\r
        HANDLE m_threadInfo;\r
+       DWORD m_osThreadId;\r
 #endif\r
        bool m_shouldStop;\r
        bool m_isStopped;\r

diff --git a/base/rebase.hpp b/base/rebase.hpp
index 965a99eeef1d4b8827c8c39d6ab2ece62f41ac6c..6a109f0d12183cbf993620dae43025e5d6f97209 100644 (file)
--- a/base/rebase.hpp
+++ b/base/rebase.hpp
@@ -7,6 +7,8 @@
  * The latest sources: https://github.com/republib\r
  */\r
 #ifndef REBASE_HPP_\r
+#define min()\r
+#define max()\r
 #define REBASE_HPP_\r
 #include <stdlib.h>\r
 #include <string.h>\r
@@ -51,6 +53,7 @@ typedef timespec ReFileTime_t;
 #      define _rmdir(path) rmdir(path)\r
 #      define OS_SEPARATOR_CHAR '/'\r
 #      define OS_SEPARATOR "/"\r
+#      define millisecSleep(msec) usleep(msec*1000)\r
 inline int getLastOSError() {\r
        return errno;\r
 }\r
@@ -58,8 +61,11 @@ inline int getLastOSError() {
 #      include <direct.h>\r
 #      include <WinSock2.h>\r
 #      include <windows.h>\r
+#undef min\r
+#undef max\r
 #      define _memcmp(t,s,n) memcmp(t,s,n)\r
 #      define lstat stat\r
+#      define millisecSleep(msec) Sleep(msec)\r
 #      define OS_SEPARATOR_CHAR '\\'\r
 #      define OS_SEPARATOR "\\"\r
 typedef _int64 int64_t;\r

diff --git a/cunit/cuReTCP.cpp b/cunit/cuReTCP.cpp
index 472e7b20539e0d8d17781d91629b68dd843e3122..e3960d454cfa712aeb015960fa7fdc7bf8495702 100644 (file)
--- a/cunit/cuReTCP.cpp
+++ b/cunit/cuReTCP.cpp
@@ -13,7 +13,7 @@ static int s_port = 58111;
 class TCPThread: public ReThread {
 public:
        TCPThread(const char* task) :
-                   ReThread(999),
+                   ReThread(true),
                    m_task(task) {
        }
 public:
@@ -77,14 +77,14 @@ public:
                                client.receive(command, answer);
                        }
                        int64_t duration = ReBaseUtils::milliSecSince(start);
-                       int duration2 = time(NULL) - start2;
+                       int duration2 = int(time(NULL) - start2);
                        if (duration2 == 0)
                                duration2 = 1;
                        char msg[256];
                        int miByte = count * (size / (1024 * 1024));
-                       snprintf(msg, sizeof msg,
+                       _snprintf(msg, sizeof msg,
                            "%s: %d MiByte in %s/%d sec: %.3f (%.3f) MiByte/sec", direction,
-                           miByte, ReByteBuffer("").appendMilliSec(duration).str(),
+                           miByte, ReByteBuffer("").appendMilliSec((int) duration).str(),
                            duration2, miByte * 1000.0 / (double) duration,
                            miByte / (double) duration2);
                        logger->say(LOG_INFO | CAT_LIB, location, msg);

diff --git a/net/ReTCP.cpp b/net/ReTCP.cpp
index 313341d735d34d6e3658ed28b7343e8af753ee28..a1a2cf0fd458c3193018b3d3112fafdd498b6d32 100644 (file)
--- a/net/ReTCP.cpp
+++ b/net/ReTCP.cpp
@@ -114,9 +114,12 @@ void ReSocketAddress::setAddress(const char* ip, int port) {
  *
  * @param logger       logger for the error handling
  */
+#pragma warning( push )\r
+#pragma warning( disable : 4355 )\r
 ReTCPClient::ReTCPClient(ReLogger* logger) :
            ReTCPConnection(-1, this),
            m_logger(logger) {
+#pragma warning( pop )
 }
 /**
  * Destructor.
@@ -187,11 +190,10 @@ ReTCPConnection::ReTCPConnection(int id, ReLoggerOwner* loggerOwner) :
 #if defined __WIN32__
        WSADATA wsaData;
        if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) {
-               m_logger->sayF(LOG_ERROR | CAT_NETWORK, LC_TCP_CONNECTION_1,
+               loggerOwner->logger()->sayF(LOG_ERROR | CAT_NETWORK, LC_TCP_CONNECTION_1,
                        i18n("WSAStartup() failed: $1")).arg(errno).arg(getLastOSError()).end();
                throw ReException("WSAStartup() failed");
        }
-
 #endif
 }
 
@@ -347,10 +349,13 @@ void ReTCPConnection::send(const char* command, const char* data, int length) {
  * @param id           an identifier for logging
  * @param logger       the logger for error handling
  */
+#pragma warning( push )\r
+#pragma warning( disable : 4355 )\r
 ReTCPServerConnection::ReTCPServerConnection(int id, ReTCPServer* server) :
            ReTCPConnection(id, this),
            ReThread(true),
            m_server(server) {
+#pragma warning( pop )\r
 }
 
 /**
@@ -389,6 +394,8 @@ void ReTCPServerConnection::run() {
  * @param logger                       the logger for error handling
  * @param maxConnections       maximal count of threads handling a connection
  */
+#pragma warning( push )\r
+#pragma warning( disable : 4355 )\r
 ReTCPServer::ReTCPServer(int port, class ReNetCommandHandler& commandHandler,
     ReLogger* logger, int maxConnections) :
            ReTCPConnection(0, this),
@@ -397,6 +404,7 @@ ReTCPServer::ReTCPServer(int port, class ReNetCommandHandler& commandHandler,
            m_connections(new ReTCPServerConnection*[maxConnections]),
            m_handler(commandHandler),
            m_logger(logger) {
+#pragma warning( pop )
        m_port = port;
        memset(m_connections, 0, maxConnections * sizeof *m_connections);
 }
@@ -569,9 +577,12 @@ void ReNetCommandHandler::addHandler(ReNetCommandHandler* handler) {
  * @param port         port for listening
  * @param logger       logger for error handling
  */
+#pragma warning( push )\r
+#pragma warning( disable : 4355 )\r
 ReTCPEchoServer::ReTCPEchoServer(int port, ReLogger* logger) :
            ReTCPServer(port, *this, logger),
            ReNetCommandHandler() {
+#pragma warning( pop )
 }
 /**
  * Destructor.

diff --git a/os/ReDirTools.cpp b/os/ReDirTools.cpp
index d9f95ca5e7f1bdcf36abe8604ecc34b336267458..eb5b261c3cd37fb34e31c92c75cb04f89f5fc2e3 100644 (file)
--- a/os/ReDirTools.cpp
+++ b/os/ReDirTools.cpp
@@ -687,6 +687,8 @@ void ReDirOptions::setFilterFromProgramArgs(ReDirEntryFilter_t& filter) {
  *                                             directory will be added as argument\r
  * @param logger               logger for error messages\r
  */\r
+#pragma warning( push )\r
+#pragma warning( disable : 4355 )\r
 ReTool::ReTool(const char* usage[], const char* example[], int minArguments,\r
     int reservedFirst, int reservedLast, bool addCurrentDirIfNoArguments,\r
     ReLogger* logger) :\r
@@ -701,6 +703,7 @@ ReTool::ReTool(const char* usage[], const char* example[], int minArguments,
            m_filter(),\r
            m_start(time(NULL)),\r
            m_logger(logger) {\r
+#pragma warning( pop )\r
 }\r
 \r
 /**\r
@@ -2387,7 +2390,6 @@ void ReDirTCP::doIt() {
                ReTCPClient client(m_logger);\r
                if (client.connect(ip, port)) {\r
                        time_t start = time(NULL);\r
-                       int64_t millisec;\r
                        ReByteBuffer message;\r
                        message.appendChar('x', bufferSize);\r
                        time_t lastPrint = start;\r