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
sed -i -e 's/\t/ /g' *.[ch] Please people, stop using tabs in your source
[simgrid.git]
/
src
/
gras
/
Msg
/
msg_private.h
diff --git
a/src/gras/Msg/msg_private.h
b/src/gras/Msg/msg_private.h
index
484bdd3
..
b79897a
100644
(file)
--- a/
src/gras/Msg/msg_private.h
+++ b/
src/gras/Msg/msg_private.h
@@
-1,10
+1,9
@@
-/* $Id$ */
-
/* messaging - high level communication (send/receive messages) */
/* module's private interface masked even to other parts of GRAS. */
/* messaging - high level communication (send/receive messages) */
/* module's private interface masked even to other parts of GRAS. */
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * 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. */
/* 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. */
@@
-20,7
+19,7
@@
#include "xbt/queue.h"
#include "xbt/set.h"
#include "gras/transport.h"
#include "xbt/queue.h"
#include "xbt/set.h"
#include "gras/transport.h"
-#include "
gras
/datadesc.h"
+#include "
xbt
/datadesc.h"
#include "gras/virtu.h"
#include "gras/messages.h"
#include "gras/virtu.h"
#include "gras/messages.h"
@@
-40,8
+39,8
@@
void
gras_msgtype_declare_ext(const char *name,
short int version,
e_gras_msg_kind_t kind,
gras_msgtype_declare_ext(const char *name,
short int version,
e_gras_msg_kind_t kind,
-
gras
_datadesc_type_t payload_request,
-
gras
_datadesc_type_t payload_answer);
+
xbt
_datadesc_type_t payload_request,
+
xbt
_datadesc_type_t payload_answer);
/**
* gras_msgtype_t:
/**
* gras_msgtype_t:
@@
-57,8
+56,8
@@
typedef struct s_gras_msgtype {
/* payload */
short int version;
e_gras_msg_kind_t kind;
/* payload */
short int version;
e_gras_msg_kind_t kind;
-
gras
_datadesc_type_t ctn_type;
-
gras
_datadesc_type_t answer_type; /* only used for RPC */
+
xbt
_datadesc_type_t ctn_type;
+
xbt
_datadesc_type_t answer_type; /* only used for RPC */
} s_gras_msgtype_t;
extern xbt_set_t _gras_msgtype_set; /* of gras_msgtype_t */
} s_gras_msgtype_t;
extern xbt_set_t _gras_msgtype_set; /* of gras_msgtype_t */
@@
-66,8
+65,9
@@
void gras_msgtype_free(void *msgtype);
/* functions to extract msg from socket or put it on wire (depend RL vs SG) */
/* functions to extract msg from socket or put it on wire (depend RL vs SG) */
-void gras_msg_recv(gras_socket_t sock, gras_msg_t msg /*OUT*/);
-void gras_msg_send_ext(gras_socket_t sock,
+gras_msg_t gras_msg_recv_any(void); /* Get first message arriving */
+void gras_msg_recv(xbt_socket_t sock, gras_msg_t msg /*OUT*/);
+void gras_msg_send_ext(xbt_socket_t sock,
e_gras_msg_kind_t kind,
unsigned long int ID,
gras_msgtype_t msgtype, void *payload);
e_gras_msg_kind_t kind,
unsigned long int ID,
gras_msgtype_t msgtype, void *payload);
@@
-76,7
+76,7
@@
void gras_msg_send_ext(gras_socket_t sock,
typedef struct s_gras_msg_listener_ *gras_msg_listener_t;
gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_exchange);
/* The caller has the responsability to cleanup the queues himself */
typedef struct s_gras_msg_listener_ *gras_msg_listener_t;
gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_exchange);
/* The caller has the responsability to cleanup the queues himself */
-void gras_msg_listener_shutdown(
gras_msg_listener_t
);
+void gras_msg_listener_shutdown(
void
);
/**
* gras_cblist_t:
/**
* gras_cblist_t:
@@
-98,7
+98,7
@@
void gras_cblist_free(void *cbl);
* Context associated to a given callback (to either regular message or RPC)
*/
struct s_gras_msg_cb_ctx {
* Context associated to a given callback (to either regular message or RPC)
*/
struct s_gras_msg_cb_ctx {
-
gras
_socket_t expeditor;
+
xbt
_socket_t expeditor;
gras_msgtype_t msgtype;
unsigned long int ID;
double timeout;
gras_msgtype_t msgtype;
unsigned long int ID;
double timeout;
@@
-119,7
+119,7
@@
typedef struct {
/* returns 0 if it handled a timer, or the delay until next timer, or -1 if no armed timer */
double gras_msg_timer_handle(void);
/* returns 0 if it handled a timer, or the delay until next timer, or -1 if no armed timer */
double gras_msg_timer_handle(void);
-gras_msg_cb_ctx_t gras_msg_cb_ctx_new(
gras
_socket_t expe,
+gras_msg_cb_ctx_t gras_msg_cb_ctx_new(
xbt
_socket_t expe,
gras_msgtype_t msgtype,
unsigned long int ID,
int answer_due, double timeout);
gras_msgtype_t msgtype,
unsigned long int ID,
int answer_due, double timeout);
@@
-130,8
+130,8
@@
gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe,
#include "xbt/mallocator.h"
extern xbt_mallocator_t gras_msg_ctx_mallocator;
void *gras_msg_ctx_mallocator_new_f(void);
#include "xbt/mallocator.h"
extern xbt_mallocator_t gras_msg_ctx_mallocator;
void *gras_msg_ctx_mallocator_new_f(void);
-void gras_msg_ctx_mallocator_free_f(void *dict);
+#define gras_msg_ctx_mallocator_free_f xbt_free_f
void gras_msg_ctx_mallocator_reset_f(void *dict);
void gras_msg_ctx_mallocator_reset_f(void *dict);
-#endif /* GRAS_MESSAGE_PRIVATE_H */
+#endif
/* GRAS_MESSAGE_PRIVATE_H */