From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Mon, 18 Dec 2006 12:02:41 +0000 (+0100)
Subject: Merged mainline with parallel shep-reap:
X-Git-Tag: holmes-import~507^2~4
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=eb4022995eaad02272b6a763e12846bb8872604b;p=libucw.git

Merged mainline with parallel shep-reap:
- bucket file iface supports more than one opened DB
- shep-reap can preload buckets in parallel (useful especially on RAID systems)
---

diff --git a/lib/Makefile b/lib/Makefile
index 14018b1c..e8bee413 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,7 +30,8 @@ LIBUCW_MODS= \
 	sync \
 	qache \
 	string \
-	bbuf
+	bbuf \
+	workqueue
 
 LIBUCW_INCLUDES= \
 	lib.h config.h threads.h math.h \
@@ -53,7 +54,8 @@ LIBUCW_INCLUDES= \
 	lizard.h \
 	md5.h \
 	base64.h base224.h \
-	qache.h
+	qache.h \
+	workqueue.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -89,6 +91,8 @@ $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
 $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
+$(o)/lib/workqueue-t: LIBS+=-lpthread  # FIXME
+
 TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test bbuf.test)
 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t