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
the inclusion of the header stat.h is tested in the file portability header portable...
[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
a85fa4b
..
7b20968
100644
(file)
--- a/
src/gras/Transport/transport_plugin_file.c
+++ b/
src/gras/Transport/transport_plugin_file.c
@@
-8,10
+8,10
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "portable.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "portable.h"
-#include "transport_private.h"
+#include "
gras/Transport/
transport_private.h"
#include "xbt/ex.h"
#include "xbt/ex.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
trp_file,transport
,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
gras_trp_file,gras_trp
,
"Pseudo-transport to write to/read from a file");
/***
"Pseudo-transport to write to/read from a file");
/***
@@
-19,14
+19,17
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
***/
void gras_trp_file_close(gras_socket_t sd);
***/
void gras_trp_file_close(gras_socket_t sd);
+void gras_trp_file_chunk_send_raw(gras_socket_t sd,
+ const char *data,
+ unsigned long int size);
void gras_trp_file_chunk_send(gras_socket_t sd,
const char *data,
void gras_trp_file_chunk_send(gras_socket_t sd,
const char *data,
- unsigned long int size);
-
-void gras_trp_file_chunk_recv(gras_socket_t sd,
- char *data,
- unsigned long int size);
+ unsigned long int size,
+ int stable_ignored);
+int gras_trp_file_chunk_recv(gras_socket_t sd,
+ char *data,
+ unsigned long int size);
/***
*** Specific plugin part
/***
*** Specific plugin part
@@
-53,8
+56,12
@@
gras_trp_file_setup(gras_trp_plugin_t plug) {
FD_ZERO(&(file->incoming_socks));
plug->socket_close = gras_trp_file_close;
FD_ZERO(&(file->incoming_socks));
plug->socket_close = gras_trp_file_close;
- plug->chunk_send = gras_trp_file_chunk_send;
- plug->chunk_recv = gras_trp_file_chunk_recv;
+
+ plug->raw_send = gras_trp_file_chunk_send_raw;
+ plug->send = gras_trp_file_chunk_send;
+
+ plug->raw_recv = plug->recv = gras_trp_file_chunk_recv;
+
plug->data = (void*)file;
}
plug->data = (void*)file;
}
@@
-77,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,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;
}
@@
-134,6
+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');
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res);
return res;
}
return res;
}
@@
-169,7
+180,14
@@
void gras_trp_file_close(gras_socket_t sock){
void
gras_trp_file_chunk_send(gras_socket_t sock,
const char *data,
void
gras_trp_file_chunk_send(gras_socket_t sock,
const char *data,
- unsigned long int size) {
+ unsigned long int size,
+ int stable_ignored) {
+ gras_trp_file_chunk_send_raw(sock,data,size);
+}
+void
+gras_trp_file_chunk_send_raw(gras_socket_t sock,
+ const char *data,
+ unsigned long int size) {
xbt_assert0(sock->outgoing, "Cannot write on client file socket");
xbt_assert0(size >= 0, "Cannot send a negative amount of data");
xbt_assert0(sock->outgoing, "Cannot write on client file socket");
xbt_assert0(size >= 0, "Cannot send a negative amount of data");
@@
-199,33
+217,43
@@
gras_trp_file_chunk_send(gras_socket_t sock,
*
* Receive data on a file pseudo-socket.
*/
*
* Receive data on a file pseudo-socket.
*/
-void
+int
gras_trp_file_chunk_recv(gras_socket_t sock,
char *data,
unsigned long int size) {
gras_trp_file_chunk_recv(gras_socket_t sock,
char *data,
unsigned long int size) {
+ int got = 0;
+
xbt_assert0(sock, "Cannot recv on an NULL socket");
xbt_assert0(sock->incoming, "Cannot recv on client file socket");
xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
xbt_assert0(sock, "Cannot recv on an NULL socket");
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;
while (size) {
int status = 0;
- status = read(sock->sd, data, (long int)size);
- DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
+ 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",
THROW4(system_error,0,"read(%d,%p,%d) failed: %s",
- sock->sd, data, (int)size,
+ sock->sd, data
+got
, (int)size,
strerror(errno));
}
if (status) {
strerror(errno));
}
if (status) {
- size -= status;
-
data
+= status;
+ size
-= status;
+
got
+= status;
} else {
} else {
-
THROW0(system_error,0,"file descriptor closed"
);
+
THROW1(system_error,errno,"file descriptor closed after %d bytes",got
);
}
}
}
}
+ return got;
}
}