[netperf-dev] netperf4 commit notice r157 - branches/glib_migration/src

[raj at netperf.org]

Author: raj
Date: 2006-04-14 10:56:21 -0700 (Fri, 14 Apr 2006)
New Revision: 157

Modified:
   branches/glib_migration/src/nettest_bsd.c
   branches/glib_migration/src/nettest_bsd.h
Log:
64-bit Windows cleanups

Modified: branches/glib_migration/src/nettest_bsd.c
===================================================================
--- branches/glib_migration/src/nettest_bsd.c	2006-04-14 17:35:52 UTC (rev 156)
+++ branches/glib_migration/src/nettest_bsd.c	2006-04-14 17:56:21 UTC (rev 157)
@@ -504,9 +504,17 @@
       first_link = temp_link;
     }
     temp_link->buffer_base = (char *)g_malloc(malloc_size);
+#ifndef G_OS_WIN32
     temp_link->buffer_ptr = (char *)(( (long)(temp_link->buffer_base) +
                           (long)alignment - 1) &
                          ~((long)alignment - 1));
+#else
+    /* 64-bit Windows is P64, not LP64 like the rest of the world, 
+       so we cannot cast as a "long" */
+    temp_link->buffer_ptr = (char *)(( (ULONG_PTR)(temp_link->buffer_base) +
+                          (long)alignment - 1) &
+                         ~((long)alignment - 1));
+#endif
     temp_link->buffer_ptr += offset;
     /* is where the buffer fill code goes. */
     if (do_fill) {
@@ -544,7 +552,7 @@
  /* called by either the netperf or netserver programs, all output */
  /* should be directed towards "where." family is generally AF_INET, */
  /* and type will be either SOCK_STREAM or SOCK_DGRAM */
-static int
+static SOCKET
 create_data_socket(test)
   test_t *test;
 {
@@ -557,7 +565,7 @@
   int loc_sndavoid     = my_data->send_avoid;
   int loc_rcvavoid     = my_data->recv_avoid;
 
-  int temp_socket;
+  SOCKET temp_socket;
   int one;
   netperf_socklen_t sock_opt_len;
 
@@ -1063,7 +1071,7 @@
 recv_tcp_stream_preinit(test_t *test)
 {
   int               rc;         
-  int               s_listen;
+  SOCKET           s_listen;
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   myaddr;
@@ -1120,7 +1128,7 @@
 static uint32_t
 recv_tcp_stream_init(test_t *test)
 {
-  int               s_data;
+  SOCKET            s_data;
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;
@@ -1650,7 +1658,7 @@
 recv_tcp_rr_preinit(test_t *test)
 {
   int               rc;
-  int               s_listen;
+  SOCKET           s_listen;
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   myaddr;
@@ -1712,7 +1720,7 @@
 static uint32_t
 recv_tcp_rr_init(test_t *test)
 {
-  int               s_data;
+  SOCKET             s_data;
   bsd_data_t       *my_data;
   char             *proc_name;
   struct sockaddr   peeraddr;

Modified: branches/glib_migration/src/nettest_bsd.h
===================================================================
--- branches/glib_migration/src/nettest_bsd.h	2006-04-14 17:35:52 UTC (rev 156)
+++ branches/glib_migration/src/nettest_bsd.h	2006-04-14 17:56:21 UTC (rev 157)
@@ -59,8 +59,8 @@
   struct addrinfo *locaddr;        /* local address informtion */
   struct addrinfo *remaddr;        /* remote address informtion */
 
-  int              s_listen;       /* listen sockets for catching type tests */
-  int              s_data;         /* data socket for executing tests */
+  SOCKET           s_listen;       /* listen sockets for catching type tests */
+  SOCKET           s_data;         /* data socket for executing tests */
 
   struct ring_elt *send_ring;      /* address of the send_ring */
   struct ring_elt *recv_ring;      /* address of the recv_ring */