[Pvfs2-cvs] commit by slang in pvfs2/src/io/bmi/bmi_tcp: bmi-tcp.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp
In directory parlweb1:/tmp/cvs-serv28385/src/io/bmi/bmi_tcp

Modified Files:
      Tag: he-branch
	bmi-tcp.c 
Log Message:
latest changes to tracing/hints code.


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.127.6.2 -r1.127.6.3
--- bmi-tcp.c	21 May 2008 18:55:21 -0000	1.127.6.2
+++ bmi-tcp.c	20 Jun 2008 04:41:00 -0000	1.127.6.3
@@ -480,33 +480,31 @@ int BMI_tcp_initialize(bmi_method_addr_p
     PINT_event_define_group("bmi_tcp", &bmi_tcp_event_group);
 
     /* Define the send event:
-     *   START: (client_id, request_id, handle, op_id, send_size)
+     *   START: (client_id, request_id, rank, handle, op_id, send_size)
      *   STOP: (size_sent)
      */
     PINT_event_define_event(
         &bmi_tcp_event_group,
 #ifdef __PVFS2_SERVER__
         "bmi_server_send",
-        "%d%ld%llu%d%d",
 #else
         "bmi_client_send",
-        "%d%d%ld%llu%d%d",
 #endif
+        "%d%d%ld%llu%d%d",
         "%d", &bmi_tcp_send_event_id);
 
     /* Define the recv event:
-     *   START: (client_id, request_id, handle, op_id, recv_size)
+     *   START: (client_id, request_id, rank, handle, op_id, recv_size)
      *   STOP: (size_received)
      */
     PINT_event_define_event(
         &bmi_tcp_event_group,
 #ifdef __PVFS2_SERVER__
         "bmi_server_recv",
-        "%d%ld%llu%d%d",
 #else
         "bmi_client_recv",
-        "%d%d%ld%llu%d%d",
 #endif
+        "%d%d%ld%llu%d%d",
         "%d", &bmi_tcp_recv_event_id);
 
     gen_mutex_unlock(&interface_mutex);
@@ -2404,9 +2402,7 @@ static int tcp_post_recv_generic(bmi_op_
 
     PINT_EVENT_START(
         bmi_tcp_recv_event_id, bmi_tcp_pid, NULL, &eid,
-#ifndef __PVFS2_SERVER__
         PINT_HINT_GET_RANK(hints),
-#endif
         PINT_HINT_GET_CLIENT_ID(hints),
         PINT_HINT_GET_REQUEST_ID(hints),
         PINT_HINT_GET_HANDLE(hints),
@@ -3717,9 +3713,7 @@ static int tcp_post_send_generic(bmi_op_
 
     PINT_EVENT_START(
         bmi_tcp_send_event_id, bmi_tcp_pid, NULL, &eid,
-#ifndef __PVFS2_SERVER__
         PINT_HINT_GET_RANK(hints),
-#endif
         PINT_HINT_GET_CLIENT_ID(hints),
         PINT_HINT_GET_REQUEST_ID(hints),
         PINT_HINT_GET_HANDLE(hints),