Add thread pool tests
This commit is contained in:
+1
-1
@@ -12,7 +12,7 @@ matrix:
|
|||||||
os: linux
|
os: linux
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
- env: Ubu=12.04cont Cmd="make zlibwrapper && make clean && make -C tests test-symbols && make clean && make -C tests test-zstd-nolegacy && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean"
|
- env: Ubu=12.04cont Cmd="make zlibwrapper && make clean && make -C tests test-pool && make -C tests test-symbols && make clean && make -C tests test-zstd-nolegacy && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean"
|
||||||
os: linux
|
os: linux
|
||||||
sudo: false
|
sudo: false
|
||||||
language: cpp
|
language: cpp
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ paramgrill32
|
|||||||
roundTripCrash
|
roundTripCrash
|
||||||
longmatch
|
longmatch
|
||||||
symbols
|
symbols
|
||||||
|
pool
|
||||||
invalidDictionaries
|
invalidDictionaries
|
||||||
|
|
||||||
# Tmp test directory
|
# Tmp test directory
|
||||||
|
|||||||
+7
-1
@@ -158,6 +158,9 @@ else
|
|||||||
$(CC) $(FLAGS) $^ -o $@$(EXT) -Wl,-rpath=$(ZSTDDIR) $(ZSTDDIR)/libzstd.so
|
$(CC) $(FLAGS) $^ -o $@$(EXT) -Wl,-rpath=$(ZSTDDIR) $(ZSTDDIR)/libzstd.so
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
pool : pool.c $(ZSTDDIR)/common/pool.c
|
||||||
|
$(CC) $(FLAGS) -pthread -DZSTD_PTHREAD $^ -o $@$(EXT)
|
||||||
|
|
||||||
namespaceTest:
|
namespaceTest:
|
||||||
if $(CC) namespaceTest.c ../lib/common/xxhash.c -o $@ ; then echo compilation should fail; exit 1 ; fi
|
if $(CC) namespaceTest.c ../lib/common/xxhash.c -o $@ ; then echo compilation should fail; exit 1 ; fi
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
@@ -176,7 +179,7 @@ clean:
|
|||||||
fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT)\
|
fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT)\
|
||||||
zstreamtest$(EXT) zstreamtest32$(EXT) \
|
zstreamtest$(EXT) zstreamtest32$(EXT) \
|
||||||
datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \
|
datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \
|
||||||
symbols$(EXT) invalidDictionaries$(EXT)
|
symbols$(EXT) invalidDictionaries$(EXT) pool$(EXT)
|
||||||
@echo Cleaning completed
|
@echo Cleaning completed
|
||||||
|
|
||||||
|
|
||||||
@@ -288,4 +291,7 @@ test-invalidDictionaries: invalidDictionaries
|
|||||||
test-symbols: symbols
|
test-symbols: symbols
|
||||||
$(QEMU_SYS) ./symbols
|
$(QEMU_SYS) ./symbols
|
||||||
|
|
||||||
|
test-pool: pool
|
||||||
|
$(QEMU_SYS) ./pool
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
#include "pool.h"
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#define ASSERT_TRUE(p) \
|
||||||
|
do { \
|
||||||
|
if (!(p)) { \
|
||||||
|
return 1; \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
#define ASSERT_FALSE(p) ASSERT_TRUE(!(p))
|
||||||
|
#define ASSERT_EQ(lhs, rhs) ASSERT_TRUE((lhs) == (rhs))
|
||||||
|
|
||||||
|
struct data {
|
||||||
|
pthread_mutex_t mutex;
|
||||||
|
unsigned data[1024];
|
||||||
|
size_t i;
|
||||||
|
};
|
||||||
|
|
||||||
|
void fn(void *opaque) {
|
||||||
|
struct data *data = (struct data *)opaque;
|
||||||
|
pthread_mutex_lock(&data->mutex);
|
||||||
|
data->data[data->i] = data->i;
|
||||||
|
++data->i;
|
||||||
|
pthread_mutex_unlock(&data->mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
int testOrder(size_t numThreads, size_t queueLog) {
|
||||||
|
struct data data;
|
||||||
|
POOL_ctx *ctx = POOL_create(numThreads, queueLog);
|
||||||
|
ASSERT_TRUE(ctx);
|
||||||
|
data.i = 0;
|
||||||
|
ASSERT_FALSE(pthread_mutex_init(&data.mutex, NULL));
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
for (i = 0; i < 1024; ++i) {
|
||||||
|
POOL_add(ctx, &fn, &data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
POOL_free(ctx);
|
||||||
|
ASSERT_EQ(1024, data.i);
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
for (i = 0; i < data.i; ++i) {
|
||||||
|
ASSERT_EQ(i, data.data[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ASSERT_FALSE(pthread_mutex_destroy(&data.mutex));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
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)) {
|
||||||
|
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 0;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user