Kill an internal function marked 'KILLME' and surviving from the times where libdata...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1724 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index ecbcd06..4810f8c 100644 (file)
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -25,7 +25,7 @@ XBT_LOG_DEFAULT_CATEGORY(transport);
  * if timeout>0 and no message there, wait at most that amount of time before giving up.
  */
 gras_socket_t gras_trp_select(double timeout) {
-  xbt_dynar_t sockets= gras_socketset_get();
+  xbt_dynar_t sockets= ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
   int done = -1;
   double wakeup = gras_os_time() + timeout;
   double now = 0;

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index e5684be..6b5530f 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -93,7 +93,7 @@ void gras_trp_init(void){
 
 void
 gras_trp_exit(void){
-  xbt_dynar_t sockets = gras_socketset_get();
+  xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
   gras_socket_t sock_iter;
   int cursor;
 
@@ -170,7 +170,7 @@ void gras_trp_socket_new(int incoming,
   
   *dst = sock;
 
-  xbt_dynar_push(gras_socketset_get(),dst);
+  xbt_dynar_push(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
   XBT_OUT;
 }
 
@@ -287,7 +287,7 @@ gras_socket_client(const char *host,
 
 
 void gras_socket_close(gras_socket_t sock) {
-  xbt_dynar_t sockets = gras_socketset_get();
+  xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
   gras_socket_t sock_iter;
   int cursor;
 
@@ -502,9 +502,3 @@ void gras_trp_register() {
    gras_trp_libdata_id = gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free);
 }
 
-
-xbt_dynar_t 
-gras_socketset_get(void) {
-   /* FIXME: KILLME */
-   return ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
-}

diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h
index 8627e32..f2ed8cb 100644 (file)
--- a/src/gras/Transport/transport_interface.h
+++ b/src/gras/Transport/transport_interface.h
@@ -88,10 +88,12 @@ typedef struct {
   char        *name;
   unsigned int name_len;
 
+  xbt_dynar_t sockets; /* all sockets known to this process */
+  fd_set *fdset;
+
   /* SG only elements. In RL, they are part of the OS ;) */
   int chan;    /* Formated messages channel */
   int measChan; /* Unformated echange channel for performance measurement*/
-  xbt_dynar_t sockets; /* all sockets known to this process */
    
 } s_gras_trp_procdata_t,*gras_trp_procdata_t;
 

diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h
index 774ed60..9af4bed 100644 (file)
--- a/src/gras/Transport/transport_private.h
+++ b/src/gras/Transport/transport_private.h
@@ -23,7 +23,7 @@
 #include "gras/transport.h"  /* rest of module interface */
 
 #include "gras/Transport/transport_interface.h" /* semi-public API */
-#include "gras/Virtu/virtu_interface.h" /* socketset_get() */
+#include "gras/Virtu/virtu_interface.h" /* libdata management */
 
 extern int gras_trp_libdata_id; /* our libdata identifier */
 /**
@@ -86,6 +86,4 @@ void gras_trp_buf_setup(gras_trp_plugin_t plug);
 
 gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock);
 
-xbt_dynar_t gras_socketset_get(void); /* FIXME:KILLME */
-
 #endif /* GRAS_TRP_PRIVATE_H */