XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_buf,transport,
"Generic buffered transport (works on top of TCP or SG)");
+
+static gras_trp_plugin_t _buf_super;
+
/***
*** Prototypes
***/
-xbt_error_t gras_trp_buf_socket_client(gras_trp_plugin_t *self,
+void hexa_print(const char*name, unsigned char *data, int size); /* in gras.c */
+
+xbt_error_t gras_trp_buf_socket_client(gras_trp_plugin_t self,
gras_socket_t sock);
-xbt_error_t gras_trp_buf_socket_server(gras_trp_plugin_t *self,
+xbt_error_t gras_trp_buf_socket_server(gras_trp_plugin_t self,
gras_socket_t sock);
xbt_error_t gras_trp_buf_socket_accept(gras_socket_t sock,
gras_socket_t *dst);
void gras_trp_buf_socket_close(gras_socket_t sd);
xbt_error_t gras_trp_buf_chunk_send(gras_socket_t sd,
- const char *data,
- long int size);
+ const char *data,
+ unsigned long int size);
xbt_error_t gras_trp_buf_chunk_recv(gras_socket_t sd,
- char *data,
- long int size);
+ char *data,
+ unsigned long int size);
xbt_error_t gras_trp_buf_flush(gras_socket_t sock);
***/
typedef struct {
- gras_trp_plugin_t *super;
+ int junk;
} gras_trp_buf_plug_data_t;
/***
data->in.data = xbt_malloc(data->buffsize);
data->in.pos = 0; /* useless, indeed, since size==pos */
- data->out.size = 0;
+ /* In SG, the 4 first bytes are for the chunk size as htonl'ed, so that we can send it in one shoot.
+ * This is mandatory in SG because all emissions go to the same channel, so if we split them,
+ * they can get mixed. */
+ data->out.size = gras_if_RL()?0:4;
data->out.data = xbt_malloc(data->buffsize);
- data->out.pos = 0;
+ data->out.pos = data->out.size;
sock->bufdata = data;
}
-
/***
*** Code
***/
xbt_error_t
-gras_trp_buf_setup(gras_trp_plugin_t *plug) {
+gras_trp_buf_setup(gras_trp_plugin_t plug) {
xbt_error_t errcode;
gras_trp_buf_plug_data_t *data =xbt_new(gras_trp_buf_plug_data_t,1);
XBT_IN;
- TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
- &(data->super)));
+ TRYOLD(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
+ &_buf_super));
DEBUG1("Derivate a buffer plugin from %s",gras_if_RL() ? "tcp" : "sg");
plug->socket_client = gras_trp_buf_socket_client;
return no_error;
}
-xbt_error_t gras_trp_buf_socket_client(gras_trp_plugin_t *self,
+xbt_error_t gras_trp_buf_socket_client(gras_trp_plugin_t self,
/* OUT */ gras_socket_t sock){
xbt_error_t errcode;
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)self->data)->super;
XBT_IN;
- TRY(super->socket_client(super,sock));
+ TRYOLD(_buf_super->socket_client(_buf_super,sock));
sock->plugin = self;
gras_trp_buf_init_sock(sock);
*
* Open a socket used to receive messages.
*/
-xbt_error_t gras_trp_buf_socket_server(gras_trp_plugin_t *self,
+xbt_error_t gras_trp_buf_socket_server(gras_trp_plugin_t self,
/* OUT */ gras_socket_t sock){
xbt_error_t errcode;
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)self->data)->super;
XBT_IN;
- TRY(super->socket_server(super,sock));
+ TRYOLD(_buf_super->socket_server(_buf_super,sock));
sock->plugin = self;
gras_trp_buf_init_sock(sock);
return no_error;
gras_trp_buf_socket_accept(gras_socket_t sock,
gras_socket_t *dst) {
xbt_error_t errcode;
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)sock->plugin->data)->super;
XBT_IN;
- TRY(super->socket_accept(sock,dst));
+ TRYOLD(_buf_super->socket_accept(sock,dst));
(*dst)->plugin = sock->plugin;
gras_trp_buf_init_sock(*dst);
+ XBT_OUT;
return no_error;
}
void gras_trp_buf_socket_close(gras_socket_t sock){
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)sock->plugin->data)->super;
+ xbt_error_t errcode;
gras_trp_bufdata_t *data=sock->bufdata;
XBT_IN;
- if (data->in.size || data->out.size)
+ if (data->in.size!=data->in.pos) {
+ WARN3("Socket closed, but %d bytes were unread (size=%d,pos=%d)",
+ data->in.size - data->in.pos,data->in.size, data->in.pos);
+ }
+
+ if (data->out.size!=data->out.pos) {
+ DEBUG2("Flush the socket before closing (in=%d,out=%d)",data->in.size, data->out.size);
gras_trp_buf_flush(sock);
+ }
+
if (data->in.data)
- xbt_free(data->in.data);
+ free(data->in.data);
if (data->out.data)
- xbt_free(data->out.data);
- xbt_free(data);
+ free(data->out.data);
+ free(data);
- super->socket_close(sock);
+ _buf_super->socket_close(sock);
}
/**
* gras_trp_buf_chunk_send:
*
- * Send data on a TCP socket
+ * Send data on a buffered socket
*/
xbt_error_t
gras_trp_buf_chunk_send(gras_socket_t sock,
const char *chunk,
- long int size) {
+ unsigned long int size) {
xbt_error_t errcode;
gras_trp_bufdata_t *data=(gras_trp_bufdata_t*)sock->bufdata;
data->out.size,size-chunk_pos,size,(int)chunk_pos,chunk);
if (data->out.size == data->buffsize) /* out of space. Flush it */
- TRY(gras_trp_buf_flush(sock));
+ TRYOLD(gras_trp_buf_flush(sock));
}
XBT_OUT;
/**
* gras_trp_buf_chunk_recv:
*
- * Receive data on a TCP socket.
+ * Receive data on a buffered socket.
*/
xbt_error_t
gras_trp_buf_chunk_recv(gras_socket_t sock,
char *chunk,
- long int size) {
+ unsigned long int size) {
xbt_error_t errcode;
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)sock->plugin->data)->super;
gras_trp_bufdata_t *data=sock->bufdata;
long int chunck_pos = 0;
-
+
/* Let underneath plugin check for direction, we work even in duplex */
xbt_assert0(sock, "Cannot recv on an NULL socket");
xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
if (data->in.size == data->in.pos) { /* out of data. Get more */
int nextsize;
- DEBUG0("Recv the size");
- TRY(super->chunk_recv(sock,(char*)&nextsize, 4));
- data->in.size = (int)ntohl(nextsize);
-
- VERB1("Recv the chunk (size=%d)",data->in.size);
- TRY(super->chunk_recv(sock, data->in.data, data->in.size));
- data->in.pos=0;
+ if (gras_if_RL()) {
+ DEBUG0("Recv the size");
+ errcode=_buf_super->chunk_recv(sock,(char*)&nextsize, 4);
+ if (errcode!=no_error)
+ RAISE4(errcode,"Got '%s' while trying to get the chunk size on %p (peer = %s:%d)",
+ xbt_error_name(errcode),sock,gras_socket_peer_name(sock),gras_socket_peer_port(sock));
+ data->in.size = (int)ntohl(nextsize);
+ VERB1("Recv the chunk (size=%d)",data->in.size);
+ } else {
+ data->in.size = -1;
+ }
+
+ TRYOLD(_buf_super->chunk_recv(sock, data->in.data, data->in.size));
+
+ if (gras_if_RL()) {
+ data->in.pos=0;
+ } else {
+ memcpy((char*)&nextsize,data->in.data,4);
+ data->in.size = nextsize+4;
+ data->in.pos=4;
+ VERB3("Got the chunk (size=%d+4 for the size ifself)='%.*s'",
+ data->in.size-4, data->in.size,data->in.data);
+ if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
+ hexa_print("chunck received",data->in.data,data->in.size);
+ }
+
}
-
+
thissize = min(size-chunck_pos , data->in.size - data->in.pos);
DEBUG2("Get the chars %d..%ld out of the buffer",
data->in.pos,
gras_trp_buf_flush(gras_socket_t sock) {
xbt_error_t errcode;
int size;
- gras_trp_plugin_t *super=((gras_trp_buf_plug_data_t*)sock->plugin->data)->super;
gras_trp_bufdata_t *data=sock->bufdata;
+ XBT_IN;
+
+ DEBUG0("Flush");
+ if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
+ hexa_print("chunck to send ",data->out.data,data->out.size);
+ if ((data->out.size - data->out.pos) == (gras_if_RL()?0:4) ) { /* 4 first bytes=size in SG mode*/
+ DEBUG2("Nothing to flush (size=%d; pos=%d)",data->out.size,data->out.pos);
+ return no_error;
+ }
+
+ size = (int)data->out.size - data->out.pos;
+ DEBUG4("%s the size (=%d) to %s:%d",(gras_if_RL()?"Send":"Embeed"),data->out.size-data->out.pos,
+ gras_socket_peer_name(sock),gras_socket_peer_port(sock));
+ if (gras_if_RL()) {
+ size = (int)htonl(size);
+ TRYOLD(_buf_super->chunk_send(sock,(char*) &size, 4));
+ } else {
+ memcpy(data->out.data, &size, 4);
+ }
+
- XBT_IN;
- size = (int)htonl(data->out.size);
- DEBUG1("Send the size (=%d)",data->out.size);
- TRY(super->chunk_send(sock,(char*) &size, 4));
-
- DEBUG1("Send the chunk (size=%d)",data->out.size);
- TRY(super->chunk_send(sock, data->out.data, data->out.size));
+ DEBUG3("Send the chunk (size=%d) to %s:%d",data->out.size,
+ gras_socket_peer_name(sock),gras_socket_peer_port(sock));
+ TRYOLD(_buf_super->chunk_send(sock, data->out.data, data->out.size));
VERB1("Chunk sent (size=%d)",data->out.size);
- data->out.size = 0;
+ if (XBT_LOG_ISENABLED(trp_buf,xbt_log_priority_debug))
+ hexa_print("chunck sent ",data->out.data,data->out.size);
+ data->out.size = gras_if_RL()?0:4;
return no_error;
}