From aebf66bef6ebc8561b3cd4bfb4189ea739056f65 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Thu, 17 Feb 2011 11:50:10 +0100
Subject: Use pa_* instead of generic functions to improve portability

---
 src/pulsecore/inet_ntop.c |  4 +++-
 src/pulsecore/inet_pton.c |  4 +++-
 src/tests/asyncq-test.c   |  2 +-
 src/tests/rtstutter.c     | 19 ++++++++-----------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c
index 64c28edb..059b25cc 100644
--- a/src/pulsecore/inet_ntop.c
+++ b/src/pulsecore/inet_ntop.c
@@ -29,6 +29,7 @@
 #ifndef HAVE_INET_NTOP
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
 #include "inet_ntop.h"
@@ -39,7 +40,8 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
     struct in6_addr *in6 = (struct in6_addr*)src;
 #endif
 
-    assert(src && dst);
+    pa_assert(src);
+    pa_assert(dst);
 
     switch (af) {
     case AF_INET:
diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c
index 198d1a0d..efb15263 100644
--- a/src/pulsecore/inet_pton.c
+++ b/src/pulsecore/inet_pton.c
@@ -28,6 +28,7 @@
 
 #ifndef HAVE_INET_PTON
 
+#include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
 #include "inet_pton.h"
@@ -38,7 +39,8 @@ int inet_pton(int af, const char *src, void *dst) {
     struct in6_addr *in6 = (struct in6_addr*)dst;
 #endif
 
-    assert(src && dst);
+    pa_assert(src);
+    pa_assert(dst);
 
     switch (af) {
     case AF_INET:
diff --git a/src/tests/asyncq-test.c b/src/tests/asyncq-test.c
index 538bbb17..eae8cce9 100644
--- a/src/tests/asyncq-test.c
+++ b/src/tests/asyncq-test.c
@@ -51,7 +51,7 @@ static void consumer(void *_q) {
     void *p;
     int i;
 
-    sleep(1);
+    pa_msleep(1000);
 
     for (i = 0;; i++) {
         p = pa_asyncq_pop(q, TRUE);
diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c
index 21f33bf2..21e3cdeb 100644
--- a/src/tests/rtstutter.c
+++ b/src/tests/rtstutter.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-#include <sched.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -34,25 +33,24 @@
 #include <pthread.h>
 #endif
 
+#include <pulse/util.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>
 
 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) {
-    struct sched_param param;
+static void work(void *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
 {
@@ -69,7 +67,7 @@ static void* work(void *p) {
         uint64_t nsec;
 
         pa_log_notice("CPU%i: Sleeping for 1s", PA_PTR_TO_UINT(p));
-        sleep(1);
+        pa_msleep(1000);
 
 #ifdef CLOCK_REALTIME
         pa_assert_se(clock_gettime(CLOCK_REALTIME, &end) == 0);
@@ -101,7 +99,7 @@ static void* work(void *p) {
 int main(int argc, char*argv[]) {
     unsigned n;
 
-    pa_log_set_level(PA_LOG_DEBUG);
+    pa_log_set_level(PA_LOG_INFO);
 
     srand((unsigned) time(NULL));
 
@@ -122,8 +120,7 @@ int main(int argc, char*argv[]) {
     pa_log_notice("Creating random latencies in the range of %ims to  %ims.", msec_lower, msec_upper);
 
     for (n = 1; n < pa_ncpus(); n++) {
-        pthread_t t;
-        pa_assert_se(pthread_create(&t, NULL, work, PA_UINT_TO_PTR(n)) == 0);
+        pa_assert_se(pa_thread_new("rtstutter", work, PA_UINT_TO_PTR(n)));
     }
 
     work(PA_INT_TO_PTR(0));
-- 
cgit