/* make sure this socket will reach someone */
if (!(peer=SIMIX_host_get_by_name(sock->peer_name)))
- THROW1(mismatch_error,0,"Can't connect to %s: no such host.\n",sock->peer_name);
+ THROW1(mismatch_error,0,
+ "Can't connect to %s: no such host.\n",sock->peer_name);
if (!(hd=(gras_hostdata_t *)SIMIX_host_get_data(peer)))
THROW1(mismatch_error,0,
if (pr.meas && !sock->meas) {
THROW2(mismatch_error,0,
"can't connect to %s:%d in regular mode, the process listen "
- "in meas mode on this port",sock->peer_name,sock->peer_port);
+ "in measurement mode on this port",sock->peer_name,sock->peer_port);
}
if (!pr.meas && sock->meas) {
THROW2(mismatch_error,0,
- "can't connect to %s:%d in meas mode, the process listen "
+ "can't connect to %s:%d in measurement mode, the process listen "
"in regular mode on this port",sock->peer_name,sock->peer_port);
}
/* create the socket */
data = xbt_new(gras_trp_sg_sock_data_t,1);
data->from_process = SIMIX_process_self();
- data->to_process = pr.process;
+ data->to_process = pr.process;
data->to_host = peer;
- /* initialize mutex and condition of the socket */
- data->mutex = SIMIX_mutex_init();
- data->cond = SIMIX_cond_init();
- data->to_socket = pr.socket;
+ /* initialize mutex and condition of the socket */
+ data->mutex = SIMIX_mutex_init();
+ data->cond = SIMIX_cond_init();
+ data->to_socket = pr.socket;
sock->data = data;
sock->incoming = 1;
DEBUG5("%s (PID %d) connects in %s mode to %s:%d",
- SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
- sock->meas?"meas":"regular",
+ SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ sock->meas?"meas":"regular",
sock->peer_name,sock->peer_port);
}
"can't listen on address %s:%d: port already in use.",
host,sock->port);
- pr.port = sock->port;
- pr.meas = sock->meas;
- pr.socket = sock;
- pr.process = SIMIX_process_self();
+ pr.port = sock->port;
+ pr.meas = sock->meas;
+ pr.socket = sock;
+ pr.process = SIMIX_process_self();
xbt_dynar_push(hd->ports,&pr);
/* Create the socket */
data = xbt_new(gras_trp_sg_sock_data_t,1);
data->from_process = SIMIX_process_self();
data->to_process = NULL;
- data->to_host = SIMIX_host_self();
+ data->to_host = SIMIX_host_self();
- data->cond = SIMIX_cond_init();
- data->mutex = SIMIX_mutex_init();
+ data->cond = SIMIX_cond_init();
+ data->mutex = SIMIX_mutex_init();
sock->data = data;
VERB6("'%s' (%d) ears on %s:%d%s (%p)",
- SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
- host,sock->port,sock->meas? " (mode meas)":"",sock);
+ SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ host,sock->port,sock->meas? " (mode meas)":"",sock);
}
xbt_assert0(hd,"Please run gras_process_init on each process");
if (sock->data) {
- SIMIX_cond_destroy(((gras_trp_sg_sock_data_t*)sock->data)->cond);
- SIMIX_mutex_destroy(((gras_trp_sg_sock_data_t*)sock->data)->mutex);
- free(sock->data);
- }
+ SIMIX_cond_destroy(((gras_trp_sg_sock_data_t*)sock->data)->cond);
+ SIMIX_mutex_destroy(((gras_trp_sg_sock_data_t*)sock->data)->mutex);
+ free(sock->data);
+ }
if (sock->incoming && !sock->outgoing && sock->port >= 0) {
/* server mode socket. Unregister it from 'OS' tables */
xbt_dynar_foreach(hd->ports, cpt, pr) {
DEBUG2("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports));
if (pr.port == sock->port) {
- xbt_dynar_cursor_rm(hd->ports, &cpt);
- XBT_OUT;
- return;
+ xbt_dynar_cursor_rm(hd->ports, &cpt);
+ XBT_OUT;
+ return;
}
}
WARN2("socket_close called on the unknown incoming socket %p (port=%d)",
sock,sock->port);
}
- XBT_OUT;
-
+ XBT_OUT;
}
typedef struct {
char name[256];
static unsigned int count=0;
- smx_action_t act; /* simix action */
- gras_trp_sg_sock_data_t *sock_data;
- gras_trp_sg_sock_data_t *remote_sock_data;
- gras_hostdata_t *hd;
- gras_hostdata_t *remote_hd;
- gras_trp_procdata_t trp_remote_proc;
- gras_msg_procdata_t msg_remote_proc;
- gras_msg_t msg; /* message to send */
+ smx_action_t act; /* simix action */
+ gras_trp_sg_sock_data_t *sock_data;
+ gras_trp_procdata_t trp_remote_proc;
+ gras_msg_procdata_t msg_remote_proc;
+ gras_msg_t msg; /* message to send */
- sock_data = (gras_trp_sg_sock_data_t *)sock->data;
- remote_sock_data = ((gras_trp_sg_sock_data_t *)sock->data)->to_socket->data;
- hd = (gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self());
- remote_hd = (gras_hostdata_t *)SIMIX_host_get_data(sock_data->to_host);
-
- xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets");
+ sock_data = (gras_trp_sg_sock_data_t *)sock->data;
+ xbt_assert0(sock->meas,
+ "SG chunk exchange shouldn't be used on non-measurement sockets");
+ SIMIX_mutex_lock(sock_data->mutex);
sprintf(name,"Chunk[%d]",count++);
- /*initialize gras message */
- msg = xbt_new(s_gras_msg_t,1);
- msg->expe = sock;
- msg->payl_size=size;
+ /*initialize gras message */
+ msg = xbt_new(s_gras_msg_t,1);
+ msg->expe = sock;
+ msg->payl_size=size;
if (data) {
msg->payl=(void*)xbt_malloc(size);
} else {
msg->payl = NULL;
}
+
+
+ /* put his socket on the selectable socket queue */
+ trp_remote_proc = (gras_trp_procdata_t)
+ gras_libdata_by_name_from_remote("gras_trp",sock_data->to_process);
+ xbt_queue_push(trp_remote_proc->meas_selectable_sockets,&sock);
- /* put message on msg_queue */
- msg_remote_proc = (gras_msg_procdata_t)gras_libdata_by_name_from_remote("gras_msg",sock_data->to_process);
- xbt_fifo_push(msg_remote_proc->msg_to_receive_queue,msg);
-
- /* wake-up the receiver */
- trp_remote_proc = (gras_trp_procdata_t)gras_libdata_by_name_from_remote("gras_trp",sock_data->to_process);
- SIMIX_cond_signal(trp_remote_proc->cond);
-
- SIMIX_mutex_lock(remote_sock_data->mutex);
- //SIMIX_mutex_lock(remote_hd->mutex_port[sock->peer_port]);
- /* wait for the receiver */
- SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex);
- //SIMIX_cond_wait(remote_hd->cond_port[sock->peer_port], remote_hd->mutex_port[sock->peer_port]);
-
- /* creates simix action and waits its ends, waits in the sender host condition*/
+ /* put message on msg_queue */
+ msg_remote_proc = (gras_msg_procdata_t)
+ gras_libdata_by_name_from_remote("gras_msg", sock_data->to_process);
+
+ xbt_fifo_push(msg_remote_proc->msg_to_receive_queue_meas,msg);
+
+ /* wait for the receiver */
+ SIMIX_cond_wait(sock_data->cond,sock_data->mutex);
+
+ /* creates simix action and waits its ends, waits in the sender host
+ condition*/
DEBUG5("send chunk %s from %s to %s:%d (size=%ld)",
name, SIMIX_host_get_name(SIMIX_host_self()),
SIMIX_host_get_name(sock_data->to_host), sock->peer_port,size);
- act = SIMIX_action_communicate(SIMIX_host_self(), sock_data->to_host, name, size, -1);
- /*
- SIMIX_register_action_to_condition(act,remote_hd->cond_port[sock->peer_port]);
- SIMIX_register_condition_to_action(act,remote_hd->cond_port[sock->peer_port]);
- */
- SIMIX_register_action_to_condition(act,remote_sock_data->cond);
- SIMIX_register_condition_to_action(act,remote_sock_data->cond);
-
- SIMIX_host_get_name(sock_data->to_host),SIMIX_process_get_name(sock_data->to_process),
-
- SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex);
- //SIMIX_cond_wait(remote_hd->cond_port[sock->peer_port], remote_hd->mutex_port[sock->peer_port]);
- /* error treatmeant */
-
- /* cleanup structures */
- SIMIX_action_destroy(act);
-
- SIMIX_mutex_unlock(remote_sock_data->mutex);
- //SIMIX_mutex_unlock(remote_hd->mutex_port[sock->peer_port]);
- SIMIX_cond_signal(remote_sock_data->cond);
- //SIMIX_cond_signal(remote_hd->cond_port[sock->peer_port]);
+ act = SIMIX_action_communicate(SIMIX_host_self(), sock_data->to_host,
+ name, size, -1);
+ SIMIX_register_action_to_condition(act,sock_data->cond);
+ SIMIX_cond_wait(sock_data->cond,sock_data->mutex);
+ SIMIX_unregister_action_to_condition(act,sock_data->cond);
+ /* error treatmeant (FIXME)*/
+
+ /* cleanup structures */
+ SIMIX_action_destroy(act);
+
+ SIMIX_mutex_unlock(sock_data->mutex);
}
int gras_trp_sg_chunk_recv(gras_socket_t sock,
- char *data,
- unsigned long int size){
- gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id);
- gras_trp_sg_sock_data_t *sock_data;
- gras_hostdata_t *remote_hd;
- gras_hostdata_t *local_hd;
+ char *data,
+ unsigned long int size){
+ gras_trp_sg_sock_data_t *sock_data;
+ gras_trp_sg_sock_data_t *remote_sock_data;
+ gras_socket_t remote_socket= NULL;
gras_msg_t msg_got;
- gras_msg_procdata_t msg_procdata = (gras_msg_procdata_t)gras_libdata_by_name("gras_msg");
-
- xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets");
-
- SIMIX_mutex_lock(pd->mutex);
- if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0 ) {
- SIMIX_cond_wait_timeout(pd->cond,pd->mutex,60);
- }
- if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0 ) {
- THROW0(timeout_error,0,"Timeout");
+ gras_msg_procdata_t msg_procdata =
+ (gras_msg_procdata_t)gras_libdata_by_name("gras_msg");
+ gras_trp_procdata_t trp_proc =
+ (gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id);
+
+ xbt_assert0(sock->meas,
+ "SG chunk exchange shouldn't be used on non-measurement sockets");
+ xbt_queue_shift_timed(trp_proc->meas_selectable_sockets,
+ &remote_socket, 60);
+
+ if (remote_socket == NULL) {
+ THROW0(timeout_error,0,"Timeout");
}
- SIMIX_mutex_unlock(pd->mutex);
-
- sock_data = (gras_trp_sg_sock_data_t *)sock->data;
- DEBUG3("Remote host %s, Remote Port: %d Local port %d", SIMIX_host_get_name(sock_data->to_host), sock->peer_port, sock->port);
- remote_hd = (gras_hostdata_t *)SIMIX_host_get_data(sock_data->to_host);
- local_hd = (gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self());
-
-
-
- msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue);
- SIMIX_mutex_lock(sock_data->mutex);
- //SIMIX_mutex_lock(local_hd->mutex_port[sock->port]);
-/* ok, I'm here, you can continue the communication */
- SIMIX_cond_signal(sock_data->cond);
- //SIMIX_cond_signal(local_hd->cond_port[sock->port]);
+ remote_sock_data = (gras_trp_sg_sock_data_t *)remote_socket->data;
+ msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue_meas);
+
+ sock_data = (gras_trp_sg_sock_data_t *)sock->data;
-/* wait for communication end */
- SIMIX_cond_wait(sock_data->cond,sock_data->mutex);
- //SIMIX_cond_wait(local_hd->cond_port[sock->port],local_hd->mutex_port[sock->port]);
+ /* ok, I'm here, you can continue the communication */
+ SIMIX_cond_signal(remote_sock_data->cond);
+ SIMIX_mutex_lock(remote_sock_data->mutex);
+ /* wait for communication end */
+ SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex);
if (msg_got->payl_size != size)
THROW5(mismatch_error,0,
msg_got->payl_size, size,
SIMIX_host_get_name(sock_data->to_host),
SIMIX_host_get_name(SIMIX_host_self()), sock->peer_port);
- if (data) {
+
+ if (data)
memcpy(data,msg_got->payl,size);
- }
- if (msg_got->payl)
- xbt_free(msg_got->payl);
- xbt_free(msg_got);
- SIMIX_cond_wait(sock_data->cond,sock_data->mutex);
- SIMIX_mutex_unlock(sock_data->mutex);
- //SIMIX_mutex_unlock(local_hd->mutex_port[sock->port]);
- /*
- SIMIX_cond_wait(local_hd->cond_port[sock->port],local_hd->mutex_port[sock->port]);
- SIMIX_mutex_unlock(local_hd->mutex_port[sock->port]);
- */
- return 0;
+
+ if (msg_got->payl)
+ xbt_free(msg_got->payl);
+
+ xbt_free(msg_got);
+ SIMIX_mutex_unlock(remote_sock_data->mutex);
+ return 0;
}
