[netperf-dev] netperf4 commit notice r146 - in branches/glib_migration/src: . NetPerfDir NetServerDir

[raj at netperf.org]

Author: raj
Date: 2006-04-11 16:04:18 -0700 (Tue, 11 Apr 2006)
New Revision: 146

Modified:
   branches/glib_migration/src/NetPerfDir/sources
   branches/glib_migration/src/NetServerDir/sources
   branches/glib_migration/src/netlib_windows.c
Log:
Fix errors found in actual compile of netlib_windows :)

Modified: branches/glib_migration/src/NetPerfDir/sources
===================================================================
--- branches/glib_migration/src/NetPerfDir/sources	2006-04-11 22:59:05 UTC (rev 145)
+++ branches/glib_migration/src/NetPerfDir/sources	2006-04-11 23:04:18 UTC (rev 146)
@@ -27,6 +27,6 @@
 	..\netperf.c \
 	..\netlib.c \
 	..\netconfidence.c \
-	..\netlib_none.c \
+	..\netlib_windows.c \
 	..\netmsg.c
 

Modified: branches/glib_migration/src/NetServerDir/sources
===================================================================
--- branches/glib_migration/src/NetServerDir/sources	2006-04-11 22:59:05 UTC (rev 145)
+++ branches/glib_migration/src/NetServerDir/sources	2006-04-11 23:04:18 UTC (rev 146)
@@ -24,7 +24,7 @@
 C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DNETPERFDIR="\"foo\"" -DLIBDIR="\"bar\"" -DHAVE_CONFIG_H  -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS
 
 SOURCES= \
-        ..\netlib_none.c \
+        ..\netlib_windows.c \
 	..\netlib.c \
 	..\netconfidence.c \
 	..\netmsg.c \

Modified: branches/glib_migration/src/netlib_windows.c
===================================================================
--- branches/glib_migration/src/netlib_windows.c	2006-04-11 22:59:05 UTC (rev 145)
+++ branches/glib_migration/src/netlib_windows.c	2006-04-11 23:04:18 UTC (rev 146)
@@ -36,22 +36,21 @@
 #include "config.h"
 #endif
 
-#include <sys/processor.h>
-#include <sys/thread.h>
+#include <windows.h>
 
 #include "netperf.h"
 
 int
 set_thread_locality(void  *threadid, char *loc_type, char *loc_value, int debug, FILE *where) {
   int err, value;
-  Handle thread_id;
+  HANDLE thread_id;
   ULONG_PTR AffinityMask;
 
   NETPERF_DEBUG_ENTRY(debug,where);
 
   err = NPE_SUCCESS;
   if (threadid) {
-    thread_id = *(Handle *)(threadid);
+    thread_id = *(HANDLE *)(threadid);
     value = atoi(loc_value);
     
     AffinityMask = (ULONG_PTR)1 << value;
@@ -107,9 +106,9 @@
 int 
 set_own_locality(char *loc_type, char *loc_value, int debug, FILE *where) {
 
-  Handle my_id;
+  HANDLE my_id;
 
-  /* we can use GetCurrentThread() here because the Handle is going to
+  /* we can use GetCurrentThread() here because the HANDLE is going to
      be references only in the context of the current thread */
   my_id = GetCurrentThread();