Changeset 2d1fde3b in mainline

Timestamp:

2006-05-28T22:26:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c042bdd

Parents:

0b99e40

Message:

Correct realtime clock communication

File:

• libc/generic/time.c (modified) (3 diffs)

libc/generic/time.c

@@ -39 +39 @@
 /* Pointers to public variables with time */
 struct {
-        volatile sysarg_t seconds;
+        volatile sysarg_t seconds1;
         volatile sysarg_t useconds;
-        volatile sysarg_t useconds2;
+        volatile sysarg_t seconds2;
 } *ktime = NULL;
 
@@ -58 +58 @@
 {
         void *mapping;
-        sysarg_t seconds,useconds;
+        sysarg_t s1, s2;
         sysarg_t t1;
         int res;
@@ -79 +79 @@
         tz->tz_dsttime = DST_NONE;
 retry:
-        seconds = ktime->seconds;
-        read_barrier();
+        s1 = ktime->seconds1;
         tv->tv_usec = ktime->useconds;
         read_barrier();
-        tv->tv_sec = ktime->seconds;
-        if (tv->tv_usec == 0 && seconds == tv->tv_sec && 
-            ktime->useconds2 != 0) {
-                read_barrier();
-                goto retry;
-        }
-
-        if (seconds != tv->tv_sec)
-                tv->tv_usec = ktime->useconds;
+        s2 = ktime->seconds2;
+        if (s1 != s2) {
+                tv->tv_usec = 0;
+                tv->tv_sec = s1 > s2 ? s1 : s2;
+        } else
+                tv->tv_sec = s1;
 
         return 0;