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
Cosmetics: fix comment.
[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
b974a89
..
c26b837
100644
(file)
--- a/
src/gras/Transport/transport_plugin_file.c
+++ b/
src/gras/Transport/transport_plugin_file.c
@@
-96,7
+96,7
@@
gras_socket_t gras_socket_client_from_file(const char *path)
{
gras_socket_t res;
- xbt_assert
0
(gras_if_RL(), "Cannot use file as socket in the simulator");
+ xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator");
gras_trp_socket_new(0, &res);
@@
-108,7
+108,7
@@
gras_socket_t gras_socket_client_from_file(const char *path)
S_IRUSR | S_IWUSR | S_IRGRP);
if (res->sd < 0) {
- THROW
2
(system_error, 0,
+ THROW
F
(system_error, 0,
"Cannot create a client socket from file %s: %s",
path, strerror(errno));
}
@@
-116,7
+116,7
@@
gras_socket_t gras_socket_client_from_file(const char *path)
res->sd = 1; /* stdout */
}
-
DEBUG5
("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c",
+
XBT_DEBUG
("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c",
path,
res->sd,
res->incoming ? 'y' : 'n',
@@
-138,7
+138,7
@@
gras_socket_t gras_socket_server_from_file(const char *path)
{
gras_socket_t res;
- xbt_assert
0
(gras_if_RL(), "Cannot use file as socket in the simulator");
+ xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator");
gras_trp_socket_new(1, &res);
@@
-149,7
+149,7
@@
gras_socket_t gras_socket_server_from_file(const char *path)
res->sd = open(path, O_RDONLY | O_BINARY);
if (res->sd < 0) {
- THROW
2
(system_error, 0,
+ THROW
F
(system_error, 0,
"Cannot create a server socket from file %s: %s",
path, strerror(errno));
}
@@
-157,7
+157,7
@@
gras_socket_t gras_socket_server_from_file(const char *path)
res->sd = 0; /* stdin */
}
-
DEBUG4
("sd=%d in=%c out=%c accept=%c",
+
XBT_DEBUG
("sd=%d in=%c out=%c accept=%c",
res->sd,
res->incoming ? 'y' : 'n',
res->outgoing ? 'y' : 'n', res->accepting ? 'y' : 'n');
@@
-177,18
+177,18
@@
void gras_trp_file_close(gras_socket_t sock)
data = sock->plugin->data;
if (sock->sd == 0) {
-
DEBUG0
("Do not close stdin");
+
XBT_DEBUG
("Do not close stdin");
} else if (sock->sd == 1) {
-
DEBUG0
("Do not close stdout");
+
XBT_DEBUG
("Do not close stdout");
} else {
-
DEBUG1
("close file connection %d", sock->sd);
+
XBT_DEBUG
("close file connection %d", sock->sd);
/* forget about the socket */
FD_CLR(sock->sd, &(data->incoming_socks));
/* close the socket */
if (close(sock->sd) < 0) {
-
WARN2
("error while closing file %d: %s", sock->sd, strerror(errno));
+
XBT_WARN
("error while closing file %d: %s", sock->sd, strerror(errno));
}
}
}
@@
-211,17
+211,17
@@
gras_trp_file_chunk_send_raw(gras_socket_t sock,
const char *data, unsigned long int size)
{
- xbt_assert
0
(sock->outgoing, "Cannot write on client file socket");
- xbt_assert
0
(size >= 0, "Cannot send a negative amount of data");
+ xbt_assert(sock->outgoing, "Cannot write on client file socket");
+ xbt_assert(size >= 0, "Cannot send a negative amount of data");
while (size) {
int status = 0;
-
DEBUG3
("write(%d, %p, %ld);", sock->sd, data, (long int) size);
+
XBT_DEBUG
("write(%d, %p, %ld);", sock->sd, data, (long int) size);
status = write(sock->sd, data, (long int) size);
if (status == -1) {
- THROW
4
(system_error, 0, "write(%d,%p,%d) failed: %s",
+ THROW
F
(system_error, 0, "write(%d,%p,%d) failed: %s",
sock->sd, data, (int) size, strerror(errno));
}
@@
-229,7
+229,7
@@
gras_trp_file_chunk_send_raw(gras_socket_t sock,
size -= status;
data += status;
} else {
- THROW
0
(system_error, 0, "file descriptor closed");
+ THROW
F
(system_error, 0, "file descriptor closed");
}
}
}
@@
-246,9
+246,9
@@
gras_trp_file_chunk_recv(gras_socket_t sock,
int got = 0;
- xbt_assert
0
(sock, "Cannot recv on an NULL socket");
- xbt_assert
0
(sock->incoming, "Cannot recv on client file socket");
- xbt_assert
0
(size >= 0, "Cannot receive a negative amount of data");
+ xbt_assert(sock, "Cannot recv on an NULL socket");
+ xbt_assert(sock->incoming, "Cannot recv on client file socket");
+ xbt_assert(size >= 0, "Cannot receive a negative amount of data");
if (sock->recvd) {
data[0] = sock->recvd_val;
@@
-261,10
+261,10
@@
gras_trp_file_chunk_recv(gras_socket_t sock,
int status = 0;
status = read(sock->sd, data + got, (long int) size);
-
DEBUG3
("read(%d, %p, %ld);", sock->sd, data + got, size);
+
XBT_DEBUG
("read(%d, %p, %ld);", sock->sd, data + got, size);
if (status < 0) {
- THROW
4
(system_error, 0, "read(%d,%p,%d) failed: %s",
+ THROW
F
(system_error, 0, "read(%d,%p,%d) failed: %s",
sock->sd, data + got, (int) size, strerror(errno));
}
@@
-272,7
+272,7
@@
gras_trp_file_chunk_recv(gras_socket_t sock,
size -= status;
got += status;
} else {
- THROW
1
(system_error, errno, "file descriptor closed after %d bytes",
+ THROW
F
(system_error, errno, "file descriptor closed after %d bytes",
got);
}
}