unsigned int cpt;
gras_sg_portrec_t pr;
- xbt_assert0(hd, "Please run gras_process_init on each process");
+ xbt_assert(hd, "Please run gras_process_init on each process");
xbt_dynar_foreach(hd->ports, cpt, pr) {
if (pr->port == port)
***/
static int gras_trp_sg_my_port(gras_socket_t s) {
gras_trp_sg_sock_data_t sockdata = s->data;
- if (sockdata->rdv_client == NULL) /* Master socket, I'm server */
+ if (gras_socket_im_the_server(s))
return sockdata->server_port;
else
return sockdata->client_port;
}
static int gras_trp_sg_peer_port(gras_socket_t s) {
gras_trp_sg_sock_data_t sockdata = s->data;
- if (sockdata->server == SIMIX_process_self())
+ if (gras_socket_im_the_server(s))
return sockdata->client_port;
else
return sockdata->server_port;
}
+
static const char* gras_trp_sg_peer_name(gras_socket_t s) {
gras_trp_sg_sock_data_t sockdata = s->data;
- if (sockdata->server == SIMIX_process_self())
- return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->client));
- else
- return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server));
+ if (gras_socket_im_the_server(s))
+ return SIMIX_host_get_name(simcall_process_get_host(sockdata->client));
+ else {
+ return SIMIX_host_get_name(simcall_process_get_host(sockdata->server));
+ }
}
static const char* gras_trp_sg_peer_proc(gras_socket_t s) {
THROW_UNIMPLEMENTED;
gras_sg_portrec_t pr;
/* make sure this socket will reach someone */
- if (!(peer = SIMIX_host_get_by_name(host)))
- THROW1(mismatch_error, 0,
+ if (!(peer = simcall_host_get_by_name(host)))
+ THROWF(mismatch_error, 0,
"Can't connect to %s: no such host.\n", host);
- if (!(hd = (gras_hostdata_t *) SIMIX_host_get_data(peer)))
- THROW1(mismatch_error, 0,
+ if (!(hd = (gras_hostdata_t *) simcall_host_get_data(peer)))
+ THROWF(mismatch_error, 0,
"can't connect to %s: no process on this host",
host);
pr = find_port(hd, port);
if (pr == NULL) {
- THROW2(mismatch_error, 0,
+ THROWF(mismatch_error, 0,
"can't connect to %s:%d, no process listen on this port",
host, port);
}
/* Ensure that the listener is expecting the kind of stuff we want to send */
if (pr->meas && !sock->meas) {
- THROW2(mismatch_error, 0,
+ THROWF(mismatch_error, 0,
"can't connect to %s:%d in regular mode, the process listen "
"in measurement mode on this port", host,
port);
}
if (!pr->meas && sock->meas) {
- THROW2(mismatch_error, 0,
+ THROWF(mismatch_error, 0,
"can't connect to %s:%d in measurement mode, the process listen "
"in regular mode on this port", host,
port);
}
/* create simulation data of the socket */
- data = xbt_new(s_gras_trp_sg_sock_data_t, 1);
+ data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
data->client = SIMIX_process_self();
data->server = pr->server;
data->server_port = port;
+ data->client_port = gras_os_myport();
/* initialize synchronization stuff on the socket */
data->rdv_server = pr->rdv;
- data->rdv_client = SIMIX_rdv_create(NULL);
- data->comm_recv = SIMIX_network_irecv(data->rdv_client, NULL, 0);
+ data->rdv_client = simcall_rdv_create(NULL);
+ data->comm_recv = simcall_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL);
/* connect that simulation data to the 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", host,
- port);
+ XBT_DEBUG("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
+ simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ sock->meas ? "meas" : "regular", host, port,
+ data->rdv_server,data->rdv_client,data->comm_recv);
}
void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t sock)
{
gras_hostdata_t *hd =
- (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+ (gras_hostdata_t *) SIMIX_host_self_get_data();
gras_sg_portrec_t pr;
gras_trp_sg_sock_data_t data;
- xbt_assert0(hd, "Please run gras_process_init on each process");
+ xbt_assert(hd, "Please run gras_process_init on each process");
sock->accepting = 1;
pr = find_port(hd, port);
if (pr)
- THROW2(mismatch_error, 0,
+ THROWF(mismatch_error, 0,
"can't listen on address %s:%d: port already in use.",
- SIMIX_host_get_name(SIMIX_host_self()), port);
+ SIMIX_host_self_get_name(), port);
/* This port is free, let's take it */
pr = xbt_new(s_gras_sg_portrec_t, 1);
pr->port = port;
pr->meas = sock->meas;
pr->server = SIMIX_process_self();
- pr->rdv = SIMIX_rdv_create(NULL);
xbt_dynar_push(hd->ports, &pr);
+ pr->rdv = simcall_rdv_create(NULL);
/* Create the socket */
- data = xbt_new(s_gras_trp_sg_sock_data_t, 1);
+ data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
data->server = SIMIX_process_self();
data->server_port = port;
data->client = NULL;
data->rdv_server = pr->rdv;
data->rdv_client = NULL;
- data->comm_recv = SIMIX_network_irecv(pr->rdv, NULL, 0);
+ data->comm_recv = simcall_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
sock->data = data;
- VERB10
+ XBT_VERB
("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p",
- SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
- SIMIX_host_get_name(SIMIX_host_self()), port,
+ simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ SIMIX_host_self_get_name(), port,
sock->meas ? " (mode meas)" : "", sock, data,
(data->server ==
SIMIX_process_self())? data->rdv_server : data->rdv_client,
void gras_trp_sg_socket_close(gras_socket_t sock)
{
gras_hostdata_t *hd =
- (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+ (gras_hostdata_t *) SIMIX_host_self_get_data();
unsigned int cpt;
gras_sg_portrec_t pr;
- XBT_IN1(" (sock=%p)", sock);
+ XBT_IN(" (sock=%p)", sock);
if (!sock)
return;
- xbt_assert0(hd, "Please run gras_process_init on each process");
+ xbt_assert(hd, "Please run gras_process_init on each process");
gras_trp_sg_sock_data_t sockdata = sock->data;
if (sock->incoming && !sock->outgoing && sockdata->server_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));
+ XBT_DEBUG("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports));
if (pr->port == sockdata->server_port) {
xbt_dynar_cursor_rm(hd->ports, &cpt);
- XBT_OUT;
+ XBT_OUT();
return;
}
}
- WARN2
+ XBT_WARN
("socket_close called on the unknown incoming socket %p (port=%d)",
sock, sockdata->server_port);
}
- if (sock->data) {
- /* FIXME: kill the rdv point if receiver side */
- free(sock->data);
- }
- XBT_OUT;
+ /* FIXME: kill the rdv point if receiver side */
+ free(sock->data);
+ XBT_OUT();
}
typedef struct {
gras_trp_procdata_t trp_remote_proc;
gras_msg_procdata_t msg_remote_proc;
gras_msg_t msg; /* message to send */
-#endif
- gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
- xbt_assert0(sock->meas,
+ //gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
+ xbt_assert(sock->meas,
"SG chunk exchange shouldn't be used on non-measurement sockets");
/* creates simix action and waits its ends, waits in the sender host
condition */
+ /*
if (XBT_LOG_ISENABLED(gras_trp_sg, xbt_log_priority_debug)) {
smx_process_t remote_dude =
(sock_data->server ==
SIMIX_process_self())? (sock_data->client) : (sock_data->server);
- smx_host_t remote_host = SIMIX_process_get_host(remote_dude);
+ smx_host_t remote_host = simcall_process_get_host(remote_dude);
}
+ */
//SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL);
+#endif
THROW_UNIMPLEMENTED;
}
//gras_trp_sg_sock_data_t *sock_data =
// (gras_trp_sg_sock_data_t *) sock->data;
- //SIMIX_network_recv(sock_data->rdv,-1,NULL,0,NULL);
+ //simcall_comm_recv(sock_data->rdv,-1,NULL,0,NULL);
THROW_UNIMPLEMENTED;
#ifdef KILLME
gras_trp_sg_sock_data_t *remote_sock_data;
gras_trp_procdata_t trp_proc =
(gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
- xbt_assert0(sock->meas,
+ xbt_assert(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");
+ THROWF(timeout_error, 0, "Timeout");
}
remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data;
sock_data = (gras_trp_sg_sock_data_t *) sock->data;
/* ok, I'm here, you can continue the communication */
- SIMIX_cond_signal(remote_sock_data->cond);
+ simcall_cond_signal(remote_sock_data->cond);
- SIMIX_mutex_lock(remote_sock_data->mutex);
+ simcall_mutex_lock(remote_sock_data->mutex);
/* wait for communication end */
- SIMIX_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
+ simcall_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
if (msg_got->payl_size != size)
- THROW5(mismatch_error, 0,
+ THROWF(mismatch_error, 0,
"Got %d bytes when %ld where expected (in %s->%s:%d)",
msg_got->payl_size, size,
- SIMIX_host_get_name(sock_data->to_host),
- SIMIX_host_get_name(SIMIX_host_self()), sock->peer_port);
+ simcall_host_get_name(sock_data->to_host),
+ SIMIX_host_self_get_name(), sock->peer_port);
if (data)
memcpy(data, msg_got->payl, size);
- if (msg_got->payl)
- xbt_free(msg_got->payl);
+ xbt_free(msg_got->payl);
xbt_free(msg_got);
- SIMIX_mutex_unlock(remote_sock_data->mutex);
+ simcall_mutex_unlock(remote_sock_data->mutex);
#endif
return 0;
}
