Changeset 39026d7c in mainline for uspace/lib/c/generic

Timestamp:

2017-11-29T23:41:05Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

908d634

Parents:

f300523

Message:

Replace fibril_usleep() with async_usleep().

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (1 diff)
• fibril_synch.c (modified) (1 diff)
• irc.c (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -1868 +1868 @@
         
         amsg_destroy(msg);
+}
+
+/** Delay execution for the specified number of seconds
+ *
+ * @param sec Number of seconds to sleep
+ */
+void async_sleep(unsigned int sec)
+{
+        /*
+         * Sleep in 1000 second steps to support
+         * full argument range
+         */
+
+        while (sec > 0) {
+                unsigned int period = (sec > 1000) ? 1000 : sec;
+
+                async_usleep(period * 1000000);
+                sec -= period;
+        }
 }
 

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/generic/irc.c

@@ -34 +34 @@
 
 #include <assert.h>
+#include <async.h>
 #include <errno.h>
-#include <fibril_synch.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
@@ -72 +72 @@
 
                 // XXX This is just a temporary hack
-                fibril_usleep(500 * 1000);
+                async_usleep(500 * 1000);
         }