Changeset daa90e8 in mainline

Timestamp:

2007-07-02T18:30:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b63b6b

Parents:

f2f0392

Message:

Remove duplicit and empty time.h from libc.
Move timeval functions from async.c to time.c.

Location:

uspace/lib/libc

Files:

• generic/async.c (modified) (2 diffs)
• generic/time.c (modified) (1 diff)
• include/sys/time.h (modified) (1 diff)
• include/time.h (deleted)

uspace/lib/libc/generic/async.c

@@ -100 +100 @@
 #include <assert.h>
 #include <errno.h>
-#include <time.h>
+#include <sys/time.h>
 #include <arch/barrier.h>
 
@@ -161 +161 @@
 static async_client_conn_t client_connection = default_client_connection;
 static async_client_conn_t interrupt_received = default_interrupt_received;
-
-/** Add microseconds to give timeval */
-static void tv_add(struct timeval *tv, suseconds_t usecs)
-{
-        tv->tv_sec += usecs / 1000000;
-        tv->tv_usec += usecs % 1000000;
-        if (tv->tv_usec > 1000000) {
-                tv->tv_sec++;
-                tv->tv_usec -= 1000000;
-        }
-}
-
-/** Subtract 2 timevals, return microseconds difference */
-static suseconds_t tv_sub(struct timeval *tv1, struct timeval *tv2)
-{
-        suseconds_t result;
-
-        result = tv1->tv_usec - tv2->tv_usec;
-        result += (tv1->tv_sec - tv2->tv_sec) * 1000000;
-
-        return result;
-}
-
-/** Compare timeval
- *
- * @return 1 if tv1 > tv2, otherwise 0
- */
-static int tv_gt(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;
-}
-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 */

uspace/lib/libc/generic/time.c

@@ -54 +54 @@
         volatile sysarg_t seconds2;
 } *ktime = NULL;
+
+/** Add microseconds to given timeval.
+ *
+ * @param tv            Destination timeval.
+ * @param usecs         Number of microseconds to add.
+ */
+void tv_add(struct timeval *tv, suseconds_t usecs)
+{
+        tv->tv_sec += usecs / 1000000;
+        tv->tv_usec += usecs % 1000000;
+        if (tv->tv_usec > 1000000) {
+                tv->tv_sec++;
+                tv->tv_usec -= 1000000;
+        }
+}
+
+/** Subtract two timevals.
+ *
+ * @param tv1           First timeval.
+ * @param tv2           Second timeval.
+ *
+ * @return              Return difference between tv1 and tv2 (tv1 - tv2) in
+ *                      microseconds.
+ */
+suseconds_t tv_sub(struct timeval *tv1, struct timeval *tv2)
+{
+        suseconds_t result;
+
+        result = tv1->tv_usec - tv2->tv_usec;
+        result += (tv1->tv_sec - tv2->tv_sec) * 1000000;
+
+        return result;
+}
+
+/** Decide if one timeval is greater than the other.
+ *
+ * @param t1            First timeval.
+ * @param t2            Second timeval.
+ *
+ * @return              Return true tv1 is greater than tv2. Otherwise return
+ *                      false.
+ */
+int tv_gt(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;
+}
+
+/** Decide if one timeval is greater than or equal to the other.
+ *
+ * @param tv1           First timeval.
+ * @param tv2           Second timeval.
+ *
+ * @return              Return true if tv1 is greater than or equal to tv2.
+ *                      Otherwise return false.
+ */
+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;
+}
 
 

uspace/lib/libc/include/sys/time.h

@@ -53 +53 @@
 };
 
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+extern void tv_add(struct timeval *tv, suseconds_t usecs);
+extern suseconds_t tv_sub(struct timeval *tv1, struct timeval *tv2);
+extern int tv_gt(struct timeval *tv1, struct timeval *tv2);
+extern int tv_gteq(struct timeval *tv1, struct timeval *tv2);
+extern int gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif