From bb0ef9e0eec5c27610fe381b905ef46b3f5f09c6 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 21 Mar 2021 16:59:08 +0100 Subject: Cleanup: Rewrite block processor to use the libutil thread_pool_t Throw out the messy thread pool implementation and temporarily also remove the exact fragment matching for simplicity. Signed-off-by: David Oberhollenzer --- lib/sqfs/Makemodule.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'lib/sqfs/Makemodule.am') diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index b770fd4..5a62894 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -43,6 +43,7 @@ libsquashfs_la_SOURCES += lib/util/xxhash.c libsquashfs_la_SOURCES += lib/util/hash_table.c include/hash_table.h libsquashfs_la_SOURCES += lib/util/rbtree.c include/rbtree.h libsquashfs_la_SOURCES += lib/util/array.c include/array.h +libsquashfs_la_SOURCES += include/threadpool.h if CUSTOM_ALLOC libsquashfs_la_SOURCES += lib/util/mempool.c include/mempool.h @@ -50,6 +51,7 @@ endif if WINDOWS libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c +libsquashfs_la_SOURCES += lib/util/threadpool.c libsquashfs_la_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 libsquashfs_la_CFLAGS += -Wc,-static-libgcc libsquashfs_la_LDFLAGS += -no-undefined -avoid-version @@ -58,14 +60,10 @@ libsquashfs_la_SOURCES += lib/sqfs/unix/io_file.c endif if HAVE_PTHREAD -libsquashfs_la_SOURCES += lib/sqfs/block_processor/winpthread.c -libsquashfs_la_CPPFLAGS += -DWITH_PTHREAD +libsquashfs_la_SOURCES += lib/util/threadpool.c else -if WINDOWS -libsquashfs_la_SOURCES += lib/sqfs/block_processor/winpthread.c -else -libsquashfs_la_SOURCES += lib/sqfs/block_processor/serial.c -endif +libsquashfs_la_SOURCES += lib/util/threadpool_serial.c +libsquashfs_la_CPPFLAGS += -DNO_THREAD_IMPL endif if WITH_GZIP -- cgit v1.2.3