Keep in sync with last changes in the GRAS callback API

[simgrid.git] / src / amok / Bandwidth / bandwidth_private.h

diff --git a/src/amok/Bandwidth/bandwidth_private.h b/src/amok/Bandwidth/bandwidth_private.h
index a263c80fb0ee9ab653b40db4b70bac8e0c4e14b7..b2ce0f4e15cb5c408f7ea8b660ed06950df6b316 100644 (file)
--- a/src/amok/Bandwidth/bandwidth_private.h
+++ b/src/amok/Bandwidth/bandwidth_private.h
@@ -16,39 +16,28 @@
 #include "gras.h"
 #include "amok/bandwidth.h"
 
-/**
- * bw_request_t:
- *
- * Request for a BW experiment.
+/* Request for a BW experiment.
  * If host==NULL, it should be between the sender and the receiver.
- * If not, it should be between between the receiver and @host (3-tiers).
+ * If not, it should be between between the receiver and host (3-tiers).
  */
 typedef struct {
   xbt_host_t host; /* host+raw socket to use */
-  unsigned int buf_size;
-  unsigned int exp_size;
-  unsigned int msg_size;
+  unsigned long int buf_size;
+  unsigned long int exp_size;
+  unsigned long int msg_size;
 } s_bw_request_t,*bw_request_t;
 
-/**
- * bw_res_t:
- *
- * Result of a BW experiment (payload when answering).
+/* Result of a BW experiment (payload when answering).
  * if err.msg != NULL, it wasn't sucessful. Check err.msg and err.code to see why.
- * else
  */
 typedef struct {
-  s_amok_remoterr_t err;
   unsigned int timestamp;
-  double seconds;
+  double sec;
   double bw;
 } s_bw_res,*bw_res_t;
 
 
-/**
- * sat_request_t:
- *
- * Description of a saturation experiment (payload asking some host to collaborate for that)
+/* Description of a saturation experiment (payload asking some host to collaborate for that)
  */
 typedef struct {
   xbt_host_t host; /* host+raw socket to use */
@@ -57,14 +46,10 @@ typedef struct {
 } s_sat_request_t,*sat_request_t;
 
 /* Prototypes of local callbacks */
-int amok_bw_cb_bw_handshake(gras_socket_t  expeditor,
-                           void          *payload);
-int amok_bw_cb_bw_request(gras_socket_t    expeditor,
-                         void            *payload);
+int amok_bw_cb_bw_handshake(gras_msg_cb_ctx_t ctx, void *payload);
+int amok_bw_cb_bw_request(gras_msg_cb_ctx_t ctx, void *payload);
 
-int amok_bw_cb_sat_start(gras_socket_t     expeditor,
-                        void             *payload);
-int amok_bw_cb_sat_begin(gras_socket_t     expeditor,
-                        void             *payload);
+int amok_bw_cb_sat_start(gras_msg_cb_ctx_t ctx, void *payload);
+int amok_bw_cb_sat_begin(gras_msg_cb_ctx_t ctx, void *payload);
 
 #endif /* AMOK_BANDWIDTH_PRIVATE_H */