CDRIVER-826: Improve errno handling

We need to capture failure reasons on Windows properly too

Author: bjori

src/mongoc/mongoc-buffer.c

@@ -16,7 +16,6 @@
 
 
 #include <bson.h>
-#include <errno.h>
 #include <stdarg.h>
 
 #include "mongoc-error.h"

src/mongoc/mongoc-cluster.c

@@ -17,7 +17,6 @@
 
 #include "mongoc-config.h"
 
-#include <errno.h>
 #ifdef MONGOC_ENABLE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -2236,7 +2235,6 @@ mongoc_cluster_sendv_to_server (mongoc_cluster_t              *cluster,
 
    iov = (mongoc_iovec_t *)cluster->iov.data;
    iovcnt = cluster->iov.len;
-   errno = 0;
 
    BSON_ASSERT (cluster->iov.len);
 

src/mongoc/mongoc-socket.c

@@ -167,6 +167,7 @@ _mongoc_socket_wait (int      sd,           /* IN */
       } else if (ret < 0) {
          /* poll itself failed */
 
+         TRACE("errno is: %d", errno);
          if (MONGOC_ERRNO_IS_AGAIN(errno)) {
             now = bson_get_monotonic_time();
 
@@ -342,6 +343,7 @@ _mongoc_socket_capture_errno (mongoc_socket_t *sock) /* IN */
 #else
    sock->errno_ = errno;
 #endif
+   TRACE("setting errno: %d", sock->errno_);
 }
 
 
@@ -365,6 +367,7 @@ _mongoc_socket_capture_errno (mongoc_socket_t *sock) /* IN */
 static bool
 _mongoc_socket_errno_is_again (mongoc_socket_t *sock) /* IN */
 {
+   TRACE("errno is: %d", sock->errno_);
    return MONGOC_ERRNO_IS_AGAIN (sock->errno_);
 }
 
@@ -437,7 +440,6 @@ mongoc_socket_accept_ex (mongoc_socket_t *sock,      /* IN */
    sd = accept (sock->sd, (struct sockaddr *) &addr, &addrlen);
 
    _mongoc_socket_capture_errno (sock);
-
 #ifdef _WIN32
    failed = (sd == INVALID_SOCKET);
 #else
@@ -801,7 +803,6 @@ mongoc_socket_recv (mongoc_socket_t *sock,      /* IN */
 {
    ssize_t ret = 0;
    bool failed = false;
-   bool try_again = false;
 
    ENTRY;
 
@@ -820,11 +821,8 @@ mongoc_socket_recv (mongoc_socket_t *sock,      /* IN */
 #endif
    if (failed) {
       _mongoc_socket_capture_errno (sock);
-   }
-   try_again = (failed && _mongoc_socket_errno_is_again (sock));
-
-   if (failed && try_again) {
-      if (_mongoc_socket_wait (sock->sd, POLLIN, expire_at)) {
+      if (_mongoc_socket_errno_is_again (sock) &&
+          _mongoc_socket_wait (sock->sd, POLLIN, expire_at)) {
          GOTO (again);
       }
    }
@@ -1025,27 +1023,30 @@ _mongoc_socket_try_sendv (mongoc_socket_t *sock,   /* IN */
    ret = sendmsg (sock->sd, &msg,
 # ifdef MSG_NOSIGNAL
                   MSG_NOSIGNAL);
-#else
+# else
                   0);
 # endif
 #endif
 
-   TRACE("Send %ld out of %ld bytes (errno=%d)", ret, iov->iov_len, errno);
-   /*
-    * Check to see if we have sent an iovec too large for sendmsg to
-    * complete. If so, we need to fallback to the slow path of multiple
-    * send() commands.
-    */
+   TRACE("Send %ld out of %ld bytes", ret, iov->iov_len);
+
+   if (ret == -1) {
+      _mongoc_socket_capture_errno (sock);
+
+      /*
+       * Check to see if we have sent an iovec too large for sendmsg to
+       * complete. If so, we need to fallback to the slow path of multiple
+       * send() commands.
+       */
 #ifdef _WIN32
-   if ((ret == -1) && (errno == WSAEMSGSIZE)) {
+      if (errno == WSAEMSGSIZE) {
 #else
-   if ((ret == -1) && (errno == EMSGSIZE)) {
+      if (errno == EMSGSIZE) {
 #endif
-      RETURN(_mongoc_socket_try_sendv_slow (sock, iov, iovcnt));
+         RETURN(_mongoc_socket_try_sendv_slow (sock, iov, iovcnt));
+      }
    }
 
-   _mongoc_socket_capture_errno (sock);
-
    RETURN (ret);
 }