Start the implementation of start_time and kill_time in the msg deployment.

[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 75d2d4e..8567f36 100644 (file)
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -2,14 +2,13 @@
 
 /* sg_transport - SG specific functions for transport                       */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "gras/Transport/transport_private.h"
-#include <msg.h>
+#include "msg/msg.h"
 #include "gras/Virtu/virtu_sg.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(transport);
@@ -32,7 +31,7 @@ gras_trp_select(double timeout,
 
   xbt_error_t errcode;
   double startTime=gras_os_time();
-  gras_procdata_t *pd=gras_procdata_get();
+  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;
 
@@ -129,17 +128,20 @@ gras_trp_select(double timeout,
 
       return no_error;
     } else {
-      /*
-      DEBUG2("Select on %s@%s did not find anything yet",
+ 
+      DEBUG5("Select on %s@%s did not find anything yet at %f (waited %f of %f sec)",
             MSG_process_get_name(MSG_process_self()),
-            MSG_host_get_name(MSG_host_self()));
-      */
+            MSG_host_get_name(MSG_host_self()),
+            gras_os_time(),
+            gras_os_time()-startTime , timeout);
+ 
       /* MSG_process_sleep(1); */
       MSG_process_sleep(0.001);
     }
   } while (gras_os_time()-startTime < timeout
           || MSG_task_Iprobe((m_channel_t) pd->chan));
 
+  DEBUG0("TIMEOUT");
   return timeout_error;
 
 }