[Pvfs2-cvs] commit by slang in pvfs2/src/io/bmi: bmi-method-support.h bmi.c bmi.h

CVS commit program cvs at parl.clemson.edu
Mon Apr 7 12:31:07 EDT 2008


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

Modified Files:
      Tag: he-branch
	bmi-method-support.h bmi.c bmi.h 
Log Message:
hints and events.


Index: bmi-method-support.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi-method-support.h,v
diff -p -u -r1.32 -r1.32.6.1
--- bmi-method-support.h	30 Nov 2007 19:35:26 -0000	1.32
+++ bmi-method-support.h	7 Apr 2008 16:31:07 -0000	1.32.6.1
@@ -13,6 +13,7 @@
 
 #include "quicklist.h"
 #include "bmi-types.h"
+#include "pint-event.h"
 
 #define BMI_MAX_CONTEXTS 16
 
@@ -78,7 +79,8 @@ struct bmi_method_ops
                       enum bmi_buffer_type,
                       bmi_msg_tag_t,
                       void *,
-                      bmi_context_id);
+                      bmi_context_id,
+                      PVFS_hint hints);
     int (*post_sendunexpected) (bmi_op_id_t *,
                                 bmi_method_addr_p,
                                 const void *,
@@ -86,7 +88,8 @@ struct bmi_method_ops
                                 enum bmi_buffer_type,
                                 bmi_msg_tag_t,
                                 void *,
-                                bmi_context_id);
+                                bmi_context_id,
+                                PVFS_hint hints);
     int (*post_recv) (bmi_op_id_t *,
                       bmi_method_addr_p,
                       void *,
@@ -95,7 +98,8 @@ struct bmi_method_ops
                       enum bmi_buffer_type,
                       bmi_msg_tag_t,
                       void *,
-                      bmi_context_id);
+                      bmi_context_id,
+                      PVFS_hint hints);
     int (*test) (bmi_op_id_t,
                  int *,
                  bmi_error_code_t *,
@@ -134,7 +138,8 @@ struct bmi_method_ops
                            enum bmi_buffer_type,
                            bmi_msg_tag_t,
                            void *,
-                           bmi_context_id);
+                           bmi_context_id,
+                           PVFS_hint hints);
     int (*post_recv_list) (bmi_op_id_t *,
                            bmi_method_addr_p,
                            void *const *,
@@ -145,7 +150,8 @@ struct bmi_method_ops
                            enum bmi_buffer_type,
                            bmi_msg_tag_t,
                            void *,
-                           bmi_context_id);
+                           bmi_context_id,
+                           PVFS_hint Hints);
     int (*post_sendunexpected_list) (bmi_op_id_t *,
                                      bmi_method_addr_p,
                                      const void *const *,
@@ -155,7 +161,8 @@ struct bmi_method_ops
                                      enum bmi_buffer_type,
                                      bmi_msg_tag_t,
                                      void *,
-                                     bmi_context_id);
+                                     bmi_context_id,
+                                     PVFS_hint hints);
     int (*open_context)(bmi_context_id);
     void (*close_context)(bmi_context_id);
     int (*cancel)(bmi_op_id_t, bmi_context_id);
@@ -200,6 +207,7 @@ struct method_op
     int list_index;		/* index of current buffer to xfer */
     /* how much is completed in current buffer */
     bmi_size_t cur_index_complete;
+    PINT_event_id event_id;
 };
 typedef struct method_op method_op_st, *method_op_p;
 

Index: bmi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi.c,v
diff -p -u -r1.90 -r1.90.10.1
--- bmi.c	7 Nov 2007 16:43:59 -0000	1.90
+++ bmi.c	7 Apr 2008 16:31:07 -0000	1.90.10.1
@@ -594,7 +594,8 @@ int BMI_post_recv(bmi_op_id_t * id,
 		  enum bmi_buffer_type buffer_type,
 		  bmi_msg_tag_t tag,
 		  void *user_ptr,
-		  bmi_context_id context_id)
+		  bmi_context_id context_id,
+                  PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -616,7 +617,7 @@ int BMI_post_recv(bmi_op_id_t * id,
 
     ret = tmp_ref->interface->post_recv(
         id, tmp_ref->method_addr, buffer, expected_size, actual_size,
-        buffer_type, tag, user_ptr, context_id);
+        buffer_type, tag, user_ptr, context_id, hints);
     return (ret);
 }
 
@@ -632,7 +633,8 @@ int BMI_post_send(bmi_op_id_t * id,
 		  enum bmi_buffer_type buffer_type,
 		  bmi_msg_tag_t tag,
 		  void *user_ptr,
-		  bmi_context_id context_id)
+		  bmi_context_id context_id,
+                  PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -654,7 +656,7 @@ int BMI_post_send(bmi_op_id_t * id,
 
     ret = tmp_ref->interface->post_send(
         id, tmp_ref->method_addr, buffer, size, buffer_type, tag,
-        user_ptr, context_id);
+        user_ptr, context_id, hints);
     return (ret);
 }
 
@@ -670,7 +672,8 @@ int BMI_post_sendunexpected(bmi_op_id_t 
 			    enum bmi_buffer_type buffer_type,
 			    bmi_msg_tag_t tag,
 			    void *user_ptr,
-			    bmi_context_id context_id)
+			    bmi_context_id context_id,
+                            PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -692,7 +695,7 @@ int BMI_post_sendunexpected(bmi_op_id_t 
 
     ret = tmp_ref->interface->post_sendunexpected(
         id, tmp_ref->method_addr, buffer, size, buffer_type, tag,
-        user_ptr, context_id);
+        user_ptr, context_id, hints);
     return (ret);
 }
 
@@ -1634,7 +1637,8 @@ int BMI_post_send_list(bmi_op_id_t * id,
 		       enum bmi_buffer_type buffer_type,
 		       bmi_msg_tag_t tag,
 		       void *user_ptr,
-		       bmi_context_id context_id)
+		       bmi_context_id context_id,
+                       PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -1670,7 +1674,7 @@ int BMI_post_send_list(bmi_op_id_t * id,
 	ret = tmp_ref->interface->post_send_list(
             id, tmp_ref->method_addr, buffer_list, size_list,
             list_count, total_size, buffer_type, tag, user_ptr,
-            context_id);
+            context_id, hints);
 
 	return (ret);
     }
@@ -1701,7 +1705,8 @@ int BMI_post_recv_list(bmi_op_id_t * id,
 		       enum bmi_buffer_type buffer_type,
 		       bmi_msg_tag_t tag,
 		       void *user_ptr,
-		       bmi_context_id context_id)
+		       bmi_context_id context_id,
+                       PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -1737,7 +1742,7 @@ int BMI_post_recv_list(bmi_op_id_t * id,
 	ret = tmp_ref->interface->post_recv_list(
             id, tmp_ref->method_addr, buffer_list, size_list,
             list_count, total_expected_size, total_actual_size,
-            buffer_type, tag, user_ptr, context_id);
+            buffer_type, tag, user_ptr, context_id, hints);
 
 	return (ret);
     }
@@ -1766,7 +1771,8 @@ int BMI_post_sendunexpected_list(bmi_op_
 				 enum bmi_buffer_type buffer_type,
 				 bmi_msg_tag_t tag,
 				 void *user_ptr,
-				 bmi_context_id context_id)
+				 bmi_context_id context_id,
+                                 PVFS_hint hints)
 {
     ref_st_p tmp_ref = NULL;
     int ret = -1;
@@ -1803,7 +1809,7 @@ int BMI_post_sendunexpected_list(bmi_op_
 	ret = tmp_ref->interface->post_sendunexpected_list(
             id, tmp_ref->method_addr, buffer_list, size_list,
             list_count, total_size, buffer_type, tag, user_ptr,
-            context_id);
+            context_id, hints);
 
 	return (ret);
     }

Index: bmi.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi.h,v
diff -p -u -r1.30 -r1.30.20.1
--- bmi.h	20 Sep 2006 04:36:12 -0000	1.30
+++ bmi.h	7 Apr 2008 16:31:07 -0000	1.30.20.1
@@ -49,7 +49,8 @@ int BMI_post_send(bmi_op_id_t * id,
 		  enum bmi_buffer_type buffer_type,
 		  bmi_msg_tag_t tag,
 		  void *user_ptr,
-		  bmi_context_id context_id);
+		  bmi_context_id context_id,
+                  PVFS_hint hints);
 
 int BMI_post_sendunexpected(bmi_op_id_t * id,
 			    PVFS_BMI_addr_t dest,
@@ -58,7 +59,8 @@ int BMI_post_sendunexpected(bmi_op_id_t 
 			    enum bmi_buffer_type buffer_type,
 			    bmi_msg_tag_t tag,
 			    void *user_ptr,
-			    bmi_context_id context_id);
+			    bmi_context_id context_id,
+                            PVFS_hint hints);
 
 int BMI_post_recv(bmi_op_id_t * id,
 		  PVFS_BMI_addr_t src,
@@ -68,7 +70,8 @@ int BMI_post_recv(bmi_op_id_t * id,
 		  enum bmi_buffer_type buffer_type,
 		  bmi_msg_tag_t tag,
 		  void *user_ptr,
-		  bmi_context_id context_id);
+		  bmi_context_id context_id,
+                  PVFS_hint hints);
 
 int BMI_test(bmi_op_id_t id,
 	     int *outcount,
@@ -143,7 +146,8 @@ int BMI_post_send_list(bmi_op_id_t * id,
 		       enum bmi_buffer_type buffer_type,
 		       bmi_msg_tag_t tag,
 		       void *user_ptr,
-		       bmi_context_id context_id);
+		       bmi_context_id context_id,
+                       PVFS_hint hints);
 
 int BMI_post_recv_list(bmi_op_id_t * id,
 		       PVFS_BMI_addr_t src,
@@ -157,7 +161,8 @@ int BMI_post_recv_list(bmi_op_id_t * id,
 		       enum bmi_buffer_type buffer_type,
 		       bmi_msg_tag_t tag,
 		       void *user_ptr,
-		       bmi_context_id context_id);
+		       bmi_context_id context_id,
+                       PVFS_hint hints);
 
 int BMI_post_sendunexpected_list(bmi_op_id_t * id,
 				 PVFS_BMI_addr_t dest,
@@ -169,7 +174,8 @@ int BMI_post_sendunexpected_list(bmi_op_
 				 enum bmi_buffer_type buffer_type,
 				 bmi_msg_tag_t tag,
 				 void *user_ptr,
-				 bmi_context_id context_id);
+				 bmi_context_id context_id,
+                                 PVFS_hint hints);
 
 int BMI_cancel(bmi_op_id_t id, 
 	       bmi_context_id context_id);



More information about the Pvfs2-cvs mailing list