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
Remove extern declaration for gras_opt_trp_nomoredata_on_close.
[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
c26b837
..
ba81c85
100644
(file)
--- a/
src/gras/Transport/transport_plugin_file.c
+++ b/
src/gras/Transport/transport_plugin_file.c
@@
-9,6
+9,7
@@
#include "portable.h"
#include "gras/Transport/transport_private.h"
#include "xbt/ex.h"
#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,
#include "gras/Msg/msg_interface.h" /* gras_msg_listener_awake */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file, gras_trp,
@@
-17,15
+18,15
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_file, gras_trp,
/***
*** Prototypes
***/
/***
*** 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);
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);
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);
/***
char *data, unsigned long int size);
/***
@@
-43,26
+44,26
@@
typedef struct {
/***
*** Info about who's speaking
***/
/***
*** 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;
}
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;
}
THROW_UNIMPLEMENTED;
}
-static const char* gras_trp_file_peer_name(
gras
_socket_t s) {
+static const char* gras_trp_file_peer_name(
xbt
_socket_t s) {
THROW_UNIMPLEMENTED;
}
THROW_UNIMPLEMENTED;
}
-static const char* gras_trp_file_peer_proc(
gras
_socket_t s) {
+static const char* gras_trp_file_peer_proc(
xbt
_socket_t s) {
THROW_UNIMPLEMENTED;
}
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
***/
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);
{
gras_trp_file_plug_data_t *file = xbt_new(gras_trp_file_plug_data_t, 1);
@@
-92,15
+93,13
@@
void 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
_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_assert(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 =
if (strcmp("-", path)) {
res->sd =
@@
-134,16
+133,13
@@
gras_socket_t 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
_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
_socket_t res;
xbt_assert(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);
-
- res->plugin = gras_trp_plugin_get_by_name("file");
-
+ 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 (strcmp("-", path)) {
res->sd = open(path, O_RDONLY | O_BINARY);
@@
-168,7
+164,7
@@
gras_socket_t gras_socket_server_from_file(const char *path)
return res;
}
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;
{
gras_trp_file_plug_data_t *data;
@@
-199,7
+195,7
@@
void gras_trp_file_close(gras_socket_t sock)
* Send data on a file pseudo-socket
*/
void
* 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)
{
const char *data,
unsigned long int size, int stable_ignored)
{
@@
-207,7
+203,7
@@
gras_trp_file_chunk_send(gras_socket_t sock,
}
void
}
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)
{
const char *data, unsigned long int size)
{
@@
-240,7
+236,7
@@
gras_trp_file_chunk_send_raw(gras_socket_t sock,
* Receive data on a file pseudo-socket.
*/
int
* 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)
{
char *data, unsigned long int size)
{