Changeset 8571

Timestamp:

10/14/10 17:28:16 (3 years ago)

Author:

sampson

Message:

Porting BMI TCP

Location:

branches/windows-client

Files:

• src/io/bmi/bmi_wintcp/bmi-wintcp.c (modified) (4 diffs)
• src/io/bmi/bmi_wintcp/socket-collection.c (modified) (1 diff)
• src/io/bmi/bmi_wintcp/sockio.c (modified) (2 diffs)
• test/io/bmi/test-bmi-client.c (modified) (1 diff)

branches/windows-client/src/io/bmi/bmi_wintcp/bmi-wintcp.c

@@ -2190 +2190 @@
         {
             /* this is a little weird, but we complete the nonblocking
-             * connection by polling */
-            /*
+             * connection by polling */            
             poll_conn.fd = tcp_addr_data->socket;
             poll_conn.events = POLLOUT;
-            ret = poll(&poll_conn, 1, 2);
+            ret = WSAPoll(&poll_conn, 1, 2);
             if ((ret < 0) || (poll_conn.revents & POLLERR))
             {
-                tmp_errno = errno;
-                gossip_lerr("Error: poll: %s\n", strerror(tmp_errno));
+                tmp_errno = WSAGetLastError();
+                gossip_lerr("Error: poll: %d\n", tmp_errno);
                 return (bmi_tcp_errno_to_pvfs(-tmp_errno));
             }
@@ -2205 +2204 @@
                 tcp_addr_data->not_connected = 0;
             }
-            */
+
             /* use select on Windows */
-           fd_set writefds;
+           /*fd_set writefds;
            struct timeval timeout;
 
            timeout.tv_sec = 0;
            timeout.tv_usec = 2000;   /* 2ms */
-
+/*
            FD_ZERO(&writefds);
            FD_SET(tcp_addr_data->socket, &writefds);
@@ -2226 +2225 @@
                tcp_addr_data->not_connected = 0;
            }
+*/
         }
         /* return.  the caller should check the "not_connected" flag to
@@ -2288 +2288 @@
     if (ret < 0)
     {
-        if (ret == -EINPROGRESS)
+        if (ret == -WSAEWOULDBLOCK)
         {
             tcp_addr_data->not_connected = 1;

branches/windows-client/src/io/bmi/bmi_wintcp/socket-collection.c

@@ -314 +314 @@
 
     /* nothing ready, just return */
-    if(ret == 0)
+    if(ret == 0 && !pipe_notify)
     {
         return(0);

branches/windows-client/src/io/bmi/bmi_wintcp/sockio.c

@@ -83 +83 @@
         if (WSAGetLastError() == WSAEINTR)
             goto bind_sock_restart;
-        return(bmi_errno_to_pvfs(-errno));
+        return(bmi_errno_to_pvfs(-WSAGetLastError()));
     }
     return (sockd);
@@ -104 +104 @@
         if (WSAGetLastError() == WSAEINTR)
             goto connect_sock_restart;
-        return(bmi_errno_to_pvfs(-errno));
+        return(bmi_errno_to_pvfs(-WSAGetLastError()));
     }
     return (sockd);

branches/windows-client/test/io/bmi/test-bmi-client.c

@@ -296 +296 @@
     free(user_opts->hostid);
     free(user_opts);
+
+    getchar();
 
     return (0);