#include "gras/Transport/transport_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network");
-XBT_LOG_NEW_SUBCATEGORY(meas_trp,transport,"Conveying bytes over the network without formating for perf measurements");
+XBT_LOG_NEW_SUBCATEGORY(trp_meas,transport,"Conveying bytes over the network without formating for perf measurements");
static short int _gras_trp_started = 0;
static xbt_dict_t _gras_trp_plugins; /* All registered plugins */
gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
xbt_error_t errcode;
- gras_trp_plugin_t *plug = xbt_new0(gras_trp_plugin_t, 1);
+ gras_trp_plugin_t plug = xbt_new0(s_gras_trp_plugin_t, 1);
DEBUG1("Create plugin %s",name);
void gras_trp_plugin_free(void *p) {
- gras_trp_plugin_t *plug = p;
+ gras_trp_plugin_t plug = p;
if (plug) {
if (plug->exit) {
DEBUG1("Create a new socket (%p)", (void*)sock);
sock->plugin = NULL;
- sock->sd = -1;
- sock->data = NULL;
sock->incoming = incoming ? 1:0;
sock->outgoing = incoming ? 0:1;
sock->accepting = incoming ? 1:0;
+ sock->meas = 0;
+ sock->sd = -1;
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
- sock->meas = 0;
+ sock->data = NULL;
+ sock->bufdata = NULL;
+
*dst = sock;
xbt_dynar_push(gras_socketset_get(),dst);
/* OUT */ gras_socket_t *dst) {
xbt_error_t errcode;
- gras_trp_plugin_t *trp;
+ gras_trp_plugin_t trp;
gras_socket_t sock;
*dst = NULL;
DEBUG2("Create a server socket from plugin %s on port %d",
gras_if_RL() ? "tcp" : "sg",
port);
- TRY(gras_trp_plugin_get_by_name("buf",&trp));
+ TRY(gras_trp_plugin_get_by_name((measurement? (gras_if_RL() ? "tcp" : "sg")
+ :"buf"),
+ &trp));
/* defaults settings */
gras_trp_socket_new(1,&sock);
unsigned short port,
unsigned long int bufSize,
- int meas,
+ int measurement,
/* OUT */ gras_socket_t *dst) {
xbt_error_t errcode;
- gras_trp_plugin_t *trp;
+ gras_trp_plugin_t trp;
gras_socket_t sock;
*dst = NULL;
- TRY(gras_trp_plugin_get_by_name("buf",&trp));
+ TRY(gras_trp_plugin_get_by_name((measurement? (gras_if_RL() ? "tcp" : "sg")
+ :"buf"),
+ &trp));
DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
/* defaults settings */
sock->peer_port = port;
sock->peer_name = (char*)strdup(host?host:"localhost");
sock->bufSize = bufSize;
- sock->meas = meas;
+ sock->meas = measurement;
/* plugin-specific */
errcode= (*trp->socket_client)(trp, sock);
xbt_error_t
gras_trp_plugin_get_by_name(const char *name,
- gras_trp_plugin_t **dst){
+ gras_trp_plugin_t *dst){
return xbt_dict_get(_gras_trp_plugins,name,(void**)dst);
}
return sock->peer_name;
}
+/** \brief Check if the provided socket is a measurement one (or a regular one) */
+int gras_socket_is_meas(gras_socket_t sock) {
+ return sock->meas;
+}
+
+/** \brief Send a chunk of (random) data over a measurement socket
+ *
+ * @param peer measurement socket to use for the experiment
+ * @param timeout timeout (in seconds)
+ * @param exp_size total amount of data to send (in bytes).
+ * @param msg_size size of each chunk sent over the socket (in bytes).
+ *
+ * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on
+ * each side of the socket should be paired.
+ *
+ * The exchanged data is zeroed to make sure it's initialized, but
+ * there is no way to control what is sent (ie, you cannot use these
+ * functions to exchange data out of band).
+ */
xbt_error_t gras_socket_meas_send(gras_socket_t peer,
unsigned int timeout,
unsigned long int exp_size,
unsigned long int msg_size) {
xbt_error_t errcode;
- char *chunk = xbt_malloc(msg_size);
- int exp_sofar;
+ char *chunk = xbt_malloc0(msg_size);
+ unsigned long int exp_sofar;
XBT_IN;
+
xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket");
+
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d",
+ CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
exp_sofar,exp_size,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
TRY(gras_trp_chunk_send(peer,chunk,msg_size));
}
- CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d",
+ CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
exp_sofar,exp_size,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
free(chunk);
+
XBT_OUT;
- return no_error;/* gras_socket_meas_exchange(peer,1,timeout,expSize,msgSize); */
+ return no_error;
}
+/** \brief Receive a chunk of data over a measurement socket
+ *
+ * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on
+ * each side of the socket should be paired.
+ */
xbt_error_t gras_socket_meas_recv(gras_socket_t peer,
unsigned int timeout,
unsigned long int exp_size,
xbt_error_t errcode;
char *chunk = xbt_malloc(msg_size);
- int exp_sofar;
+ unsigned long int exp_sofar;
XBT_IN;
+
xbt_assert0(peer->meas,"Asked to receive measurement data on a regular socket\n");
+
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d",
+ CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
exp_sofar,exp_size,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
TRY(gras_trp_chunk_recv(peer,chunk,msg_size));
}
- CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d",
+ CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
exp_sofar,exp_size,msg_size,
gras_socket_peer_name(peer), gras_socket_peer_port(peer));
free(chunk);
XBT_OUT;
- return no_error;/* gras_socket_meas_exchange(peer,0,timeout,expSize,msgSize); */
+
+ return no_error;
}
+/**
+ * \brief Something similar to the good old accept system call.
+ *
+ * Make sure that there is someone speaking to the provided server socket.
+ * In RL, it does an accept(2) and return the result as last argument.
+ * In SG, as accepts are useless, it returns the provided argument as result.
+ * You should thus test whether (peer != accepted) before closing both of them.
+ *
+ * You should only call this on measurement sockets. It is automatically
+ * done for regular sockets, but you usually want more control about
+ * what's going on with measurement sockets.
+ */
+xbt_error_t gras_socket_meas_accept(gras_socket_t peer, gras_socket_t *accepted){
+ xbt_error_t errcode;
+ gras_socket_t res;
+
+ xbt_assert0(peer->meas,
+ "No need to accept on non-measurement sockets (it's automatic)");
+
+ if (!peer->accepting) {
+ /* nothing to accept here */
+ *accepted=peer;
+ return no_error;
+ }
+
+ TRY((peer->plugin->socket_accept)(peer,accepted));
+ (*accepted)->meas = peer->meas;
+ CDEBUG1(trp_meas,"meas_accepted onto %d",(*accepted)->sd);
+
+ return no_error;
+}
+
+
/*
* Creating procdata for this module
*/
