[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-serv5544/src/io/bmi/bmi_tcp

Modified Files:
      Tag: he-branch
	bmi-tcp.c 
Log Message:
mo' changes, bug fixes to hints/events.  Fixed encoding bug for hints.


Index: bmi-tcp.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_tcp/bmi-tcp.c,v
diff -p -u -r1.127.6.3 -r1.127.6.4
--- bmi-tcp.c	20 Jun 2008 04:41:00 -0000	1.127.6.3
+++ bmi-tcp.c	2 Jul 2008 19:44:17 -0000	1.127.6.4
@@ -490,7 +490,7 @@ int BMI_tcp_initialize(bmi_method_addr_p
 #else
         "bmi_client_send",
 #endif
-        "%d%d%ld%llu%d%d",
+        "%d%d%d%llu%d%d",
         "%d", &bmi_tcp_send_event_id);
 
     /* Define the recv event:
@@ -504,7 +504,7 @@ int BMI_tcp_initialize(bmi_method_addr_p
 #else
         "bmi_client_recv",
 #endif
-        "%d%d%ld%llu%d%d",
+        "%d%d%d%llu%d%d",
         "%d", &bmi_tcp_recv_event_id);
 
     gen_mutex_unlock(&interface_mutex);
@@ -2402,9 +2402,9 @@ static int tcp_post_recv_generic(bmi_op_
 
     PINT_EVENT_START(
         bmi_tcp_recv_event_id, bmi_tcp_pid, NULL, &eid,
-        PINT_HINT_GET_RANK(hints),
         PINT_HINT_GET_CLIENT_ID(hints),
         PINT_HINT_GET_REQUEST_ID(hints),
+        PINT_HINT_GET_RANK(hints),
         PINT_HINT_GET_HANDLE(hints),
         PINT_HINT_GET_OP_ID(hints),
         expected_size);
@@ -3713,9 +3713,9 @@ static int tcp_post_send_generic(bmi_op_
 
     PINT_EVENT_START(
         bmi_tcp_send_event_id, bmi_tcp_pid, NULL, &eid,
-        PINT_HINT_GET_RANK(hints),
         PINT_HINT_GET_CLIENT_ID(hints),
         PINT_HINT_GET_REQUEST_ID(hints),
+        PINT_HINT_GET_RANK(hints),
         PINT_HINT_GET_HANDLE(hints),
         PINT_HINT_GET_OP_ID(hints),
         total_size);