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 const char* gras_trp_sg_peer_name(gras_socket_t s) {
gras_trp_sg_sock_data_t sockdata = s->data;
if (gras_socket_im_the_server(s))
- return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->client));
+ return SIMIX_host_get_name(simcall_process_get_host(sockdata->client));
else {
- return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->server));
+ return SIMIX_host_get_name(simcall_process_get_host(sockdata->server));
}
}
static const char* gras_trp_sg_peer_proc(gras_socket_t s) {
gras_sg_portrec_t pr;
/* make sure this socket will reach someone */
- if (!(peer = SIMIX_req_host_get_by_name(host)))
+ 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_req_host_get_data(peer)))
+ 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);
/* initialize synchronization stuff on the socket */
data->rdv_server = pr->rdv;
- data->rdv_client = SIMIX_req_rdv_create(NULL);
- data->comm_recv = SIMIX_req_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL);
+ 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;
XBT_DEBUG("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
- SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ 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);
}
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->meas = sock->meas;
pr->server = SIMIX_process_self();
xbt_dynar_push(hd->ports, &pr);
- pr->rdv = SIMIX_req_rdv_create(NULL);
+ pr->rdv = simcall_rdv_create(NULL);
/* Create the socket */
data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
data->client = NULL;
data->rdv_server = pr->rdv;
data->rdv_client = NULL;
- data->comm_recv = SIMIX_req_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
+ data->comm_recv = simcall_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
sock->data = data;
XBT_VERB
("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p",
- SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+ simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(),
SIMIX_host_self_get_name(), port,
sock->meas ? " (mode meas)" : "", sock, data,
(data->server ==
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;
("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);
- }
+ /* FIXME: kill the rdv point if receiver side */
+ free(sock->data);
XBT_OUT();
}
gras_msg_t msg; /* message to send */
//gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
- xbt_assert0(sock->meas,
+ xbt_assert(sock->meas,
"SG chunk exchange shouldn't be used on non-measurement sockets");
smx_process_t remote_dude =
(sock_data->server ==
SIMIX_process_self())? (sock_data->client) : (sock_data->server);
- smx_host_t remote_host = SIMIX_req_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);
//gras_trp_sg_sock_data_t *sock_data =
// (gras_trp_sg_sock_data_t *) sock->data;
- //SIMIX_req_comm_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);
sock_data = (gras_trp_sg_sock_data_t *) sock->data;
/* ok, I'm here, you can continue the communication */
- SIMIX_req_cond_signal(remote_sock_data->cond);
+ simcall_cond_signal(remote_sock_data->cond);
- SIMIX_req_mutex_lock(remote_sock_data->mutex);
+ simcall_mutex_lock(remote_sock_data->mutex);
/* wait for communication end */
- SIMIX_req_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)
THROWF(mismatch_error, 0,
"Got %d bytes when %ld where expected (in %s->%s:%d)",
msg_got->payl_size, size,
- SIMIX_req_host_get_name(sock_data->to_host),
+ 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_req_mutex_unlock(remote_sock_data->mutex);
+ simcall_mutex_unlock(remote_sock_data->mutex);
#endif
return 0;
}