[Pvfs2-cvs] commit by rzhong in pvfs2/src/io/trove/trove-dbpf: dbpf-mgmt.c dbpf-sync.c dbpf-thread.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv25877/src/io/trove/trove-dbpf

Modified Files:
      Tag: rongrong
	dbpf-mgmt.c dbpf-sync.c dbpf-thread.c 
Log Message:
fixed a race condition between the cond_wait and signal in db-rep-send.sm
fixed some memory leak


Index: dbpf-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-mgmt.c,v
diff -p -u -r1.101.4.10 -r1.101.4.11
--- dbpf-mgmt.c	25 Aug 2008 20:49:58 -0000	1.101.4.10
+++ dbpf-mgmt.c	28 Aug 2008 20:38:32 -0000	1.101.4.11
@@ -1806,7 +1806,7 @@ static int dbpf_dbrep_start_op_svc(struc
 
 	dbenv->rep_start(dbenv, NULL, DB_REP_CLIENT);
 
-	sleep(20);
+	sleep(5);
 	gossip_debug(GOSSIP_DB_REP_DEBUG, "*****after waiting for rep_start****\n");
 	DBPF_GET_COLL_ATTRIB_DBNAME(path_name, PATH_MAX,
 				    sto_p->name, coll_p->coll_id);

Index: dbpf-sync.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-sync.c,v
diff -p -u -r1.14.14.5 -r1.14.14.6
--- dbpf-sync.c	22 Aug 2008 22:15:07 -0000	1.14.14.5
+++ dbpf-sync.c	28 Aug 2008 20:38:32 -0000	1.14.14.6
@@ -480,6 +480,8 @@ retry:
     qlist_for_each_entry_safe(entry, next, txn_context->txn_queue, link)
     {
 	qlist_del(&entry->link);
+	free(entry->key.data);
+	free(entry->data.data);
 	free(entry);
     }
     gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,

Index: dbpf-thread.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-thread.c,v
diff -p -u -r1.39.6.3 -r1.39.6.4
--- dbpf-thread.c	22 Aug 2008 22:15:07 -0000	1.39.6.3
+++ dbpf-thread.c	28 Aug 2008 20:38:32 -0000	1.39.6.4
@@ -175,10 +175,11 @@ void *dbpf_checkpoint_thread_function(vo
 {
 #ifdef __PVFS2_TROVE_THREADED__
     DB_ENV *dbenv = (DB_ENV *)ptr;
+
     while(dbpf_thread_running)
     {
 	dbenv->txn_checkpoint(dbenv, 512, 1, 0);
-	dbenv->log_archive(dbenv, NULL, DB_ARCH_REMOVE);
+	/*dbenv->log_archive(dbenv, NULL, DB_ARCH_REMOVE);*/
     }
 #endif
     return ptr;