Changes in uspace/lib/posix/src/time.c [cc36562b:5f97ef44] in mainline

File:

• uspace/lib/posix/src/time.c (modified) (6 diffs)

uspace/lib/posix/src/time.c

@@ -35 +35 @@
 
 #include "internal/common.h"
-#include "posix/sys/types.h"
-#include "posix/sys/time.h"
 #include "posix/time.h"
 
@@ -49 +47 @@
 #include "libc/malloc.h"
 #include "libc/task.h"
+#include "libc/stats.h"
 #include "libc/stddef.h"
-#include "libc/time.h"
+#include "libc/sys/time.h"
 
 // TODO: test everything in this file
@@ -220 +219 @@
         case CLOCK_REALTIME:
                 res->tv_sec = 0;
-                res->tv_nsec = USEC2NSEC(1); /* Microsecond resolution. */
+                res->tv_nsec = 1000; /* Microsecond resolution. */
                 return 0;
         default:
@@ -245 +244 @@
                 gettimeofday(&tv, NULL);
                 tp->tv_sec = tv.tv_sec;
-                tp->tv_nsec = USEC2NSEC(tv.tv_usec);
+                tp->tv_nsec = tv.tv_usec * 1000;
                 return 0;
         default:
@@ -301 +300 @@
                 }
                 if (rqtp->tv_nsec != 0) {
-                        fibril_usleep(NSEC2USEC(rqtp->tv_nsec));
+                        fibril_usleep(rqtp->tv_nsec / 1000);
                 }
                 return 0;
@@ -310 +309 @@
 }
 
-int gettimeofday(struct timeval *tv, void *tz)
-{
-        struct timespec ts;
-
-        getrealtime(&ts);
-        tv->tv_sec = ts.tv_sec;
-        tv->tv_usec = NSEC2USEC(ts.tv_nsec);
-
-        return 0;
+/**
+ * Get CPU time used since the process invocation.
+ *
+ * @return Consumed CPU cycles by this process or -1 if not available.
+ */
+clock_t clock(void)
+{
+        clock_t total_cycles = -1;
+        stats_task_t *task_stats = stats_get_task(task_get_id());
+        if (task_stats) {
+                total_cycles = (clock_t) (task_stats->kcycles +
+                    task_stats->ucycles);
+                free(task_stats);
+                task_stats = 0;
+        }
+
+        return total_cycles;
 }