From 4f1d4044f8409ff29eeb7f97324daba496e40714 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 4 Jan 2011 17:03:13 +0100 Subject: Use instead of The check whether POSIX socket.h or WIN32 winsock2.h must be included can be made centrally. The downside is that some functionality of e.g. arpa/inet.h is also implemented in winsock.h, so that some files that don't use socket functions, but do use inet.h functions, must also include pulsecore/socket.h. (as well as arpa/inet.h) --- src/tests/ipacl-test.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/tests') diff --git a/src/tests/ipacl-test.c b/src/tests/ipacl-test.c index 57b70685..88bd6c6f 100644 --- a/src/tests/ipacl-test.c +++ b/src/tests/ipacl-test.c @@ -8,9 +8,6 @@ #include #include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -24,9 +21,8 @@ #include #endif -#include "../pulsecore/winsock.h" -#include "../pulsecore/macro.h" - +#include +#include #include int main(int argc, char *argv[]) { -- cgit From bb12ff83564d43566089dd979639c6993ba76665 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Thu, 6 Jan 2011 00:51:33 +0100 Subject: Apply #ifdefs around functionality not available on win32 And also the reverse: around some win32 specific functionality --- src/tests/rtstutter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/tests') diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c index c93fee93..21f33bf2 100644 --- a/src/tests/rtstutter.c +++ b/src/tests/rtstutter.c @@ -29,7 +29,10 @@ #include #include #include + +#ifdef HAVE_PTHREAD #include +#endif #include #include @@ -43,9 +46,6 @@ static int msec_lower, msec_upper; static void* work(void *p) PA_GCC_NORETURN; static void* work(void *p) { -#ifdef HAVE_PTHREAD_SETAFFINITY_NP - cpu_set_t mask; -#endif struct sched_param param; pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p)); @@ -55,9 +55,13 @@ static void* work(void *p) { pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_FIFO, ¶m) == 0); #ifdef HAVE_PTHREAD_SETAFFINITY_NP +{ + cpu_set_t mask; + CPU_ZERO(&mask); CPU_SET((size_t) PA_PTR_TO_UINT(p), &mask); pa_assert_se(pthread_setaffinity_np(pthread_self(), sizeof(mask), &mask) == 0); +} #endif for (;;) { -- cgit From 2de2c735c937c6724c14656acf01ce90f122b903 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Thu, 6 Jan 2011 01:35:27 +0100 Subject: Fix dependencies and include necessary headers --- src/tests/ipacl-test.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tests') diff --git a/src/tests/ipacl-test.c b/src/tests/ipacl-test.c index 88bd6c6f..58663468 100644 --- a/src/tests/ipacl-test.c +++ b/src/tests/ipacl-test.c @@ -24,6 +24,7 @@ #include #include #include +#include int main(int argc, char *argv[]) { struct sockaddr_in sa; -- cgit From aebf66bef6ebc8561b3cd4bfb4189ea739056f65 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Thu, 17 Feb 2011 11:50:10 +0100 Subject: Use pa_* instead of generic functions to improve portability --- src/tests/asyncq-test.c | 2 +- src/tests/rtstutter.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'src/tests') 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 #include #include -#include #include #include @@ -34,25 +33,24 @@ #include #endif +#include #include #include #include #include +#include #include 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(¶m, 0, sizeof(param)); - param.sched_priority = 12; - pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_FIFO, ¶m) == 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 From 30c7c9518440670ca3b627298c4e32885204882f Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 18 Jan 2011 11:28:53 +0100 Subject: tests/rtstutter: Use pa_rtclock --- src/tests/rtstutter.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'src/tests') diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c index 21e3cdeb..9ef835c3 100644 --- a/src/tests/rtstutter.c +++ b/src/tests/rtstutter.c @@ -41,6 +41,7 @@ #include #include #include +#include static int msec_lower, msec_upper; @@ -63,36 +64,24 @@ static void work(void *p) { #endif 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_UINT(p)); pa_msleep(1000); -#ifdef CLOCK_REALTIME - pa_assert_se(clock_gettime(CLOCK_REALTIME, &end) == 0); -#endif - - nsec = - (uint64_t) ((((double) rand())*(double)(msec_upper-msec_lower)*PA_NSEC_PER_MSEC)/RAND_MAX) + - (uint64_t) ((uint64_t) msec_lower*PA_NSEC_PER_MSEC); + 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); - pa_log_notice("CPU%i: Freezing for %ims", PA_PTR_TO_UINT(p), (int) (nsec/PA_NSEC_PER_MSEC)); + pa_log_notice("CPU%i: Freezing for %ims", PA_PTR_TO_UINT(p), (int) (usec/PA_USEC_PER_MSEC)); - end.tv_sec += (time_t) (nsec / PA_NSEC_PER_SEC); - end.tv_nsec += (long int) (nsec % PA_NSEC_PER_SEC); - - while ((pa_usec_t) end.tv_nsec > PA_NSEC_PER_SEC) { - end.tv_sec++; - end.tv_nsec -= (long int) PA_NSEC_PER_SEC; - } + pa_rtclock_get(&end); + pa_timeval_add(&end, usec); do { -#ifdef CLOCK_REALTIME - pa_assert_se(clock_gettime(CLOCK_REALTIME, &now) == 0); -#endif - } 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); } } -- cgit