Complete unification of thread_loop/peerd_loop

[archipelago] / xseg / peers / user / Makefile

diff --git a/xseg/peers/user/Makefile b/xseg/peers/user/Makefile
index abee9f5..ed2e2dc 100644 (file)
--- a/xseg/peers/user/Makefile
+++ b/xseg/peers/user/Makefile
@@ -34,13 +34,16 @@
 .PHONY: default all clean install install-src
 
 include $(XSEG_HOME)/base.mk
-PEERS := xseg mt-sosd dummy mt-mapperd pfiled vlmc-xseg st-vlmcd mt-pfiled
+PEERS := xseg mt-sosd dummy mt-mapperd pfiled vlmc-xseg st-vlmcd mt-pfiled \
+       bench
 
 FILES="Makefile"
 FILES+=$(shell ls *.h)
 FILES+=$(shell ls *.c)
 FILES+=""
 
+CPREQS=$(filter %.c,$^)
+
 SUBDIR:=$(subst $(XSEG_HOME),,$(CURDIR))
 
 
@@ -63,7 +66,7 @@ mapperd: mapperd.c common.c $(BASE)/xseg/xseg.h $(BASE)/xseg/protocol.h common.h
 sosd: sosd.c $(BASE)/xseg/xseg.h $(BASE)/util_libs/user/sos/sos.h
        $(CC) $(CFLAGS) -o $@ $< $(INC) -L$(LIB) -lxseg -lsos
 
-xseg: xseg-tool.c $(BASE)/xseg/xseg.h
+xseg: xseg-tool.c $(BASE)/xtypes/xheap.c $(BASE)/xseg/xseg.h
        $(CC) $(CFLAGS) -o $@ $< $(BASE)/xtypes/xheap.c $(INC) -L$(LIB) -lxseg
 
 mt-sosd: mt-sosd.c peer.c peer.h
@@ -73,19 +76,22 @@ mt-sosd: mt-sosd.c peer.c peer.h
 dummy: dummy.c peer.c peer.h
        $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg -lpthread -DMT
 
+bench: bench-xseg.c peer.c timer.c bench-xseg.h peer.h
+       $(CC) $(CFLAGS) -o $@ $(CPREQS) $(INC) -L$(LIB) -lxseg -lpthread
+
 monitor: monitor.c peer.c peer.h
        $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg -lpthread -DMT
 
-mt-vlmcd: mt-vlmcd.c peer.c peer.h $(BASE)/xseg/protocol.h 
+mt-vlmcd: mt-vlmcd.c peer.c peer.h $(BASE)/xseg/protocol.h
        $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg -lpthread -DMT
 
-mt-pfiled: mt-pfiled.c peer.c peer.h $(BASE)/xseg/protocol.h 
+mt-pfiled: mt-pfiled.c peer.c peer.h $(BASE)/xseg/protocol.h
        $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg -lpthread -DMT
 
-st-vlmcd: mt-vlmcd.c peer.c peer.h $(BASE)/xseg/protocol.h 
-       $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg 
+st-vlmcd: mt-vlmcd.c peer.c peer.h $(BASE)/xseg/protocol.h
+       $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -lxseg
 
-mt-mapperd: mt-mapperd.c peer.c peer.h $(BASE)/xseg/protocol.h 
+mt-mapperd: mt-mapperd.c peer.c peer.h $(BASE)/xseg/protocol.h
        $(CC) $(CFLAGS) -o $@ $< peer.c $(INC) -L$(LIB) -DST_THREADS -lxseg -lst -lcrypto
 
 pfiled: pfiled.c common.c $(BASE)/xseg/xseg.h $(BASE)/xseg/protocol.h common.h
@@ -101,11 +107,11 @@ install:
        done
 
 install-src:
-       install -d $(DESTDIR)$(srcdir)$(SUBDIR) 
+       install -d $(DESTDIR)$(srcdir)$(SUBDIR)
        @for f in $(FILES) ; do \
                install -o 0 -g 0 -m 644 -t $(DESTDIR)$(srcdir)$(SUBDIR) $$f ; \
        done
 
 clean:
        rm -f filed xseg sosd vlmcd mapperd mt-sosd dummy monitor mt-mapperd \
-               pfiled vlmc-xseg st-vlmcd mt-vlmcd mt-pfiled
+               pfiled vlmc-xseg st-vlmcd mt-vlmcd mt-pfiled bench