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
embeed the buffer size within the buffer itself on SG. That way, send are atomic...
[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
de90623
..
466a67f
100644
(file)
--- a/
src/gras/Transport/transport_plugin_file.c
+++ b/
src/gras/Transport/transport_plugin_file.c
@@
-2,34
+2,33
@@
/* File transport - send/receive a bunch of bytes from a file */
/* File transport - send/receive a bunch of bytes from a file */
-/* Authors: Martin Quinson */
-/* Copyright (C) 2004 Martin Quinson. */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* This program is free software; you can redistribute it and/or modify it
-
under the terms of the license (GNU LGPL) which comes with this package. */
+
*
under the terms of the license (GNU LGPL) which comes with this package. */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "gras_private.h"
+#include "portable.h"
#include "transport_private.h"
#include "transport_private.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport);
+#if 0
+# include <sys/types.h>
+#endif
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_file,transport,
+ "Pseudo-transport to write to/read from a file");
/***
*** Prototypes
***/
/***
*** Prototypes
***/
-void gras_trp_file_close(gras_socket_t
*
sd);
+void gras_trp_file_close(gras_socket_t sd);
-
gras_error_t gras_trp_file_chunk_send(gras_socket_t *
sd,
- char *data,
-
size_
t size);
+
xbt_error_t gras_trp_file_chunk_send(gras_socket_t
sd,
+ c
onst c
har *data,
+
long in
t size);
-
gras_error_t gras_trp_file_chunk_recv(gras_socket_t *
sd,
+
xbt_error_t gras_trp_file_chunk_recv(gras_socket_t
sd,
char *data,
char *data,
-
size_
t size);
+
long in
t size);
/***
/***
@@
-49,20
+48,16
@@
typedef struct {
/***
*** Code
***/
/***
*** Code
***/
-
gras
_error_t
+
xbt
_error_t
gras_trp_file_setup(gras_trp_plugin_t *plug) {
gras_trp_file_setup(gras_trp_plugin_t *plug) {
- gras_trp_file_plug_data_t *file = malloc(sizeof(gras_trp_file_plug_data_t));
- if (!file)
- RAISE_MALLOC;
+ gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t,1);
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->chunk_send = gras_trp_file_chunk_send;
plug->chunk_recv = gras_trp_file_chunk_recv;
-
plug->data = (void*)file;
return no_error;
plug->data = (void*)file;
return no_error;
@@
-75,22
+70,22
@@
gras_trp_file_setup(gras_trp_plugin_t *plug) {
*
* This only possible in RL, and is mainly for debugging.
*/
*
* This only possible in RL, and is mainly for debugging.
*/
-
gras
_error_t
+
xbt
_error_t
gras_socket_client_from_file(const char*path,
gras_socket_client_from_file(const char*path,
- /* OUT */ gras_socket_t *
*
dst) {
-
gras
_error_t errcode;
+ /* OUT */ gras_socket_t *dst) {
+
xbt
_error_t errcode;
gras_trp_plugin_t *trp;
gras_trp_plugin_t *trp;
-
gras
_assert0(gras_if_RL(),
+
xbt
_assert0(gras_if_RL(),
"Cannot use file as socket in the simulator");
"Cannot use file as socket in the simulator");
-
TRY(gras_trp_socket_new(0,dst)
);
+
gras_trp_socket_new(0,dst
);
TRY(gras_trp_plugin_get_by_name("file",&trp));
(*dst)->plugin=trp;
if (strcmp("-", path)) {
TRY(gras_trp_plugin_get_by_name("file",&trp));
(*dst)->plugin=trp;
if (strcmp("-", path)) {
- (*dst)->sd = open(path, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP );
+ (*dst)->sd = open(path, O_WRONLY|O_CREAT
| O_BINARY
, S_IRUSR|S_IWUSR|S_IRGRP );
if ( (*dst)->sd < 0) {
RAISE2(system_error,
if ( (*dst)->sd < 0) {
RAISE2(system_error,
@@
-107,14
+102,7
@@
gras_socket_client_from_file(const char*path,
(*dst)->incoming?'y':'n',
(*dst)->outgoing?'y':'n',
(*dst)->accepting?'y':'n');
(*dst)->incoming?'y':'n',
(*dst)->outgoing?'y':'n',
(*dst)->accepting?'y':'n');
- /* register socket */
- errcode = gras_dynar_push(_gras_trp_sockets,dst);
- if (errcode != no_error) {
- free(*dst);
- *dst = NULL;
- return errcode;
- }
-
+
return no_error;
}
return no_error;
}
@@
-125,23
+113,23
@@
gras_socket_client_from_file(const char*path,
*
* This only possible in RL, and is mainly for debugging.
*/
*
* This only possible in RL, and is mainly for debugging.
*/
-
gras
_error_t
+
xbt
_error_t
gras_socket_server_from_file(const char*path,
gras_socket_server_from_file(const char*path,
- /* OUT */ gras_socket_t *
*
dst) {
-
gras
_error_t errcode;
+ /* OUT */ gras_socket_t *dst) {
+
xbt
_error_t errcode;
gras_trp_plugin_t *trp;
gras_trp_plugin_t *trp;
-
gras
_assert0(gras_if_RL(),
+
xbt
_assert0(gras_if_RL(),
"Cannot use file as socket in the simulator");
"Cannot use file as socket in the simulator");
-
TRY(gras_trp_socket_new(1,dst)
);
+
gras_trp_socket_new(1,dst
);
TRY(gras_trp_plugin_get_by_name("file",&trp));
(*dst)->plugin=trp;
if (strcmp("-", path)) {
TRY(gras_trp_plugin_get_by_name("file",&trp));
(*dst)->plugin=trp;
if (strcmp("-", path)) {
- (*dst)->sd = open(path, O_RDONLY );
+ (*dst)->sd = open(path, O_RDONLY
| O_BINARY
);
if ( (*dst)->sd < 0) {
RAISE2(system_error,
if ( (*dst)->sd < 0) {
RAISE2(system_error,
@@
-158,18
+146,10
@@
gras_socket_server_from_file(const char*path,
(*dst)->outgoing?'y':'n',
(*dst)->accepting?'y':'n');
(*dst)->outgoing?'y':'n',
(*dst)->accepting?'y':'n');
- /* register socket */
- errcode = gras_dynar_push(_gras_trp_sockets,dst);
- if (errcode != no_error) {
- free(*dst);
- *dst = NULL;
- return errcode;
- }
-
return no_error;
}
return no_error;
}
-void gras_trp_file_close(gras_socket_t
*
sock){
+void gras_trp_file_close(gras_socket_t sock){
gras_trp_file_plug_data_t *data;
if (!sock) return; /* close only once */
gras_trp_file_plug_data_t *data;
if (!sock) return; /* close only once */
@@
-198,19
+178,19
@@
void gras_trp_file_close(gras_socket_t *sock){
*
* Send data on a file pseudo-socket
*/
*
* Send data on a file pseudo-socket
*/
-
gras
_error_t
-gras_trp_file_chunk_send(gras_socket_t
*
sock,
- char *data,
-
size_
t size) {
+
xbt
_error_t
+gras_trp_file_chunk_send(gras_socket_t sock,
+ c
onst c
har *data,
+
long in
t size) {
-
gras
_assert0(sock->outgoing, "Cannot write on client file socket");
-
gras
_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");
while (size) {
int status = 0;
while (size) {
int status = 0;
- DEBUG3("write(%d, %p, %ld);", sock->sd, data, (
size_
t)size);
- status = write(sock->sd, data, (
size_
t)size);
+ DEBUG3("write(%d, %p, %ld);", sock->sd, data, (
long in
t)size);
+ status = write(sock->sd, data, (
long in
t)size);
if (status == -1) {
RAISE4(system_error,"write(%d,%p,%d) failed: %s",
if (status == -1) {
RAISE4(system_error,"write(%d,%p,%d) failed: %s",
@@
-233,19
+213,19
@@
gras_trp_file_chunk_send(gras_socket_t *sock,
*
* Receive data on a file pseudo-socket.
*/
*
* Receive data on a file pseudo-socket.
*/
-
gras
_error_t
-gras_trp_file_chunk_recv(gras_socket_t
*
sock,
+
xbt
_error_t
+gras_trp_file_chunk_recv(gras_socket_t sock,
char *data,
char *data,
-
size_
t size) {
+
long in
t size) {
-
gras
_assert0(sock, "Cannot recv on an NULL socket");
-
gras
_assert0(sock->incoming, "Cannot recv on client file socket");
-
gras
_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");
while (size) {
int status = 0;
while (size) {
int status = 0;
- status = read(sock->sd, data, (
size_
t)size);
+ status = read(sock->sd, data, (
long in
t)size);
DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
if (status == -1) {
DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
if (status == -1) {