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
Work around newly reincreased paranoia of gcc and libc on ubuntu. It's geting hard...
[simgrid.git]
/
src
/
gras
/
Transport
/
transport_plugin_file.c
diff --git
a/src/gras/Transport/transport_plugin_file.c
b/src/gras/Transport/transport_plugin_file.c
index
a09864e
..
7b20968
100644
(file)
--- a/
src/gras/Transport/transport_plugin_file.c
+++ b/
src/gras/Transport/transport_plugin_file.c
@@
-84,7
+84,7
@@
gras_socket_client_from_file(const char*path) {
res->plugin=gras_trp_plugin_get_by_name("file");
if (strcmp("-", path)) {
res->plugin=gras_trp_plugin_get_by_name("file");
if (strcmp("-", path)) {
- res->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP );
+ res->sd = open(path, O_
TRUNC|O_
WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP );
if ( res->sd < 0) {
THROW2(system_error,0,
if ( res->sd < 0) {
THROW2(system_error,0,
@@
-95,7
+95,6
@@
gras_socket_client_from_file(const char*path) {
res->sd = 1; /* stdout */
}
res->sd = 1; /* stdout */
}
- res->recv_ok=0;
DEBUG5("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c",
path,
res->sd,
DEBUG5("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c",
path,
res->sd,
@@
-103,6
+102,8
@@
gras_socket_client_from_file(const char*path) {
res->outgoing?'y':'n',
res->accepting?'y':'n');
res->outgoing?'y':'n',
res->accepting?'y':'n');
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res);
return res;
}
return res;
}
@@
-142,7
+143,8
@@
gras_socket_t gras_socket_server_from_file(const char*path) {
res->outgoing?'y':'n',
res->accepting?'y':'n');
res->outgoing?'y':'n',
res->accepting?'y':'n');
- res->recv_ok=0;
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res);
return res;
}
return res;
}
@@
-226,13
+228,20
@@
gras_trp_file_chunk_recv(gras_socket_t sock,
xbt_assert0(sock->incoming, "Cannot recv on client file socket");
xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
xbt_assert0(sock->incoming, "Cannot recv on client file socket");
xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
+ if (sock->recvd) {
+ data[0] = sock->recvd_val;
+ sock->recvd = 0;
+ got++;
+ size--;
+ }
+
while (size) {
int status = 0;
status = read(sock->sd, data+got, (long int)size);
DEBUG3("read(%d, %p, %ld);", sock->sd, data+got, size);
while (size) {
int status = 0;
status = read(sock->sd, data+got, (long int)size);
DEBUG3("read(%d, %p, %ld);", sock->sd, data+got, size);
- if (status
== -1
) {
+ if (status
< 0
) {
THROW4(system_error,0,"read(%d,%p,%d) failed: %s",
sock->sd, data+got, (int)size,
strerror(errno));
THROW4(system_error,0,"read(%d,%p,%d) failed: %s",
sock->sd, data+got, (int)size,
strerror(errno));
@@
-242,7
+251,7
@@
gras_trp_file_chunk_recv(gras_socket_t sock,
size -= status;
got += status;
} else {
size -= status;
got += status;
} else {
-
THROW0(system_error,0,"file descriptor closed"
);
+
THROW1(system_error,errno,"file descriptor closed after %d bytes",got
);
}
}
return got;
}
}
return got;