From 5749a18faea208ad19f39612c3c55166ca409fef Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Tue, 13 Mar 2012 12:19:31 +0100 Subject: xs_utils cleanup 1/2 (minimize exported api) Reduced xs_utils to the minimum functions required (xs_stopwatch_*) xs_sleep, xs_thread_* are internal to unit tests and have been moved to testutil.hpp, useless use of xs_sleep in perf/ has been removed. Signed-off-by: Martin Lucina --- tests/timeo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/timeo.cpp') diff --git a/tests/timeo.cpp b/tests/timeo.cpp index 000e718..e2dcbb8 100644 --- a/tests/timeo.cpp +++ b/tests/timeo.cpp @@ -26,12 +26,12 @@ extern "C" { // Worker thread connects after delay of 1 second. Then it waits // for 1 more second, so that async connect has time to succeed. - xs_sleep (1); + sleep (1); void *sc = xs_socket (ctx_, XS_PUSH); assert (sc); int rc = xs_connect (sc, "inproc://timeout_test"); assert (rc == 0); - xs_sleep (1); + sleep (1); rc = xs_close (sc); assert (rc == 0); } @@ -72,7 +72,7 @@ int XS_TEST_MAIN () timeout = 2000; rc = xs_setsockopt(sb, XS_RCVTIMEO, &timeout, timeout_size); assert (rc == 0); - void *thread = xs_thread_create (timeo_worker, ctx); + void *thread = thread_create (timeo_worker, ctx); assert (thread); watch = xs_stopwatch_start (); rc = xs_recv (sb, buf, 32, 0); @@ -80,7 +80,7 @@ int XS_TEST_MAIN () assert (xs_errno () == EAGAIN); elapsed = xs_stopwatch_stop (watch); assert (elapsed > 1900000 && elapsed < 2100000); - xs_thread_join (thread); + thread_join (thread); // Check that timeouts don't break normal message transfer. void *sc = xs_socket (ctx, XS_PUSH); -- cgit v1.2.3