- Reput hook for raw sockets, needed for BW experiments

   - kill a few lines of dead code

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

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 5970cda..07b7b75 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -129,7 +129,7 @@ gras_socket_server(unsigned short port,
   sock->port=port;
 
   /* Call plugin socket creation function */
-  errcode = trp->socket_server(trp, port, sock);
+  errcode = trp->socket_server(trp, port, 0/* not raw */, sock);
   if (errcode != no_error) {
     free(sock);
     return errcode;
@@ -176,6 +176,7 @@ gras_socket_client(const char *host,
   /* plugin-specific */
   errcode= (* trp->socket_client)(trp, 
                                  host ? host : "localhost", port,
+                                 0 /* not raw */,
                                  sock);
   if (errcode != no_error) {
     free(sock);

diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h
index d24e43a..d23f05e 100644 (file)
--- a/src/gras/Transport/transport_interface.h
+++ b/src/gras/Transport/transport_interface.h
@@ -42,18 +42,6 @@ void         gras_trp_exit(void);
 /* A plugin type */
 typedef struct gras_trp_plugin_ gras_trp_plugin_t;
 
-
-/**
- * e_gras_trp_plugin:
- * 
- * Caracterize each possible transport plugin
- */
-typedef enum e_gras_trp_plugin {
-   e_gras_trp_plugin_undefined = 0,
-     
-     e_gras_trp_plugin_tcp
-} gras_trp_plugin_type_t;
-
 /* A plugin type */
 struct gras_trp_plugin_ {
   char          *name;
@@ -63,9 +51,11 @@ struct gras_trp_plugin_ {
   gras_error_t (*socket_client)(gras_trp_plugin_t *self,
                                const char *host,
                                unsigned short port,
+                               int raw,
                                /* OUT */ gras_socket_t *dst);
   gras_error_t (*socket_server)(gras_trp_plugin_t *self,
                                unsigned short port,
+                               int raw,
                                /* OUT */ gras_socket_t *dst);
    
   gras_error_t (*socket_accept)(gras_socket_t  *sock,

diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index 8700947..4d29dbf 100644 (file)
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -36,9 +36,11 @@ typedef struct {
 gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
                                        const char *host,
                                        unsigned short port,
+                                       int raw,
                                        /* OUT */ gras_socket_t *sock);
 gras_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
                                        unsigned short port,
+                                       int raw,
                                        /* OUT */ gras_socket_t *sock);
 gras_error_t gras_trp_tcp_socket_accept(gras_socket_t  *sock,
                                        gras_socket_t **dst);
@@ -107,12 +109,15 @@ void gras_trp_tcp_free_specific(void *s) {
 gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
                                        const char *host,
                                        unsigned short port,
+                                       int raw,
                                        /* OUT */ gras_socket_t *sock){
   
   struct sockaddr_in addr;
   struct hostent *he;
   struct in_addr *haddr;
 
+  gras_assert0(!raw,"Raw TCP sockets not implemented yet");
+   
   sock->incoming = 1; /* TCP sockets are duplex'ed */
 
   sock->sd = socket (AF_INET, SOCK_STREAM, 0);
@@ -154,12 +159,15 @@ gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
  */
 gras_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
                                        unsigned short port,
+                                       int raw,
                                        /* OUT */ gras_socket_t *sock){
 //  int size = bufSize * 1024;
   int on = 1;
   struct sockaddr_in server;
 
-  gras_trp_tcp_specific_t *data=(gras_trp_tcp_specific_t*)self -> specific;
+  gras_assert0(!raw,"Raw TCP sockets not implemented yet");
+
+   gras_trp_tcp_specific_t *data=(gras_trp_tcp_specific_t*)self -> specific;
  
   sock->outgoing  = 1; /* TCP => duplex mode */