[Pvfs2-cvs] commit by slang in pvfs2/src/io/trove/trove-dbpf:
dbpf-bstream.c dbpf-dspace.c dbpf-keyval.c dbpf-mgmt.c
dbpf-sync.c dbpf-thread.c
CVS commit program
cvs at parl.clemson.edu
Wed Jul 2 15:44:19 EDT 2008
Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv5544/src/io/trove/trove-dbpf
Modified Files:
Tag: he-branch
dbpf-bstream.c dbpf-dspace.c dbpf-keyval.c dbpf-mgmt.c
dbpf-sync.c dbpf-thread.c
Log Message:
mo' changes, bug fixes to hints/events. Fixed encoding bug for hints.
Index: dbpf-bstream.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-bstream.c,v
diff -p -u -r1.80.12.2 -r1.80.12.3
--- dbpf-bstream.c 20 Jun 2008 04:41:00 -0000 1.80.12.2
+++ dbpf-bstream.c 2 Jul 2008 19:44:18 -0000 1.80.12.3
@@ -945,6 +945,16 @@ inline int dbpf_bstream_rw_list(TROVE_co
}
q_op_p->event_type = event_type;
+ gossip_debug(GOSSIP_TROVE_DEBUG, "bstream_read: client_id:%d, req_id:%d, rank:%d, handle:%llu, dfhandle:%llu, mem:%d\n",
+ PINT_HINT_GET_CLIENT_ID(hints),
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints),
+ PINT_HINT_GET_HANDLE(hints),
+ handle,
+ PINT_HINT_GET_OP_ID(hints),
+ count_mem);
+
+
PINT_EVENT_START(event_type, dbpf_pid, NULL, &q_op_p->event_id,
PINT_HINT_GET_CLIENT_ID(hints),
PINT_HINT_GET_REQUEST_ID(hints),
Index: dbpf-dspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-dspace.c,v
diff -p -u -r1.157.2.2 -r1.157.2.3
--- dbpf-dspace.c 20 Jun 2008 04:41:01 -0000 1.157.2.2
+++ dbpf-dspace.c 2 Jul 2008 19:44:18 -0000 1.157.2.3
@@ -148,6 +148,10 @@ static int dbpf_dspace_create(TROVE_coll
}
q_op_p->event_type = trove_dbpf_dspace_create_event_id;
+ gossip_debug(GOSSIP_TROVE_DEBUG, "create: reqid: %d, rank: %d\n",
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints));
+
PINT_EVENT_START(q_op_p->event_type,
dbpf_pid, NULL, &q_op_p->event_id,
PINT_HINT_GET_CLIENT_ID(hints),
@@ -973,6 +977,11 @@ static int dbpf_dspace_getattr(TROVE_col
}
q_op_p->event_type = trove_dbpf_dspace_getattr_event_id;
+
+ gossip_debug(GOSSIP_TROVE_DEBUG, "getattr: reqid: %d, rank: %d\n",
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints));
+
PINT_EVENT_START(trove_dbpf_dspace_getattr_event_id,
dbpf_pid, NULL, &q_op_p->event_id,
PINT_HINT_GET_CLIENT_ID(hints),
@@ -1121,6 +1130,10 @@ static int dbpf_dspace_setattr(TROVE_col
}
q_op_p->event_type = trove_dbpf_dspace_setattr_event_id;
+ gossip_debug(GOSSIP_TROVE_DEBUG, "setattr: reqid: %d, rank: %d\n",
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints));
+
PINT_EVENT_START(q_op_p->event_type,
dbpf_pid, NULL, &q_op_p->event_id,
PINT_HINT_GET_CLIENT_ID(hints),
Index: dbpf-keyval.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-keyval.c,v
diff -p -u -r1.86.4.3 -r1.86.4.4
--- dbpf-keyval.c 20 Jun 2008 04:41:01 -0000 1.86.4.3
+++ dbpf-keyval.c 2 Jul 2008 19:44:18 -0000 1.86.4.4
@@ -229,6 +229,11 @@ static int dbpf_keyval_read(TROVE_coll_i
q_op_p->event_type = trove_dbpf_keyval_read_event_id;
+ gossip_debug(GOSSIP_TROVE_DEBUG, "kv_read: client_id: %d, reqid: %d, rank: %d\n",
+ PINT_HINT_GET_CLIENT_ID(hints),
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints));
+
PINT_EVENT_START(trove_dbpf_keyval_read_event_id,
dbpf_pid, NULL, &q_op_p->event_id,
PINT_HINT_GET_CLIENT_ID(hints),
@@ -362,6 +367,10 @@ static int dbpf_keyval_write(TROVE_coll_
}
q_op_p->event_type = trove_dbpf_keyval_write_event_id;
+
+ gossip_debug(GOSSIP_TROVE_DEBUG, "kv_write: reqid: %d, rank: %d\n",
+ PINT_HINT_GET_REQUEST_ID(hints),
+ PINT_HINT_GET_RANK(hints));
PINT_EVENT_START(trove_dbpf_keyval_write_event_id,
dbpf_pid, NULL, &q_op_p->event_id,
Index: dbpf-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-mgmt.c,v
diff -p -u -r1.101.2.2 -r1.101.2.3
--- dbpf-mgmt.c 20 Jun 2008 04:41:01 -0000 1.101.2.2
+++ dbpf-mgmt.c 2 Jul 2008 19:44:18 -0000 1.101.2.3
@@ -549,7 +549,7 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_read",
- "%d%ld%ld%llu%llu%d%d",
+ "%d%d%d%llu%llu%d%d",
"%llu",
&trove_dbpf_read_event_id);
@@ -560,7 +560,7 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_write",
- "%d%ld%ld%llu%llu%d%d",
+ "%d%d%d%llu%llu%d%d",
"%llu",
&trove_dbpf_write_event_id);
@@ -570,18 +570,18 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_keyval_read",
- "%d%ld%ld%llu%d",
+ "%d%d%d%llu%d",
"",
&trove_dbpf_keyval_read_event_id);
/* Define the keyval write event:
* START:
- * (client_id, request_id, rank, metafile-handle, keyval-handle, op_id)
+ * (client_id, request_id, rank, metafile-handle, op_id)
* STOP: (none)
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_keyval_write",
- "%d%ld%ld%llu%llu%d",
+ "%d%d%d%llu%d",
"",
&trove_dbpf_keyval_write_event_id);
@@ -592,7 +592,7 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_dspace_create",
- "%d%ld%ld%d",
+ "%d%d%d%d",
"%llu",
&trove_dbpf_dspace_create_event_id);
@@ -603,7 +603,7 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_dspace_getattr",
- "%d%ld%ld%llu%d",
+ "%d%d%d%llu%d",
"",
&trove_dbpf_dspace_getattr_event_id);
@@ -614,7 +614,7 @@ static int dbpf_initialize(char *stoname
*/
PINT_event_define_event(&trove_dbpf_event_group,
"dbpf_dspace_setattr",
- "%d%ld%ld%llu%d",
+ "%d%d%d%llu%d",
"",
&trove_dbpf_dspace_setattr_event_id);
@@ -2045,8 +2045,7 @@ static void unlink_db_cache_files(const
{
for(i=0; i<pglob.gl_pathc; i++)
{
- gossip_debug(GOSSIP_TROVE_DEBUG, "Unlinking old db cache file: %s\n", pglob.gl_pathv[i]);
- unlink(pglob.gl_pathv[i]);
+ gossip_debug(GOSSIP_TROVE_DEBUG, "Unlinking old db cache file: %s\n", pglob.gl_pathv[i]); unlink(pglob.gl_pathv[i]);
}
globfree(&pglob);
}
Index: dbpf-sync.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-sync.c,v
diff -p -u -r1.14 -r1.14.12.1
--- dbpf-sync.c 1 Jun 2007 20:58:05 -0000 1.14
+++ dbpf-sync.c 2 Jul 2008 19:44:18 -0000 1.14.12.1
@@ -220,6 +220,16 @@ int dbpf_sync_coalesce(dbpf_queued_op_t
"to completion queue\n",
qop_p, llu(qop_p->op.handle));
+ if(qop_p->event_type == trove_dbpf_dspace_create_event_id)
+ {
+ PINT_EVENT_END(qop_p->event_type, dbpf_pid, NULL, qop_p->event_id,
+ qop_p->op.u.d_create.out_handle_p);
+ }
+ else
+ {
+ PINT_EVENT_END(qop_p->event_type, dbpf_pid, NULL, qop_p->event_id);
+ }
+
DBPF_COMPLETION_START(qop_p, OP_COMPLETED);
(*outcount)++;
@@ -230,6 +240,16 @@ int dbpf_sync_coalesce(dbpf_queued_op_t
while(!dbpf_op_queue_empty(sync_context->sync_queue))
{
ready_op = dbpf_op_queue_shownext(sync_context->sync_queue);
+
+ if(ready_op->event_type == trove_dbpf_dspace_create_event_id)
+ {
+ PINT_EVENT_END(ready_op->event_type, dbpf_pid, NULL, ready_op->event_id,
+ ready_op->op.u.d_create.out_handle_p);
+ }
+ else
+ {
+ PINT_EVENT_END(ready_op->event_type, dbpf_pid, NULL, ready_op->event_id);
+ }
gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
"[SYNC_COALESCE]: moving op: %p with handle: %llu "
Index: dbpf-thread.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-thread.c,v
diff -p -u -r1.39 -r1.39.4.1
--- dbpf-thread.c 19 Mar 2008 16:42:09 -0000 1.39
+++ dbpf-thread.c 2 Jul 2008 19:44:18 -0000 1.39.4.1
@@ -83,6 +83,7 @@ void *dbpf_thread_function(void *ptr)
gossip_debug(GOSSIP_TROVE_DEBUG, "dbpf_thread_function started\n");
+ PINT_event_thread_start("TROVE-DBPF");
while(dbpf_thread_running)
{
/* check if we any have ops to service in our work queue */
@@ -137,6 +138,7 @@ void *dbpf_thread_function(void *ptr)
}
gossip_debug(GOSSIP_TROVE_DEBUG, "dbpf_thread_function ending\n");
+ PINT_event_thread_stop();
#endif
return ptr;
}
More information about the Pvfs2-cvs
mailing list