/* 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
- 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 <unistd.h>
-
-#include "gras_private.h"
+#include "portable.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
***/
-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,
- const char *data,
- long int size);
+xbt_error_t gras_trp_file_chunk_send(gras_socket_t sd,
+ const char *data,
+ unsigned long int size);
-gras_error_t gras_trp_file_chunk_recv(gras_socket_t *sd,
- char *data,
- long int size);
+xbt_error_t gras_trp_file_chunk_recv(gras_socket_t sd,
+ char *data,
+ unsigned long int size);
/***
/***
*** Code
***/
-gras_error_t
-gras_trp_file_setup(gras_trp_plugin_t *plug) {
+xbt_error_t
+gras_trp_file_setup(gras_trp_plugin_t plug) {
- gras_trp_file_plug_data_t *file = gras_new(gras_trp_file_plug_data_t,1);
- 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;
-
plug->chunk_send = gras_trp_file_chunk_send;
plug->chunk_recv = gras_trp_file_chunk_recv;
-
plug->data = (void*)file;
return no_error;
*
* This only possible in RL, and is mainly for debugging.
*/
-gras_error_t
+xbt_error_t
gras_socket_client_from_file(const char*path,
- /* OUT */ gras_socket_t **dst) {
- gras_error_t errcode;
- gras_trp_plugin_t *trp;
+ /* OUT */ gras_socket_t *dst) {
+ xbt_error_t errcode;
+ gras_trp_plugin_t trp;
- gras_assert0(gras_if_RL(),
+ xbt_assert0(gras_if_RL(),
"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)) {
- (*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,
*
* This only possible in RL, and is mainly for debugging.
*/
-gras_error_t
+xbt_error_t
gras_socket_server_from_file(const char*path,
- /* OUT */ gras_socket_t **dst) {
- gras_error_t errcode;
- gras_trp_plugin_t *trp;
+ /* OUT */ gras_socket_t *dst) {
+ xbt_error_t errcode;
+ gras_trp_plugin_t trp;
- gras_assert0(gras_if_RL(),
+ xbt_assert0(gras_if_RL(),
"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)) {
- (*dst)->sd = open(path, O_RDONLY );
+ (*dst)->sd = open(path, O_RDONLY | O_BINARY);
if ( (*dst)->sd < 0) {
RAISE2(system_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 */
*
* Send data on a file pseudo-socket
*/
-gras_error_t
-gras_trp_file_chunk_send(gras_socket_t *sock,
+xbt_error_t
+gras_trp_file_chunk_send(gras_socket_t sock,
const char *data,
- long int size) {
+ unsigned long int 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;
*
* 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,
- long int size) {
+ unsigned long int 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;