From 5ca0fd204548da3a0bdf524f5323045f154d4324 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Sat, 31 Dec 2016 22:39:32 -0500 Subject: [PATCH] Shorten thread pool tests --- tests/pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/pool.c b/tests/pool.c index 27414642d..adc5947df 100644 --- a/tests/pool.c +++ b/tests/pool.c @@ -14,7 +14,7 @@ struct data { pthread_mutex_t mutex; - unsigned data[1024]; + unsigned data[16]; size_t i; }; @@ -26,20 +26,20 @@ void fn(void *opaque) { pthread_mutex_unlock(&data->mutex); } -int testOrder(size_t numThreads, size_t queueLog) { +int testOrder(size_t numThreads, size_t queueSize) { struct data data; - POOL_ctx *ctx = POOL_create(numThreads, queueLog); + POOL_ctx *ctx = POOL_create(numThreads, queueSize); ASSERT_TRUE(ctx); data.i = 0; pthread_mutex_init(&data.mutex, NULL); { size_t i; - for (i = 0; i < 1024; ++i) { + for (i = 0; i < 16; ++i) { POOL_add(ctx, &fn, &data); } } POOL_free(ctx); - ASSERT_EQ(1024, data.i); + ASSERT_EQ(16, data.i); { size_t i; for (i = 0; i < data.i; ++i) { @@ -52,19 +52,19 @@ int testOrder(size_t numThreads, size_t queueLog) { int main(int argc, const char **argv) { size_t numThreads; - for (numThreads = 1; numThreads <= 8; ++numThreads) { - size_t queueLog; - for (queueLog = 1; queueLog <= 8; ++queueLog) { - if (testOrder(numThreads, queueLog)) { + for (numThreads = 1; numThreads <= 4; ++numThreads) { + size_t queueSize; + for (queueSize = 1; queueSize <= 2; ++queueSize) { + if (testOrder(numThreads, queueSize)) { printf("FAIL: testOrder\n"); return 1; } } } printf("PASS: testOrder\n"); - (POOL_create(0, 1) || POOL_create(1, 0)) ? printf("FAIL: testInvalid\n") - : printf("PASS: testInvalid\n"); (void)argc; (void)argv; + return (POOL_create(0, 1) || POOL_create(1, 0)) ? printf("FAIL: testInvalid\n"), 1 + : printf("PASS: testInvalid\n"), 0; return 0; } -- 2.47.2