Changeset 1200:ce2b00dc86c1 in freeDiameter for libfdcore/sctp.c

Timestamp:

Jun 14, 2013, 11:14:11 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

React quickly to head-of-the-line blocking in case of network failure. Can be adapted with MAX_HOTL_BLOCKING_TIME constant in cnxctx.h

File:

• libfdcore/sctp.c (modified) (2 diffs)

libfdcore/sctp.c

@@ -1084 +1084 @@
 #endif /* OLD_SCTP_SOCKET_API */
         ssize_t ret;
-        int timedout = 0;
+        struct timespec ts, now;
         
         TRACE_ENTRY("%p %hu %p %d", conn, strid, iov, iovcnt);
         CHECK_PARAMS_DO(conn && iov && iovcnt, { errno = EINVAL; return -1; } );
+        CHECK_SYS_DO(  clock_gettime(CLOCK_REALTIME, &ts), return -1 );
         
         memset(&mhdr, 0, sizeof(mhdr));
@@ -1121 +1122 @@
         if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
                 pthread_testcancel();
-                if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
+                /* Check how much time we were blocked for this sending. */
+                CHECK_SYS_DO(  clock_gettime(CLOCK_REALTIME, &now), return -1 );
+                if ( ((now.tv_sec - ts.tv_sec) * 1000 + ((now.tv_nsec - ts.tv_nsec) / 1000000L)) > MAX_HOTL_BLOCKING_TIME) {
+                        LOG_D("Unable to send any data for %dms, closing the connection", MAX_HOTL_BLOCKING_TIME);
+                } else if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING )) {
                         goto again; /* don't care, just ignore */
-                if (!timedout) {
-                        timedout ++; /* allow for one timeout while closing */
-                        goto again;
-                }
+                }
+                
+                /* propagate the error */
+                errno = -ret;
+                ret = -1;
         }