#include "portable.h"
#include "gras/Transport/transport_private.h"
#include "xbt/ex.h"
+#include "xbt/xbt_socket_private.h"
#include "gras/Msg/msg_interface.h" /* gras_msg_listener_awake */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file, gras_trp,
/***
*** Prototypes
***/
-void gras_trp_file_close(gras_socket_t sd);
+void gras_trp_file_close(xbt_socket_t sd);
-void gras_trp_file_chunk_send_raw(gras_socket_t sd,
+void gras_trp_file_chunk_send_raw(xbt_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(xbt_socket_t sd, const char *data,
unsigned long int size, int stable_ignored);
-int gras_trp_file_chunk_recv(gras_socket_t sd,
+int gras_trp_file_chunk_recv(xbt_socket_t sd,
char *data, unsigned long int size);
/***
/***
*** Info about who's speaking
***/
-static int gras_trp_file_my_port(gras_socket_t s) {
+static int gras_trp_file_my_port(xbt_socket_t s) {
THROW_UNIMPLEMENTED;
}
-static int gras_trp_file_peer_port(gras_socket_t s) {
+static int gras_trp_file_peer_port(xbt_socket_t s) {
THROW_UNIMPLEMENTED;
}
-static char* gras_trp_file_peer_name(gras_socket_t s) {
+static const char* gras_trp_file_peer_name(xbt_socket_t s) {
THROW_UNIMPLEMENTED;
}
-static char* gras_trp_file_peer_proc(gras_socket_t s) {
+static const char* gras_trp_file_peer_proc(xbt_socket_t s) {
THROW_UNIMPLEMENTED;
}
-static void gras_trp_file_peer_proc_set(gras_socket_t s,char *name) {
+static void gras_trp_file_peer_proc_set(xbt_socket_t s,char *name) {
THROW_UNIMPLEMENTED;
}
/***
*** Code
***/
-void gras_trp_file_setup(gras_trp_plugin_t plug)
+void gras_trp_file_setup(xbt_trp_plugin_t plug)
{
gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t, 1);
*
* This only possible in RL, and is mainly for debugging.
*/
-gras_socket_t gras_socket_client_from_file(const char *path)
+xbt_socket_t gras_socket_client_from_file(const char *path)
{
- gras_socket_t res;
+ xbt_socket_t res;
- xbt_assert0(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);
-
- res->plugin = gras_trp_plugin_get_by_name("file");
+ xbt_socket_new_ext(0, &res, xbt_trp_plugin_get_by_name("file"), 0, 0);
if (strcmp("-", path)) {
res->sd =
S_IRUSR | S_IWUSR | S_IRGRP);
if (res->sd < 0) {
- THROW2(system_error, 0,
+ THROWF(system_error, 0,
"Cannot create a client socket from file %s: %s",
path, strerror(errno));
}
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',
*
* This only possible in RL, and is mainly for debugging.
*/
-gras_socket_t gras_socket_server_from_file(const char *path)
+xbt_socket_t gras_socket_server_from_file(const char *path)
{
- gras_socket_t res;
-
- xbt_assert0(gras_if_RL(), "Cannot use file as socket in the simulator");
-
- gras_trp_socket_new(1, &res);
+ xbt_socket_t res;
- res->plugin = gras_trp_plugin_get_by_name("file");
+ xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator");
+ xbt_socket_new_ext(1, &res, xbt_trp_plugin_get_by_name("file"), 0, 0);
if (strcmp("-", path)) {
res->sd = open(path, O_RDONLY | O_BINARY);
if (res->sd < 0) {
- THROW2(system_error, 0,
+ THROWF(system_error, 0,
"Cannot create a server socket from file %s: %s",
path, strerror(errno));
}
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');
return res;
}
-void gras_trp_file_close(gras_socket_t sock)
+void gras_trp_file_close(xbt_socket_t sock)
{
gras_trp_file_plug_data_t *data;
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));
}
}
}
* Send data on a file pseudo-socket
*/
void
-gras_trp_file_chunk_send(gras_socket_t sock,
+gras_trp_file_chunk_send(xbt_socket_t sock,
const char *data,
unsigned long int size, int stable_ignored)
{
}
void
-gras_trp_file_chunk_send_raw(gras_socket_t sock,
+gras_trp_file_chunk_send_raw(xbt_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_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) {
- THROW4(system_error, 0, "write(%d,%p,%d) failed: %s",
+ THROWF(system_error, 0, "write(%d,%p,%d) failed: %s",
sock->sd, data, (int) size, strerror(errno));
}
size -= status;
data += status;
} else {
- THROW0(system_error, 0, "file descriptor closed");
+ THROWF(system_error, 0, "file descriptor closed");
}
}
}
* Receive data on a file pseudo-socket.
*/
int
-gras_trp_file_chunk_recv(gras_socket_t sock,
+gras_trp_file_chunk_recv(xbt_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_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;
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) {
- THROW4(system_error, 0, "read(%d,%p,%d) failed: %s",
+ THROWF(system_error, 0, "read(%d,%p,%d) failed: %s",
sock->sd, data + got, (int) size, strerror(errno));
}
size -= status;
got += status;
} else {
- THROW1(system_error, errno, "file descriptor closed after %d bytes",
+ THROWF(system_error, errno, "file descriptor closed after %d bytes",
got);
}
}
