-/* $Id$ */
-
/* transport - low level communication */
-/* Copyright (c) 2004 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 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. */
sock->incoming = incoming ? 1 : 0;
sock->outgoing = incoming ? 0 : 1;
- sock->is_master = incoming ? 1 : 0;
+ sock->accepting = incoming ? 1 : 0;
sock->meas = 0;
sock->recvd = 0;
sock->valid = 1;
sock->moredata = 0;
sock->sd = -1;
- sock->port = -1;
- sock->peer_port = -1;
- sock->peer_name = NULL;
- sock->peer_proc = NULL;
sock->data = NULL;
sock->bufdata = NULL;
/* defaults settings */
gras_trp_socket_new(1, &sock);
sock->plugin = trp;
- sock->port = port;
sock->buf_size = buf_size > 0 ? buf_size : 32 * 1024;
sock->meas = measurement;
/* Call plugin socket creation function */
DEBUG1("Prepare socket with plugin (fct=%p)", trp->socket_server);
TRY {
- trp->socket_server(trp, sock);
+ trp->socket_server(trp, port, sock);
DEBUG3("in=%c out=%c accept=%c",
sock->incoming ? 'y' : 'n',
- sock->outgoing ? 'y' : 'n', sock->is_master ? 'y' : 'n');
+ sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');
} CATCH(e) {
free(sock);
}
if (!measurement)
- ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport =
- port;
+ ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport
+ = port;
xbt_dynar_push(((gras_trp_procdata_t)
- gras_libdata_by_id(gras_trp_libdata_id))->sockets, &sock);
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,
+ &sock);
gras_msg_listener_awake();
return sock;
trp = gras_trp_plugin_get_by_name(gras_if_SG()? "sg" : "tcp");
- DEBUG1("Create a client socket from plugin %s", gras_if_RL()? "tcp" : "sg");
+ DEBUG1("Create a client socket from plugin %s",
+ gras_if_RL()? "tcp" : "sg");
/* defaults settings */
gras_trp_socket_new(0, &sock);
sock->plugin = trp;
- sock->peer_port = port;
- sock->peer_name = (char *) strdup(host ? host : "localhost");
sock->buf_size = buf_size > 0 ? buf_size : 32 * 1024;
sock->meas = measurement;
/* plugin-specific */
TRY {
- (*trp->socket_client) (trp, sock);
+ (*trp->socket_client) (trp,host,port,sock);
DEBUG3("in=%c out=%c accept=%c",
sock->incoming ? 'y' : 'n',
- sock->outgoing ? 'y' : 'n', sock->is_master ? 'y' : 'n');
+ sock->outgoing ? 'y' : 'n', sock->accepting ? 'y' : 'n');
} CATCH(e) {
free(sock);
RETHROW;
}
xbt_dynar_push(((gras_trp_procdata_t)
- gras_libdata_by_id(gras_trp_libdata_id))->sockets, &sock);
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,
+ &sock);
gras_msg_listener_awake();
return sock;
}
return res;
}
-void gras_socket_close_voidp(void *sock) {
- gras_socket_close((gras_socket_t)sock);
+void gras_socket_close_voidp(void *sock)
+{
+ gras_socket_close((gras_socket_t) sock);
}
/** \brief Close socket */
void gras_socket_close(gras_socket_t sock)
{
- xbt_dynar_t my_sockets =
- ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
+ xbt_dynar_t sockets =
+ ((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets;
gras_socket_t sock_iter = NULL;
unsigned int cursor;
if (sock->moredata)
CRITICAL0
- ("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing.");
+ ("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing.");
_gras_lastly_selected_socket = NULL;
}
/* FIXME: Issue an event when the socket is closed */
- DEBUG1("sockets pointer before %p", my_sockets);
+ DEBUG1("sockets pointer before %p", sockets);
if (sock) {
/* FIXME: Cannot get the dynar mutex, because it can be already locked */
// _xbt_dynar_foreach(sockets,cursor,sock_iter) {
- for (cursor = 0; cursor < xbt_dynar_length(my_sockets); cursor++) {
- _xbt_dynar_cursor_get(my_sockets, cursor, &sock_iter);
+ for (cursor = 0; cursor < xbt_dynar_length(sockets); cursor++) {
+ _xbt_dynar_cursor_get(sockets, cursor, &sock_iter);
if (sock == sock_iter) {
DEBUG2("remove sock cursor %d dize %lu\n", cursor,
- xbt_dynar_length(my_sockets));
- xbt_dynar_cursor_rm(my_sockets, &cursor);
- gras_msg_listener_close_socket(sock);
+ xbt_dynar_length(sockets));
+ xbt_dynar_cursor_rm(sockets, &cursor);
+ if (sock->plugin->socket_close)
+ (*sock->plugin->socket_close) (sock);
+
+ /* free the memory */
+ free(sock);
XBT_OUT;
return;
}
}
- WARN1("Ignoring request to free an unknown socket (%p). Execution stack:",
- sock);
+ WARN1
+ ("Ignoring request to free an unknown socket (%p). Execution stack:",
+ sock);
xbt_backtrace_display_current();
}
XBT_OUT;
int gras_socket_my_port(gras_socket_t sock)
{
- return sock->port;
+ if (!sock->plugin->my_port)
+ THROW1(unknown_error,0,"Function my_port unimplemented in plugin %s",sock->plugin->name);
+ return (*sock->plugin->my_port)(sock);
+
}
int gras_socket_peer_port(gras_socket_t sock)
{
- return sock->peer_port;
+ if (!sock->plugin->peer_port)
+ THROW1(unknown_error,0,"Function peer_port unimplemented in plugin %s",sock->plugin->name);
+ return (*sock->plugin->peer_port)(sock);
}
-char *gras_socket_peer_name(gras_socket_t sock)
+const char *gras_socket_peer_name(gras_socket_t sock)
{
- return sock->peer_name;
+ return (*sock->plugin->peer_name)(sock);
}
-char *gras_socket_peer_proc(gras_socket_t sock)
+const char *gras_socket_peer_proc(gras_socket_t sock)
{
- return sock->peer_proc;
+ return (*sock->plugin->peer_proc)(sock);
}
void gras_socket_peer_proc_set(gras_socket_t sock, char *peer_proc)
{
- sock->peer_proc = peer_proc;
+ return (*sock->plugin->peer_proc_set)(sock,peer_proc);
}
/** \brief Check if the provided socket is a measurement one (or a regular one) */
for (sent_sofar = 0; sent_sofar < msg_amount; sent_sofar++) {
CDEBUG5(gras_trp_meas,
- "Sent %lu msgs of %lu (size of each: %ld) to %s:%d", sent_sofar,
- msg_amount, msg_size, gras_socket_peer_name(peer),
+ "Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
+ sent_sofar, msg_amount, msg_size, gras_socket_peer_name(peer),
gras_socket_peer_port(peer));
(*peer->plugin->raw_send) (peer, chunk, msg_size);
}
- CDEBUG5(gras_trp_meas, "Sent %lu msgs of %lu (size of each: %ld) to %s:%d",
- sent_sofar, msg_amount, msg_size,
- gras_socket_peer_name(peer), gras_socket_peer_port(peer));
+ CDEBUG5(gras_trp_meas,
+ "Sent %lu msgs of %lu (size of each: %ld) to %s:%d", sent_sofar,
+ msg_amount, msg_size, gras_socket_peer_name(peer),
+ gras_socket_peer_port(peer));
if (gras_if_RL())
free(chunk);
for (got_sofar = 0; got_sofar < msg_amount; got_sofar++) {
CDEBUG5(gras_trp_meas,
- "Recvd %ld msgs of %lu (size of each: %ld) from %s:%d", got_sofar,
- msg_amount, msg_size, gras_socket_peer_name(peer),
+ "Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+ got_sofar, msg_amount, msg_size, gras_socket_peer_name(peer),
gras_socket_peer_port(peer));
(peer->plugin->raw_recv) (peer, chunk, msg_size);
}
CDEBUG5(gras_trp_meas,
- "Recvd %ld msgs of %lu (size of each: %ld) from %s:%d", got_sofar,
- msg_amount, msg_size, gras_socket_peer_name(peer),
+ "Recvd %ld msgs of %lu (size of each: %ld) from %s:%d",
+ got_sofar, msg_amount, msg_size, gras_socket_peer_name(peer),
gras_socket_peer_port(peer));
if (gras_if_RL())
xbt_assert0(peer->meas,
"No need to accept on non-measurement sockets (it's automatic)");
- if (!peer->is_master) {
+ if (!peer->accepting) {
/* nothing to accept here (must be in SG) */
/* BUG: FIXME: this is BAD! it makes tricky to free the accepted socket */
return peer;
res->name = xbt_strdup("gras_trp");
res->name_len = 0;
res->sockets = xbt_dynar_new_sync(sizeof(gras_socket_t *), NULL);
- res->comms = xbt_dynar_new(sizeof(void*),NULL); /* stores some smx_comm_t in SG (not used in RL) */
res->myport = 0;
return (void *) res;
gras_trp_procdata_t res = (gras_trp_procdata_t) data;
xbt_dynar_free(&(res->sockets));
- xbt_dynar_free(&(res->comms));
free(res->name);
free(res);
}
void gras_trp_socketset_dump(const char *name)
{
gras_trp_procdata_t procdata =
- (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+ (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
unsigned int it;
gras_socket_t s;
void gras_trp_register()
{
gras_trp_libdata_id =
- gras_procdata_add("gras_trp", gras_trp_procdata_new,
- gras_trp_procdata_free);
+ gras_procdata_add("gras_trp", gras_trp_procdata_new,
+ gras_trp_procdata_free);
}
int gras_os_myport(void)
