module-switch-on-port-available: Use new find best port function

[pulseaudio] / src / tests / rtstutter.c

diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c
index 91e85c3680a2718303522e0a885bc5d469012c94..ed567c130f36985395283c8e81998cb22ff5eeae 100644 (file)
--- a/src/tests/rtstutter.c
+++ b/src/tests/rtstutter.c
@@ -5,7 +5,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as

-  published by the Free Software Foundation; either version 2 of the
+  published by the Free Software Foundation; either version 2.1 of the

   License, or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   License, or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -26,69 +26,81 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>

-#include <sched.h>

 #include <inttypes.h>
 #include <inttypes.h>

-#include <string.h>
+
+#ifdef HAVE_PTHREAD

 #include <pthread.h>
 #include <pthread.h>

+#ifdef HAVE_PTHREAD_SETAFFINITY_NP
+#if defined(__FreeBSD__)
+#include <pthread_np.h>
+#include <sys/param.h>
+#include <sys/cpuset.h>
+#endif
+#endif
+#endif

 
 

+#include <pulse/util.h>

 #include <pulse/timeval.h>
 #include <pulse/gccmacro.h>
 
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulse/timeval.h>
 #include <pulse/gccmacro.h>
 
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>

+#include <pulsecore/thread.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-rtclock.h>

 
 static int msec_lower, msec_upper;
 
 
 static int msec_lower, msec_upper;
 

-static void* work(void *p) PA_GCC_NORETURN;
+static void work(void *p) PA_GCC_NORETURN;

 
 

-static void* work(void *p) {
-    cpu_set_t mask;
-    struct sched_param param;
+static void work(void *p) {

 
 

-    pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_INT(p));
+    pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));

 
 

-    memset(&param, 0, sizeof(param));
-    param.sched_priority = 12;
-    pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_FIFO, &param) == 0);
+    pa_make_realtime(12);
+
+#ifdef HAVE_PTHREAD_SETAFFINITY_NP
+{
+#ifdef __FreeBSD__
+    cpuset_t mask;
+#else
+    cpu_set_t mask;
+#endif

 
     CPU_ZERO(&mask);
 
     CPU_ZERO(&mask);

-    CPU_SET(PA_PTR_TO_INT(p), &mask);
+    CPU_SET((size_t) PA_PTR_TO_UINT(p), &mask);

     pa_assert_se(pthread_setaffinity_np(pthread_self(), sizeof(mask), &mask) == 0);
     pa_assert_se(pthread_setaffinity_np(pthread_self(), sizeof(mask), &mask) == 0);

+}
+#endif

 
     for (;;) {
 
     for (;;) {

-        struct timespec now, end;
-        uint64_t nsec;
+        struct timeval now, end;
+        uint64_t usec;

 
 

-        pa_log_notice("CPU%i: Sleeping for 1s", PA_PTR_TO_INT(p));
-        sleep(1);
+        pa_log_notice("CPU%i: Sleeping for 1s", PA_PTR_TO_UINT(p));
+        pa_msleep(1000);

 
 

-        pa_assert_se(clock_gettime(CLOCK_REALTIME, &end) == 0);
+        usec =
+            (uint64_t) ((((double) rand())*(double)(msec_upper-msec_lower)*PA_USEC_PER_MSEC)/RAND_MAX) +
+            (uint64_t) ((uint64_t) msec_lower*PA_USEC_PER_MSEC);

 
 

-        nsec =
-            (uint64_t) ((((double) rand())*(msec_upper-msec_lower)*PA_NSEC_PER_MSEC)/RAND_MAX) +
-            (uint64_t) (msec_lower*PA_NSEC_PER_MSEC);
+        pa_log_notice("CPU%i: Freezing for %ims", PA_PTR_TO_UINT(p), (int) (usec/PA_USEC_PER_MSEC));

 
 

-        pa_log_notice("CPU%i: Freezing for %ims", PA_PTR_TO_INT(p), (int) (nsec/PA_NSEC_PER_MSEC));
-
-        end.tv_sec += nsec / PA_NSEC_PER_SEC;
-        end.tv_nsec += nsec % PA_NSEC_PER_SEC;
-
-        while ((pa_usec_t) end.tv_nsec > PA_NSEC_PER_SEC) {
-            end.tv_sec++;
-            end.tv_nsec -= PA_NSEC_PER_SEC;
-        }
+        pa_rtclock_get(&end);
+        pa_timeval_add(&end, usec);

 
         do {
 
         do {

-            pa_assert_se(clock_gettime(CLOCK_REALTIME, &now) == 0);
-        } while (now.tv_sec < end.tv_sec ||
-                 (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec));
+            pa_rtclock_get(&now);
+        } while (pa_timeval_cmp(&now, &end) < 0);

     }
 }
 
 int main(int argc, char*argv[]) {
     }
 }
 
 int main(int argc, char*argv[]) {

-    int n;
+    unsigned n;
+
+    pa_log_set_level(PA_LOG_INFO);

 
 

-    srand(time(NULL));
+    srand((unsigned) time(NULL));

 
     if (argc >= 3) {
         msec_lower = atoi(argv[1]);
 
     if (argc >= 3) {
         msec_lower = atoi(argv[1]);


@@ -104,11 +116,10 @@ int main(int argc, char*argv[]) {
     pa_assert(msec_upper > 0);
     pa_assert(msec_upper >= msec_lower);
 
     pa_assert(msec_upper > 0);
     pa_assert(msec_upper >= msec_lower);
 

-    pa_log_notice("Creating random latencies in the range of %ims to  %ims.", msec_lower, msec_upper);
+    pa_log_notice("Creating random latencies in the range of %ims to %ims.", msec_lower, msec_upper);

 
 

-    for (n = 1; n < sysconf(_SC_NPROCESSORS_CONF); n++) {
-        pthread_t t;
-        pa_assert_se(pthread_create(&t, NULL, work, PA_INT_TO_PTR(n)) == 0);
+    for (n = 1; n < pa_ncpus(); n++) {
+        pa_assert_se(pa_thread_new("rtstutter", work, PA_UINT_TO_PTR(n)));

     }
 
     work(PA_INT_TO_PTR(0));
     }
 
     work(PA_INT_TO_PTR(0));