Changeset 1376:b8afaf63f65a in freeDiameter for libfdproto

Timestamp:

Jun 20, 2019, 6:33:29 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Handle case where pthread_cond_timedwait returns EINVAL if abstime
has passed before it was called.

File:

• libfdproto/sessions.c (modified) (1 diff)

libfdproto/sessions.c

@@ -207 +207 @@
                 /* If first session is not expired, we just wait until it happens */
                 if ( TS_IS_INFERIOR( &now, &first->timeout ) ) {
-                        CHECK_POSIX_DO2(  pthread_cond_timedwait( &exp_cond, &exp_lock, &first->timeout ),
-                                        ETIMEDOUT, /* ETIMEDOUT is a normal error, continue */,
-                                        /* on other error, */ break );
-
-                        /* on wakeup, loop */
-                        goto again;
+                        int ret;
+
+                        ret = pthread_cond_timedwait(&exp_cond, &exp_lock, &first->timeout);
+                        switch (ret) {
+                        case 0:
+                        case ETIMEDOUT:
+                                /* on wakeup or time-out, loop */
+                                goto again;
+                        case EINVAL:
+                                if (clock_gettime(CLOCK_REALTIME, &now) < 0) {
+                                        break;
+                                }
+                                if (TS_IS_INFERIOR(&now, &first->timeout)) {
+                                        TRACE_DEBUG(FULL, "'pthread_cond_timedwait(&exp_cond, &exp_lock, &first->timeout)' : timer expired before loop could start");
+                                        goto again;
+                                }
+                                /* FALLTHROUGH */
+                        default:
+                                TRACE_ERROR("ERROR: in 'pthread_cond_timedwait(&exp_cond, &exp_lock, &first->timeout)' :\t%s", strerror(ret));
+                                break;
+                        }
                 }