Actually, you know, build.

diff --git a/Makefile b/Makefile
index a528737..9d3ae06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ rpc/librpc.a: rpc/rpc.o rpc/connection.o rpc/pollmgr.o rpc/thr_pool.o rpc/jsl_lo
        ar cq $@ $^
        ranlib rpc/librpc.a
 
        ar cq $@ $^
        ranlib rpc/librpc.a
 

-rpc/rpctest: rpc/rpctest.o rpc/librpc.a
+rpc/rpctest: rpc/rpctest.o tprintf.o rpc/librpc.a

 
 

-lock_demo=lock_demo.o lock_client.o
+lock_demo=lock_demo.o lock_client.o tprintf.o rsm_client.o handle.o

 lock_demo : $(lock_demo) rpc/librpc.a
 
 lock_tester=lock_tester.o lock_client.o tprintf.o rsm_client.o handle.o lock_client_cache_rsm.o
 lock_demo : $(lock_demo) rpc/librpc.a
 
 lock_tester=lock_tester.o lock_client.o tprintf.o rsm_client.o handle.o lock_client_cache_rsm.o

@@ -22,7 +22,7 @@ lock_tester : $(lock_tester) rpc/librpc.a
 lock_server=lock_server.o tprintf.o handle.o rsm.o paxos.o config.o log.o lock_server_cache_rsm.o
 lock_server : $(lock_server) rpc/librpc.a
 
 lock_server=lock_server.o tprintf.o handle.o rsm.o paxos.o config.o log.o lock_server_cache_rsm.o
 lock_server : $(lock_server) rpc/librpc.a
 

-rsm_tester=rsm_tester.o rsmtest_client.o
+rsm_tester=rsm_tester.o rsmtest_client.o tprintf.o

 rsm_tester: $(rsm_tester) rpc/librpc.a
 
 %.o: %.cc
 rsm_tester: $(rsm_tester) rpc/librpc.a
 
 %.o: %.cc

diff --git a/lock_demo.cc b/lock_demo.cc
index 4285269..90f0047 100644 (file)
--- a/lock_demo.cc
+++ b/lock_demo.cc
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

+char tprintf_thread_prefix = 'd';
+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {