* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex.h"
+#include "xbt/host.h"
#include "portable.h"
#include "gras/Transport/transport_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network");
-XBT_LOG_NEW_SUBCATEGORY(trp_meas,transport,"Conveying bytes over the network without formating for perf measurements");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp,gras,"Conveying bytes over the network");
+XBT_LOG_NEW_SUBCATEGORY(gras_trp_meas,gras_trp,"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 */
sock->outgoing = incoming ? 0:1;
sock->accepting = incoming ? 1:0;
sock->meas = 0;
+ sock->recv_ok = 1;
sock->sd = -1;
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
+ sock->peer_proc = NULL;
sock->data = NULL;
sock->bufdata = NULL;
*dst = sock;
- xbt_dynar_push(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
XBT_OUT;
}
-
-
+
/**
* @brief Opens a server socket and makes it ready to be listened to.
+ * @param port: port on which you want to listen
* @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change)
+ * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages)
*
* In real life, you'll get a TCP socket.
*/
sock->outgoing?'y':'n',
sock->accepting?'y':'n');
} CATCH(e) {
+ int cursor;
+ gras_socket_t sock_iter;
+ xbt_dynar_t socks = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
+ xbt_dynar_foreach(socks, cursor, sock_iter) {
+ if (sock_iter==sock)
+ xbt_dynar_cursor_rm(socks,&cursor);
+ }
free(sock);
RETHROW;
}
+ if (!measurement)
+ ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport = port;
return sock;
}
+/**
+ * @brief Opens a server socket on any port in the given range
+ *
+ * @param minport: first port we will try
+ * @param maxport: last port we will try
+ * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change)
+ * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages)
+ *
+ * If none of the provided ports works, raises the exception got when trying the last possibility
+ */
+gras_socket_t
+gras_socket_server_range(unsigned short minport, unsigned short maxport,
+ unsigned long int buf_size, int measurement) {
+
+ int port;
+ gras_socket_t res=NULL;
+ xbt_ex_t e;
+
+ for (port=minport; port<maxport;port ++) {
+ TRY {
+ res=gras_socket_server_ext(port,buf_size,measurement);
+ } CATCH(e) {
+ if (port==maxport)
+ RETHROW;
+ xbt_ex_free(e);
+ }
+ return res;
+ }
+ THROW_IMPOSSIBLE;
+}
/**
* @brief Opens a client socket to a remote host.
+ * @param host: who you want to connect to
+ * @param port: where you want to connect to on this host
* @param buf_size: size of the buffer (in bytes) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change)
+ * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages)
*
* In real life, you'll get a TCP socket.
*/
*/
gras_socket_t
gras_socket_server(unsigned short port) {
- return gras_socket_server_ext(port,32,0);
+ return gras_socket_server_ext(port,32*1024,0);
}
-/**
- * gras_socket_client:
- *
- * Opens a client socket to a remote host.
- * In real life, you'll get a TCP socket.
- */
+/** @brief Opens a client socket to a remote host */
gras_socket_t
gras_socket_client(const char *host,
unsigned short port) {
- return gras_socket_client_ext(host,port,32,0);
+ return gras_socket_client_ext(host,port,0,0);
}
+/** @brief Opens a client socket to a remote host specified as '<host>:<port>' */
+gras_socket_t
+gras_socket_client_from_string(const char *host) {
+ xbt_host_t h = xbt_host_from_string(host);
+ gras_socket_t res = gras_socket_client_ext(h->name,h->port,0,0);
+ xbt_host_free(h);
+ return res;
+}
+/** \brief Close socket */
void gras_socket_close(gras_socket_t sock) {
xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
gras_socket_t sock_iter;
return;
}
}
- WARN1("Ignoring request to free an unknown socket (%p)",sock);
+ WARN1("Ignoring request to free an unknown socket (%p). Execution stack:",sock);
+ xbt_backtrace_display();
}
XBT_OUT;
}
char *gras_socket_peer_name(gras_socket_t sock) {
return sock->peer_name;
}
+char *gras_socket_peer_proc(gras_socket_t sock) {
+ return sock->peer_proc;
+}
+
+void gras_socket_peer_proc_set(gras_socket_t sock,char*peer_proc) {
+ sock->peer_proc = peer_proc;
+}
/** \brief Check if the provided socket is a measurement one (or a regular one) */
int gras_socket_is_meas(gras_socket_t sock) {
unsigned int timeout,
unsigned long int exp_size,
unsigned long int msg_size) {
- char *chunk = xbt_malloc0(msg_size);
+ char *chunk=NULL;
unsigned long int exp_sofar;
XBT_IN;
+ if (gras_if_RL())
+ chunk=xbt_malloc0(msg_size);
+
xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket");
xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())");
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
+ CDEBUG5(gras_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));
(*peer->plugin->raw_send)(peer,chunk,msg_size);
}
- CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
+ CDEBUG5(gras_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);
+ if (gras_if_RL())
+ free(chunk);
XBT_OUT;
}
unsigned long int exp_size,
unsigned long int msg_size){
- char *chunk = xbt_malloc(msg_size);
+ char *chunk=NULL;
unsigned long int exp_sofar;
XBT_IN;
+ if (gras_if_RL())
+ chunk = xbt_malloc(msg_size);
+
xbt_assert0(peer->meas,
"Asked to receive measurement data on a regular socket");
xbt_assert0(peer->incoming,"Socket not suited for data receive");
for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
- CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
+ CDEBUG5(gras_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));
(peer->plugin->raw_recv)(peer,chunk,msg_size);
}
- CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
+ CDEBUG5(gras_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);
+ if (gras_if_RL())
+ free(chunk);
XBT_OUT;
}
"No need to accept on non-measurement sockets (it's automatic)");
if (!peer->accepting) {
- /* nothing to accept here */
+ /* nothing to accept here (must be in SG) */
+ /* BUG: FIXME: this is BAD! it makes tricky to free the accepted socket*/
return peer;
}
res = (peer->plugin->socket_accept)(peer);
res->meas = peer->meas;
- CDEBUG1(trp_meas,"meas_accepted onto %d",res->sd);
+ CDEBUG1(gras_trp_meas,"meas_accepted onto %d",res->sd);
return res;
}
res->name = xbt_strdup("gras_trp");
res->name_len = 0;
res->sockets = xbt_dynar_new(sizeof(gras_socket_t*), NULL);
+ res->myport = 0;
return (void*)res;
}
gras_trp_libdata_id = gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free);
}
+int gras_os_myport(void) {
+ return ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport;
+}
+
