X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9189fe94c14ef9e31142d1603a1979ea7e731a0a..b4036710f1d7f435ac50328d290cb95b108d505e:/include/gras/transport.h?ds=sidebyside
diff --git a/include/gras/transport.h b/include/gras/transport.h
index 0d0f9a16ae..49984b1fe4 100644
--- a/include/gras/transport.h
+++ b/include/gras/transport.h
@@ -1,3 +1,4 @@
+
/* $Id$ */
/* transport - low level communication (send/receive bunches of bytes) */
@@ -11,37 +12,51 @@
#ifndef GRAS_TRANSPORT_H
#define GRAS_TRANSPORT_H
-#include "xbt/error.h"
-
/** \addtogroup GRAS_sock
- * \brief Socket handling (Communication facility).
+ * \brief Socket handling
+ *
+ * The model of communications in GRAS is very close to the BSD socket one.
+ * To get two hosts exchanging data, one of them need to open a
+ * server socket on which it can listen for incoming messages and the
+ * other one must connect a client socket onto the server one.
+ *
+ * The main difference is that you cannot exchange arbitrary bytes on
+ * sockets, but messages. See the \ref GRAS_msg section for details.
+ *
+ * If you need an example of how to use sockets, check \ref GRAS_ex_ping.
+ *
*/
-
-/** \name Socket creation functions
+
+/** \defgroup GRAS_sock_create Socket creation functions
* \ingroup GRAS_sock
+ *
*/
/* @{*/
/** \brief Opaque type describing a socket */
typedef struct s_gras_socket *gras_socket_t;
/** \brief Simply create a client socket (to speak to a remote host) */
-gras_socket_t gras_socket_client(const char *host, unsigned short port);
+XBT_PUBLIC gras_socket_t gras_socket_client(const char *host, unsigned short port);
+XBT_PUBLIC gras_socket_t gras_socket_client_from_string(const char *host);
/** \brief Simply create a server socket (to ear from remote hosts speaking to you) */
-gras_socket_t gras_socket_server(unsigned short port);
-/** \brief Close socket */
-void gras_socket_close(gras_socket_t sd);
+XBT_PUBLIC gras_socket_t gras_socket_server(unsigned short port);
+XBT_PUBLIC void gras_socket_close(gras_socket_t sd);
/** \brief Create a client socket, full interface to all relevant settings */
-gras_socket_t gras_socket_client_ext(const char *host,
+XBT_PUBLIC gras_socket_t gras_socket_client_ext(const char *host,
unsigned short port,
unsigned long int bufSize,
int measurement);
/** \brief Create a server socket, full interface to all relevant settings */
-gras_socket_t gras_socket_server_ext(unsigned short port,
+XBT_PUBLIC gras_socket_t gras_socket_server_ext(unsigned short port,
unsigned long int bufSize,
int measurement);
+XBT_PUBLIC gras_socket_t
+gras_socket_server_range(unsigned short minport, unsigned short maxport,
+ unsigned long int buf_size, int measurement);
+
/* @}*/
-/** \name Retrieving data about sockets and peers
+/** \defgroup GRAS_sock_info Retrieving data about sockets and peers
* \ingroup GRAS_sock
*
* Who are you talking to?
@@ -49,14 +64,16 @@ gras_socket_t gras_socket_server_ext(unsigned short port,
/* @{*/
/** Get the port number on which this socket is connected on my side */
-int gras_socket_my_port (gras_socket_t sock);
+XBT_PUBLIC int gras_socket_my_port (gras_socket_t sock);
/** Get the port number on which this socket is connected on remote side */
-int gras_socket_peer_port(gras_socket_t sock);
+XBT_PUBLIC int gras_socket_peer_port(gras_socket_t sock);
/** Get the host name of the remote side */
-char *gras_socket_peer_name(gras_socket_t sock);
+XBT_PUBLIC char *gras_socket_peer_name(gras_socket_t sock);
+/** Get the process name of the remote side */
+XBT_PUBLIC char *gras_socket_peer_proc(gras_socket_t sock);
/* @}*/
-/** \name Using measurement sockets
+/** \defgroup GRAS_sock_meas Using measurement sockets
* \ingroup GRAS_sock
*
* You may want to use sockets not to exchange valuable data (in messages),
@@ -69,22 +86,23 @@ char *gras_socket_peer_name(gras_socket_t sock);
-int gras_socket_is_meas(gras_socket_t sock);
-void gras_socket_meas_send(gras_socket_t peer,
- unsigned int timeout,
- unsigned long int expSize,
- unsigned long int msgSize);
-void gras_socket_meas_recv(gras_socket_t peer,
- unsigned int timeout,
- unsigned long int expSize,
- unsigned long int msgSize);
-gras_socket_t gras_socket_meas_accept(gras_socket_t peer);
+XBT_PUBLIC int gras_socket_is_meas(gras_socket_t sock);
+XBT_PUBLIC void gras_socket_meas_send(gras_socket_t peer,
+ unsigned int timeout,
+ unsigned long int msgSize,
+ unsigned long int msgAmount);
+XBT_PUBLIC void gras_socket_meas_recv(gras_socket_t peer,
+ unsigned int timeout,
+ unsigned long int msgSize,
+ unsigned long int msgAmount);
+XBT_PUBLIC gras_socket_t gras_socket_meas_accept(gras_socket_t peer);
/* @}*/
-/** \name Using files as sockets
+/** \defgroup GRAS_sock_file Using files as sockets
* \ingroup GRAS_sock
*
+ *
* For debugging purpose, it is possible to deal with files as if they were sockets.
* It can even be useful to store stuff in a portable manner, but writing messages to a file
* may be strange...
@@ -93,8 +111,8 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer);
*/
/* @{*/
/* debuging functions */
-gras_socket_t gras_socket_client_from_file(const char*path);
-gras_socket_t gras_socket_server_from_file(const char*path);
+XBT_PUBLIC gras_socket_t gras_socket_client_from_file(const char*path);
+XBT_PUBLIC gras_socket_t gras_socket_server_from_file(const char*path);
/* @} */