svn commit: samba r19857 - in branches/SAMBA_3_0/examples/perfcounter: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-11-23 15:39:37 +0000 (Thu, 23 Nov 2006)
New Revision: 19857

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19857

Log:
Make the perfcounter compile after tdb changes
Modified:
   branches/SAMBA_3_0/examples/perfcounter/Makefile
   branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c


Changeset:
Modified: branches/SAMBA_3_0/examples/perfcounter/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/perfcounter/Makefile	2006-11-23 13:48:01 UTC (rev 19856)
+++ branches/SAMBA_3_0/examples/perfcounter/Makefile	2006-11-23 15:39:37 UTC (rev 19857)
@@ -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:

Modified: branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c
===================================================================
--- branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c	2006-11-23 13:48:01 UTC (rev 19856)
+++ branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c	2006-11-23 15:39:37 UTC (rev 19857)
@@ -37,10 +37,6 @@
   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 @@
   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);
 }