Changeset 4896:0cd0dc3bc104 in roaraudio

Timestamp:

04/29/11 15:28:16 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

removed useage of usleep() in flavor to nanosleep() if supported.

Files:

• include/libroar/libroar.h (modified) (1 diff)
• libroar/libroar.c (modified) (1 diff)
• libroarpulse/util.c (modified) (1 diff)
• roard/driver_sysclock.c (modified) (1 diff)
• roard/loop.c (modified) (1 diff)
• roard/streams.c (modified) (1 diff)

include/libroar/libroar.h

@@ -195 +195 @@
 #define ROAR_MIN ROAR_MIN2
 
+void roar_usleep(uint_least32_t t);
+
 #endif
 

libroar/libroar.c

@@ -97 +97 @@
 }
 
+void roar_usleep(uint_least32_t t) {
+#ifdef ROAR_TARGET_WIN32
+ Sleep(t/(uint_least32_t)1000);
+#elif defined(ROAR_HAVE_NANOSLEEP)
+ struct timespec tv;
+ struct timespec left;
+
+ if ( t > (uint_least32_t)1000000 ) {
+  tv.tv_sec  = t/(uint_least32_t)1000000;
+  t         -= tv.tv_sec*(uint_least32_t)1000000;
+ } else {
+  tv.tv_sec  = 0;
+ }
+
+ tv.tv_nsec = t*(uint_least32_t)1000;
+
+ while (nanosleep(&tv, &left) == -1)
+  memcpy(&tv, &left, sizeof(tv));
+#elif defined(ROAR_HAVE_USLEEP)
+ usleep(t);
+#else
+ ROAR_ERR("roar_usleep(t=%llu): can not sleep: not implemented", (long long unsigned int)t);
+ roar_strap(ROAR_TRAP_GROUP_LIBROAR, "usleep.not-implemented");
+ roar_err_set(ROAR_ERROR_NOSYS);
+#endif
+}
+
 //ll

libroarpulse/util.c

@@ -96 +96 @@
 /** Wait t milliseconds */
 int pa_msleep(unsigned long t) {
-#ifdef ROAR_TARGET_WIN32
- Sleep(t);
-#else
- usleep(1000*t);
-#endif
+ roar_usleep((uint_least32_t)1000*(uint_least32_t)t);
  return 0;
 }

roard/driver_sysclock.c

@@ -113 +113 @@
 
  if ( diff > 0 )
-  usleep(diff);
+  roar_usleep(diff);
 
  return count;

roard/loop.c

@@ -123 +123 @@
 #ifdef ROAR_HAVE_USLEEP
   if ( g_standby || (streams < 1 && g_autostandby) ) {
-   usleep((1000000 * ROAR_OUTPUT_BUFFER_SAMPLES) / sa->rate);
+   roar_usleep(((uint_least32_t)1000000 * ROAR_OUTPUT_BUFFER_SAMPLES) / sa->rate);
    ROAR_DBG("usleep(%u) = ?\n", (1000000 * ROAR_OUTPUT_BUFFER_SAMPLES) / sa->rate);
   } else {

roard/streams.c

@@ -2427 +2427 @@
 
 #ifdef ROAR_HAVE_USLEEP
-  usleep(100); // 0.1ms
+  roar_usleep(100); // 0.1ms
 #endif