Unstar the gras_trp_plugin_t type, even if internal, I'm now used to it; cleanups...

[simgrid.git] / src / gras / Transport / sg_transport.c

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 8567f36..d78607c 100644 (file)
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -33,7 +33,7 @@ gras_trp_select(double timeout,
   double startTime=gras_os_time();
   gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
   gras_trp_sg_sock_data_t *sockdata;
-  gras_trp_plugin_t *trp;
+  gras_trp_plugin_t trp;
 
   gras_socket_t sock_iter; /* iterating over all sockets */
   int cursor,cpt;
@@ -55,10 +55,10 @@ gras_trp_select(double timeout,
        DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
        sockdata = sock_iter->data;
 
-       if (sock_iter->raw || !sock_iter->outgoing)
+       if (sock_iter->meas || !sock_iter->outgoing)
          continue;
 
-       if (sockdata->from_PID == r_pid) {
+       if (sockdata->to_PID == r_pid) {
          *dst=sock_iter;
          return no_error;
        }
@@ -101,8 +101,8 @@ gras_trp_select(double timeout,
 
          xbt_dynar_foreach(remote_hd->ports, cpt, pr) {
            if (sockdata->to_chan == pr.tochan) {
-             if (pr.raw) {
-               DEBUG0("Damn, it's raw");
+             if (pr.meas) {
+               DEBUG0("Damn, it's for measurement");
                continue;
              }
 
@@ -115,10 +115,10 @@ gras_trp_select(double timeout,
            }
          }
          if ((*dst)->peer_port == -10) {
-           /* was raw */
+           /* was for measurement */
            sockdata->to_chan = -1;
          } else {
-           /* found it, don't let it override by raw */
+           /* found it, don't let it override by meas */
            break;
          }
        }
@@ -149,10 +149,10 @@ gras_trp_select(double timeout,
   
 /* dummy implementations of the functions used in RL mode */
 
-xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
+xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t plug) {
   return mismatch_error;
 }
-xbt_error_t gras_trp_file_setup(gras_trp_plugin_t *plug) {
+xbt_error_t gras_trp_file_setup(gras_trp_plugin_t plug) {
   return mismatch_error;
 }