r19857: Make the perfcounter compile after tdb changes

(This used to be commit ab0a41c13ba3e76fea4368bc329641bbac8839b4)

diff --git a/examples/perfcounter/Makefile b/examples/perfcounter/Makefile
index 07bc7657c9ce8143a27ba73ad86e61320bcf5c79..e74b7361016a6ab03cbac0ced1c92fa5c54a6bfc 100644 (file)
--- a/examples/perfcounter/Makefile
+++ b/examples/perfcounter/Makefile
@@ -19,19 +19,20 @@
 SAMBA_SRC_DIR=../../source
 TDB_SRC_DIR=$(SAMBA_SRC_DIR)/tdb
 
-CFLAGS = -g -I$(SAMBA_SRC_DIR)/include -I$(TDB_SRC_DIR)
+CFLAGS = -g -I$(SAMBA_SRC_DIR)/include -I$(TDB_SRC_DIR)/include
 CC = gcc
 
 PROGS = perfcount
-TDB_OBJ = $(TDB_SRC_DIR)/tdb.o $(TDB_SRC_DIR)/spinlock.o $(TDB_SRC_DIR)/tdbback.o
+TDB_OBJ = $(TDB_SRC_DIR)/common/tdb.o $(TDB_SRC_DIR)/common/dump.o \
+       $(TDB_SRC_DIR)/common/error.o $(TDB_SRC_DIR)/common/freelist.o \
+       $(TDB_SRC_DIR)/common/io.o $(TDB_SRC_DIR)/common/lock.o \
+       $(TDB_SRC_DIR)/common/open.o $(TDB_SRC_DIR)/common/transaction.o \
+       $(TDB_SRC_DIR)/common/traverse.o
 PERF_WRITER_OBJ = perf_writer.o perf_writer_mem.o perf_writer_util.o perf_writer_cpu.o perf_writer_process.o perf_writer_disk.o
 
 default: $(PROGS)
 
-$(TDB_OBJ):
-       cd $(TDB_SRC_DIR) && make
-
-perfcount: $(PERF_WRITER_OBJ) $(TDB_OBJ)
+perfcount: $(PERF_WRITER_OBJ)
        $(CC) $(CFLAGS) -o perfcount $(PERF_WRITER_OBJ) $(TDB_OBJ)
 
 clean:

diff --git a/examples/perfcounter/perf_writer_util.c b/examples/perfcounter/perf_writer_util.c
index 78a99fef494df0e4058799e2aa1892fa6828ede7..85ef48fb602c6482b7d4dbd1fd192c5cf131b91b 100644 (file)
--- a/examples/perfcounter/perf_writer_util.c
+++ b/examples/perfcounter/perf_writer_util.c
@@ -37,10 +37,6 @@ void add_key_raw(TDB_CONTEXT *db, char *keystring, void *databuf, size_t datasiz
   key.dsize = strlen(keystring);
   data.dptr = databuf;
   data.dsize = datasize;
-  fprintf(stderr, "doing insert of [%x] with key [%s] into [%s]\n", 
-         data.dptr, 
-         keystring, 
-         db->name);
 
   tdb_store(db, key, data, flags);
 }
@@ -53,10 +49,6 @@ void add_key(TDB_CONTEXT *db, char *keystring, char *datastring, int flags)
   key.dsize = strlen(keystring);
   data.dptr = datastring;
   data.dsize = strlen(datastring);
-  /*  fprintf(stderr, "doing insert of [%s] with key [%s] into [%s]\n", 
-         data.dptr, 
-         keystring, 
-         db->name);*/
 
   tdb_store(db, key, data, flags);
 }