Changeset 231b3fd in mainline for uspace/dist/src

Timestamp:

2018-08-25T21:35:26Z (8 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

Location:

uspace/dist/src/c/demos

Files:

• tetris/scores.h (modified) (1 diff)
• tetris/tetris.c (modified) (2 diffs)
• top/top.c (modified) (3 diffs)

uspace/dist/src/c/demos/tetris/scores.h

@@ -54 +54 @@
  */
 
-#include <sys/time.h>
+#include <time.h>
 #include <str.h>
 

uspace/dist/src/c/demos/tetris/tetris.c

@@ -55 +55 @@
     "\tThe Regents of the University of California.  All rights reserved.\n";
 
-#include <sys/time.h>
+#include <time.h>
 #include <err.h>
 #include <errno.h>
@@ -171 +171 @@
 static void srandomdev(void)
 {
-        struct timeval tv;
-
-        gettimeofday(&tv, NULL);
-        srand(tv.tv_sec + tv.tv_usec / 100000);
+        struct timespec ts;
+
+        getuptime(&ts);
+        srand(tv.tv_sec + tv.tv_nsec / 100000000);
 }
 

uspace/dist/src/c/demos/top/top.c

@@ -40 +40 @@
 #include <task.h>
 #include <thread.h>
-#include <sys/time.h>
+#include <time.h>
 #include <errno.h>
 #include <gsort.h>
@@ -155 +155 @@
 
         /* Get current time */
-        struct timeval time;
-        gettimeofday(&time, NULL);
+        struct timespec time;
+        getrealtime(&time);
 
         target->hours = (time.tv_sec % DAY) / HOUR;
@@ -163 +163 @@
 
         /* Get uptime */
-        struct timeval uptime;
+        struct timespec uptime;
         getuptime(&uptime);