Changeset 3a58347 in mainline

Timestamp:

2012-08-13T14:15:57Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

45cbcaf4

Parents:

43e660c

Message:

The gettimeofday() function now asks for the current time to the real time clock driver, if present.
Add the getuptime() function which returns the system uptime.

Location:

uspace/lib/c

Files:

• generic/time.c (modified) (4 diffs)
• include/sys/time.h (modified) (1 diff)

uspace/lib/c/generic/time.c

@@ -50 +50 @@
 #include <assert.h>
 #include <unistd.h>
+#include <loc.h>
+#include <device/clock_dev.h>
+#include <malloc.h>
 
 #define ASCTIME_BUF_LEN 26
@@ -480 +483 @@
  */
 int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+        int rc;
+        struct tm t;
+        category_id_t cat_id;
+        size_t svc_cnt;
+        service_id_t *svc_ids = NULL;
+        service_id_t svc_id;
+        char *svc_name = NULL;
+
+        static async_sess_t *clock_conn = NULL;
+
+        if (tz) {
+                tz->tz_minuteswest = 0;
+                tz->tz_dsttime = DST_NONE;
+        }
+
+        if (clock_conn == NULL) {
+                rc = loc_category_get_id("clock", &cat_id, IPC_FLAG_BLOCKING);
+                if (rc != EOK)
+                        goto ret_uptime;
+
+                rc = loc_category_get_svcs(cat_id, &svc_ids, &svc_cnt);
+                if (rc != EOK)
+                        goto ret_uptime;
+
+                if (svc_cnt == 0)
+                        goto ret_uptime;
+
+                rc = loc_service_get_name(svc_ids[0], &svc_name);
+                if (rc != EOK)
+                        goto ret_uptime;
+
+                rc = loc_service_get_id(svc_name, &svc_id, 0);
+                if (rc != EOK)
+                        goto ret_uptime;
+
+                clock_conn = loc_service_connect(EXCHANGE_SERIALIZE,
+                    svc_id, IPC_FLAG_BLOCKING);
+                if (!clock_conn)
+                        goto ret_uptime;
+        }
+
+        rc = clock_dev_time_get(clock_conn, &t);
+        if (rc != EOK)
+                goto ret_uptime;
+
+        tv->tv_usec = 0;
+        tv->tv_sec = mktime(&t);
+
+        free(svc_name);
+        free(svc_ids);
+
+        return EOK;
+
+ret_uptime:
+
+        free(svc_name);
+        free(svc_ids);
+
+        return getuptime(tv);
+}
+
+int getuptime(struct timeval *tv)
 {
         if (ktime == NULL) {
@@ -501 +567 @@
         }
         
-        if (tz) {
-                tz->tz_minuteswest = 0;
-                tz->tz_dsttime = DST_NONE;
-        }
-        
         sysarg_t s2 = ktime->seconds2;
         
@@ -519 +580 @@
         } else
                 tv->tv_sec = s1;
-        
+
         return 0;
 }

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

@@ -76 +76 @@
 extern int tv_gteq(struct timeval *tv1, struct timeval *tv2);
 extern int gettimeofday(struct timeval *tv, struct timezone *tz);
+extern int getuptime(struct timeval *tv);
 
 extern void udelay(useconds_t);