X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d0d626e19a7b79320e7d922c9c1dcf122076cea..2539fff313cbd67c45b8490f7961e45e358d9ba2:/src/gras/Transport/rl_transport.c

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index 1e584a4364..bd697f1532 100644
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -14,8 +14,8 @@
 #include <sys/socket.h>
 
 #include "gras/Transport/transport_private.h"
-GRAS_LOG_EXTERNAL_CATEGORY(transport);
-GRAS_LOG_DEFAULT_CATEGORY(transport);
+XBT_LOG_EXTERNAL_CATEGORY(transport);
+XBT_LOG_DEFAULT_CATEGORY(transport);
 
 
 
@@ -30,12 +30,12 @@ GRAS_LOG_DEFAULT_CATEGORY(transport);
  *
  * if timeout>0 and no message there, wait at most that amount of time before giving up.
  */
-gras_error_t 
+xbt_error_t 
 gras_trp_select(double timeout,
-		gras_socket_t **dst) {
+		gras_socket_t *dst) {
 
-  gras_error_t errcode;
-  gras_dynar_t *sockets= gras_socketset_get();
+  xbt_error_t errcode;
+  xbt_dynar_t sockets= gras_socketset_get();
   int done = -1;
   double wakeup = gras_os_time() + 1000000*timeout;
   double now = 0;
@@ -47,8 +47,8 @@ gras_trp_select(double timeout,
   fd_set FDS;
   int ready; /* return of select: number of socket ready to be serviced */
 
-  gras_socket_t *sock_iter; /* iterating over all sockets */
-  int cursor;               /* iterating over all sockets */
+  gras_socket_t sock_iter; /* iterating over all sockets */
+  int cursor;              /* iterating over all sockets */
 
   *dst=NULL;
   while (done == -1) {
@@ -62,7 +62,7 @@ gras_trp_select(double timeout,
 
     /* construct the set of socket to ear from */
     FD_ZERO(&FDS);
-    gras_dynar_foreach(sockets,cursor,sock_iter) {
+    xbt_dynar_foreach(sockets,cursor,sock_iter) {
       if (sock_iter->incoming) {
 	if (max_fds < sock_iter->sd)
 	  max_fds = sock_iter->sd;
@@ -107,7 +107,7 @@ gras_trp_select(double timeout,
 	RAISE3(system_error,"invalid select: nb fds: %d, timeout: %d.%d",
 	       max_fds, (int)tout.tv_sec,(int) tout.tv_usec);
       case ENOMEM: 
-	gras_assert0(0,"Malloc error during the select");
+	xbt_assert0(0,"Malloc error during the select");
       default:
 	RAISE2(system_error,"Error during select: %s (%d)",
 	       strerror(errno),errno);
@@ -117,7 +117,7 @@ gras_trp_select(double timeout,
       continue;	 /* this was a timeout */
     }
 
-    gras_dynar_foreach(sockets,cursor,sock_iter) { 
+    xbt_dynar_foreach(sockets,cursor,sock_iter) { 
        if(!FD_ISSET(sock_iter->sd, &FDS)) { /* this socket is not ready */
 	continue;
        }
@@ -128,7 +128,7 @@ gras_trp_select(double timeout,
        if (   sock_iter->accepting
 	   && sock_iter->plugin->socket_accept) { 
 	 /* not a socket but an ear. accept on it and serve next socket */
-	 gras_socket_t *accepted;
+	 gras_socket_t accepted;
 
 	 TRY(sock_iter->plugin->socket_accept(sock_iter,&accepted));
 	 accepted->raw = sock_iter->raw;
@@ -171,6 +171,6 @@ gras_trp_select(double timeout,
   return timeout_error;
 }
 
-gras_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) {
+xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) {
   return mismatch_error;
 }