A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed any gras stuff that was in xbt and should therefore be called
[simgrid.git]
/
src
/
gras
/
Transport
/
transport_plugin_tcp.c
diff --git
a/src/gras/Transport/transport_plugin_tcp.c
b/src/gras/Transport/transport_plugin_tcp.c
index
d502ce1
..
c5cb397
100644
(file)
--- a/
src/gras/Transport/transport_plugin_tcp.c
+++ b/
src/gras/Transport/transport_plugin_tcp.c
@@
-23,25
+23,25
@@
#include "transport_private.h"
#include "transport_private.h"
-
GRAS
_LOG_NEW_DEFAULT_SUBCATEGORY(trp_tcp,transport,"TCP transport");
+
XBT
_LOG_NEW_DEFAULT_SUBCATEGORY(trp_tcp,transport,"TCP transport");
/***
*** Prototypes
***/
/***
*** Prototypes
***/
-
gras
_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
+
xbt
_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
gras_socket_t sock);
gras_socket_t sock);
-
gras
_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
+
xbt
_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
gras_socket_t sock);
gras_socket_t sock);
-
gras
_error_t gras_trp_tcp_socket_accept(gras_socket_t sock,
+
xbt
_error_t gras_trp_tcp_socket_accept(gras_socket_t sock,
gras_socket_t *dst);
void gras_trp_tcp_socket_close(gras_socket_t sd);
gras_socket_t *dst);
void gras_trp_tcp_socket_close(gras_socket_t sd);
-
gras
_error_t gras_trp_tcp_chunk_send(gras_socket_t sd,
+
xbt
_error_t gras_trp_tcp_chunk_send(gras_socket_t sd,
const char *data,
long int size);
const char *data,
long int size);
-
gras
_error_t gras_trp_tcp_chunk_recv(gras_socket_t sd,
+
xbt
_error_t gras_trp_tcp_chunk_recv(gras_socket_t sd,
char *data,
long int size);
char *data,
long int size);
@@
-70,9
+70,9
@@
typedef struct {
/***
*** Code
***/
/***
*** Code
***/
-
gras
_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
+
xbt
_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
- gras_trp_tcp_plug_data_t *data =
gras
_new(gras_trp_tcp_plug_data_t,1);
+ gras_trp_tcp_plug_data_t *data =
xbt
_new(gras_trp_tcp_plug_data_t,1);
FD_ZERO(&(data->msg_socks));
FD_ZERO(&(data->raw_socks));
FD_ZERO(&(data->msg_socks));
FD_ZERO(&(data->raw_socks));
@@
-95,10
+95,10
@@
gras_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
void gras_trp_tcp_exit(gras_trp_plugin_t *plug) {
DEBUG1("Exit plugin TCP (free %p)", plug->data);
void gras_trp_tcp_exit(gras_trp_plugin_t *plug) {
DEBUG1("Exit plugin TCP (free %p)", plug->data);
-
gras
_free(plug->data);
+
xbt
_free(plug->data);
}
}
-
gras
_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
+
xbt
_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
gras_socket_t sock){
struct sockaddr_in addr;
gras_socket_t sock){
struct sockaddr_in addr;
@@
-151,7
+151,7
@@
gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
*
* Open a socket used to receive messages.
*/
*
* Open a socket used to receive messages.
*/
-
gras
_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
+
xbt
_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
/* OUT */ gras_socket_t sock){
int size = sock->bufSize * 1024;
int on = 1;
/* OUT */ gras_socket_t sock){
int size = sock->bufSize * 1024;
int on = 1;
@@
-199,11
+199,11
@@
gras_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self,
return no_error;
}
return no_error;
}
-
gras
_error_t
+
xbt
_error_t
gras_trp_tcp_socket_accept(gras_socket_t sock,
gras_socket_t *dst) {
gras_socket_t res;
gras_trp_tcp_socket_accept(gras_socket_t sock,
gras_socket_t *dst) {
gras_socket_t res;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
struct sockaddr_in peer_in;
socklen_t peer_in_len = sizeof(peer_in);
struct sockaddr_in peer_in;
socklen_t peer_in_len = sizeof(peer_in);
@@
-312,13
+312,13
@@
void gras_trp_tcp_socket_close(gras_socket_t sock){
*
* Send data on a TCP socket
*/
*
* Send data on a TCP socket
*/
-
gras
_error_t
+
xbt
_error_t
gras_trp_tcp_chunk_send(gras_socket_t sock,
const char *data,
long int size) {
/* TCP sockets are in duplex mode, don't check direction */
gras_trp_tcp_chunk_send(gras_socket_t sock,
const char *data,
long int size) {
/* TCP sockets are in duplex mode, don't check direction */
-
gras
_assert0(size >= 0, "Cannot send a negative amount of data");
+
xbt
_assert0(size >= 0, "Cannot send a negative amount of data");
while (size) {
int status = 0;
while (size) {
int status = 0;
@@
-347,14
+347,14
@@
gras_trp_tcp_chunk_send(gras_socket_t sock,
*
* Receive data on a TCP socket.
*/
*
* Receive data on a TCP socket.
*/
-
gras
_error_t
+
xbt
_error_t
gras_trp_tcp_chunk_recv(gras_socket_t sock,
char *data,
long int size) {
/* TCP sockets are in duplex mode, don't check direction */
gras_trp_tcp_chunk_recv(gras_socket_t sock,
char *data,
long int size) {
/* TCP sockets are in duplex mode, don't check direction */
-
gras
_assert0(sock, "Cannot recv on an NULL socket");
-
gras
_assert0(size >= 0, "Cannot receive a negative amount of data");
+
xbt
_assert0(sock, "Cannot recv on an NULL socket");
+
xbt
_assert0(size >= 0, "Cannot receive a negative amount of data");
while (size) {
int status = 0;
while (size) {
int status = 0;
@@
-391,7
+391,7
@@
static int TcpProtoNumber(void) {
if(returnValue == 0) {
fetchedEntry = getprotobyname("tcp");
if(returnValue == 0) {
fetchedEntry = getprotobyname("tcp");
-
gras
_assert0(fetchedEntry, "getprotobyname(tcp) gave NULL");
+
xbt
_assert0(fetchedEntry, "getprotobyname(tcp) gave NULL");
returnValue = fetchedEntry->p_proto;
}
returnValue = fetchedEntry->p_proto;
}
@@
-403,7
+403,7
@@
static int TcpProtoNumber(void) {
But I fail to find a good internal organization for now. We may want to split
raw and regular sockets more efficiently.
*/
But I fail to find a good internal organization for now. We may want to split
raw and regular sockets more efficiently.
*/
-
gras
_error_t gras_socket_raw_exchange(gras_socket_t peer,
+
xbt
_error_t gras_socket_raw_exchange(gras_socket_t peer,
int sender,
unsigned int timeout,
unsigned long int exp_size,
int sender,
unsigned int timeout,
unsigned long int exp_size,
@@
-416,7
+416,7
@@
gras_error_t gras_socket_raw_exchange(gras_socket_t peer,
struct timeval timeOut;
struct timeval timeOut;
- chunk =
gras
_malloc(msg_size);
+ chunk =
xbt
_malloc(msg_size);
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
for(msg_sofar=0; msg_sofar < msg_size; msg_sofar += res_last) {
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
for(msg_sofar=0; msg_sofar < msg_size; msg_sofar += res_last) {
@@
-436,12
+436,12
@@
gras_error_t gras_socket_raw_exchange(gras_socket_t peer,
}
if (res_last == 0) {
/* No progress done, bail out */
}
if (res_last == 0) {
/* No progress done, bail out */
-
gras
_free(chunk);
+
xbt
_free(chunk);
RAISE0(unknown_error,"Not exchanged a single byte, bailing out");
}
}
}
RAISE0(unknown_error,"Not exchanged a single byte, bailing out");
}
}
}
-
gras
_free(chunk);
+
xbt
_free(chunk);
return no_error;
}
return no_error;
}