Changeset c0e674a in mainline for libc/generic/async.c

Timestamp:

2006-05-31T16:15:44Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5052046

Parents:

b27a97bb

Message:

Fix incorrect timeout handling in async framework.
Start tweak the tetris code.

File:

• libc/generic/async.c (modified) (4 diffs)

libc/generic/async.c

@@ -165 +165 @@
         return 0;
 }
+static int tv_gteq(struct timeval *tv1, struct timeval *tv2)
+{
+        if (tv1->tv_sec > tv2->tv_sec)
+                return 1;
+        if (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec >= tv2->tv_usec)
+                return 1;
+        return 0;
+}
 
 /* Hash table functions */
@@ -241 +249 @@
         connection_t *conn;
         
+        assert(PS_connection);
+
         futex_down(&async_futex);
 
@@ -436 +446 @@
                         amsg = list_get_instance(timeout_list.next,amsg_t,link);
                         gettimeofday(&tv,NULL);
-                        if (tv_gt(&tv, &amsg->expires)) {
+                        if (tv_gteq(&tv, &amsg->expires)) {
                                 handle_expired_timeouts();
                                 continue;
@@ -589 +599 @@
         while (tmp != &timeout_list) {
                 cur = list_get_instance(tmp, amsg_t, link);
-                if (tv_gt(&cur->expires, &msg->expires))
+                if (tv_gteq(&cur->expires, &msg->expires))
                         break;
                 tmp = tmp->next;