Changeset 355 for code/branches/FICN/src/network

Timestamp:

Nov 29, 2007, 6:13:47 PM (17 years ago)

Author:

landauf

Message:

changed retos usleep hack to a more generic solution:
#ifdef WIN32
#include <windows.h>
#define usleep(x) Sleep((x)/1000)

Location:

code/branches/FICN/src/network

Files:

• ClientConnection.cc (modified) (2 diffs)
• PacketBufferTestExt.cc (modified) (2 diffs)
• dummyclient.cc (modified) (2 diffs)
• dummyserver.cc (modified) (2 diffs)

code/branches/FICN/src/network/ClientConnection.cc

@@ -12 +12 @@
 #include "ClientConnection.h"
 
-// workaround for usleep(int) under windows
 #ifdef WIN32
-#include "winbase.h"
+#include <windows.h>
+#define usleep(x) Sleep((x)/1000)
+#else
+#include <unistd.h>
 #endif
 
@@ -39 +41 @@
   bool ClientConnection::waitEstablished(int milisec){
     for(int i=0; i<=milisec && !established; i++)
-// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
-#ifdef WIN32
-      Sleep(1);
-#else
       usleep(1000);
-#endif
+
     return established;
   }

code/branches/FICN/src/network/PacketBufferTestExt.cc

@@ -7 +7 @@
 
 using namespace network;
-
-// workaround for usleep(int) under windows
-#ifdef WIN32
-#include "winbase.h"
-#endif
 
 
@@ -27 +22 @@
     test->push(&event);
     if(i==5)
-// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
-#ifdef WIN32
-      Sleep(200);
-#else
       usleep(200000);
-#endif
   }
   test->setClosed(true);

code/branches/FICN/src/network/dummyclient.cc

@@ -8 +8 @@
 #include <enet/enet.h>
 #include "PacketManager.h"
-
-// workaround for usleep(int) under windows
-#ifdef WIN32
-#include "winbase.h"
-#endif
 
 
@@ -73 +68 @@
       cout << "failed sending" << endl;
     }
-// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
-#ifdef WIN32
-    Sleep(1000);
-#else
     usleep(1000000);
-#endif
   }
 

code/branches/FICN/src/network/dummyserver.cc

@@ -9 +9 @@
 #include "ConnectionManager.h"
 #include "PacketManager.h"
-
-// workaround for usleep(int) under windows
-#ifdef WIN32
-#include "winbase.h"
-#endif
 
 
@@ -28 +23 @@
   while(!quit){
     if(server.queueEmpty())
-// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
-// Warning: Sleep(1) is ten times longer than usleep(100)!
-#ifdef WIN32
-      Sleep(1);
-#else
+// Warning: usleep(100) under windows is ten times longer than with unix!
       usleep(100);
-#endif
     else{
       ENetAddress addr;