Changeset 231b3fd in mainline for uspace/lib/c/generic/thread/fibril.c

Timestamp:

2018-08-25T21:35:26Z (6 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

File:

• uspace/lib/c/generic/thread/fibril.c (modified) (15 diffs)

uspace/lib/c/generic/thread/fibril.c

@@ -60 +60 @@
 typedef struct {
         link_t link;
-        struct timeval expires;
+        struct timespec expires;
         fibril_event_t *event;
 } _timeout_t;
@@ -142 +142 @@
 }
 
-static inline errno_t _ready_down(const struct timeval *expires)
+static inline errno_t _ready_down(const struct timespec *expires)
 {
         if (multithreaded)
@@ -253 +253 @@
 }
 
-static errno_t _ipc_wait(ipc_call_t *call, const struct timeval *expires)
+static errno_t _ipc_wait(ipc_call_t *call, const struct timespec *expires)
 {
         if (!expires)
@@ -261 +261 @@
                 return ipc_wait(call, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
 
-        struct timeval now;
+        struct timespec now;
         getuptime(&now);
 
-        if (tv_gteq(&now, expires))
+        if (ts_gteq(&now, expires))
                 return ipc_wait(call, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
 
-        return ipc_wait(call, tv_sub_diff(expires, &now), SYNCH_FLAGS_NONE);
+        return ipc_wait(call, NSEC2USEC(ts_sub_diff(expires, &now)),
+            SYNCH_FLAGS_NONE);
 }
 
@@ -275 +276 @@
  * wait after new ready fibrils are added.
  */
-static fibril_t *_ready_list_pop(const struct timeval *expires, bool locked)
+static fibril_t *_ready_list_pop(const struct timespec *expires, bool locked)
 {
         if (locked) {
@@ -370 +371 @@
 static fibril_t *_ready_list_pop_nonblocking(bool locked)
 {
-        struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+        struct timespec tv = { .tv_sec = 0, .tv_nsec = 0 };
         return _ready_list_pop(&tv, locked);
 }
@@ -393 +394 @@
 
 /* Blocks the current fibril until an IPC call arrives. */
-static errno_t _wait_ipc(ipc_call_t *call, const struct timeval *expires)
+static errno_t _wait_ipc(ipc_call_t *call, const struct timespec *expires)
 {
         futex_assert_is_not_locked(&fibril_futex);
@@ -430 +431 @@
 
 /** Fire all timeouts that expired. */
-static struct timeval *_handle_expired_timeouts(struct timeval *next_timeout)
-{
-        struct timeval tv;
-        getuptime(&tv);
+static struct timespec *_handle_expired_timeouts(struct timespec *next_timeout)
+{
+        struct timespec ts;
+        getuptime(&ts);
 
         futex_lock(&fibril_futex);
@@ -441 +442 @@
                 _timeout_t *to = list_get_instance(cur, _timeout_t, link);
 
-                if (tv_gt(&to->expires, &tv)) {
+                if (ts_gt(&to->expires, &ts)) {
                         *next_timeout = to->expires;
                         futex_unlock(&fibril_futex);
@@ -535 +536 @@
         (void) arg;
 
-        struct timeval next_timeout;
+        struct timespec next_timeout;
         while (true) {
-                struct timeval *to = _handle_expired_timeouts(&next_timeout);
+                struct timespec *to = _handle_expired_timeouts(&next_timeout);
                 fibril_t *f = _ready_list_pop(to, false);
                 if (f) {
@@ -615 +616 @@
                 _timeout_t *cur = list_get_instance(tmp, _timeout_t, link);
 
-                if (tv_gteq(&cur->expires, &timeout->expires))
+                if (ts_gteq(&cur->expires, &timeout->expires))
                         break;
 
@@ -634 +635 @@
  * @return ETIMEOUT if timed out. EOK otherwise.
  */
-errno_t fibril_wait_timeout(fibril_event_t *event, const struct timeval *expires)
+errno_t fibril_wait_timeout(fibril_event_t *event,
+    const struct timespec *expires)
 {
         assert(fibril_self()->rmutex_locks == 0);
@@ -889 +891 @@
 }
 
-void fibril_usleep(suseconds_t timeout)
-{
-        struct timeval expires;
+void fibril_usleep(usec_t timeout)
+{
+        struct timespec expires;
         getuptime(&expires);
-        tv_add_diff(&expires, timeout);
+        ts_add_diff(&expires, USEC2NSEC(timeout));
 
         fibril_event_t event = FIBRIL_EVENT_INIT;
@@ -899 +901 @@
 }
 
-void fibril_sleep(unsigned int sec)
-{
-        struct timeval expires;
+void fibril_sleep(sec_t sec)
+{
+        struct timespec expires;
         getuptime(&expires);
         expires.tv_sec += sec;
@@ -916 +918 @@
 }
 
-errno_t fibril_ipc_wait(ipc_call_t *call, const struct timeval *expires)
+errno_t fibril_ipc_wait(ipc_call_t *call, const struct timespec *expires)
 {
         return _wait_ipc(call, expires);