Changeset 9a99aa5 in mainline

Timestamp:

2017-05-30T19:35:46Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

316795c

Parents:

134e3f1

Message:

Fibrils need sleep, too.

Location:

uspace/lib

Files:

• c/generic/fibril_synch.c (modified) (1 diff)
• c/include/fibril_synch.h (modified) (1 diff)
• posix/source/time.c (modified) (3 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -629 +629 @@
 }
 
+/** Delay fibril execution for the specified number of microseconds
+ *
+ * @param usec Number of microseconds to sleep
+ */
+void fibril_usleep(useconds_t usec)
+{
+        fibril_condvar_t cv;
+        fibril_mutex_t lock;
+
+        fibril_condvar_initialize(&cv);
+        fibril_mutex_initialize(&lock);
+        fibril_mutex_lock(&lock);
+        fibril_condvar_wait_timeout(&cv, &lock, usec);
+        fibril_mutex_unlock(&lock);
+}
+
+/** Delay fibril execution for the specified number of seconds
+ *
+ * @param sec Number of seconds to sleep
+ */
+void fibril_sleep(unsigned int sec)
+{
+        /*
+         * Sleep in 1000 second steps to support
+         * full argument range
+         */
+
+        while (sec > 0) {
+                unsigned int period = (sec > 1000) ? 1000 : sec;
+
+                fibril_usleep(period * 1000000);
+                sec -= period;
+        }
+}
+
+
 /** @}
  */

uspace/lib/c/include/fibril_synch.h

@@ -173 +173 @@
 extern fibril_timer_state_t fibril_timer_clear(fibril_timer_t *);
 extern fibril_timer_state_t fibril_timer_clear_locked(fibril_timer_t *);
+extern void fibril_usleep(useconds_t);
+extern void fibril_sleep(unsigned int);
 
 #endif

uspace/lib/posix/source/time.c

@@ -45 +45 @@
 #include "posix/assert.h"
 
+#include "libc/fibril_synch.h"
 #include "libc/malloc.h"
 #include "libc/task.h"
@@ -50 +51 @@
 #include "libc/stdbool.h"
 #include "libc/stddef.h"
-#include "libc/thread.h"
 #include "libc/sys/time.h"
 
@@ -315 +315 @@
                         // TODO: interruptible sleep
                         if (rqtp->tv_sec != 0) {
-                                thread_sleep(rqtp->tv_sec);
+                                fibril_sleep(rqtp->tv_sec);
                         }
                         if (rqtp->tv_nsec != 0) {
-                                thread_usleep(rqtp->tv_nsec / 1000);
+                                fibril_usleep(rqtp->tv_nsec / 1000);
                         }
                         return 0;