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)
/* make sure this socket will reach someone */
if (!(peer = SIMIX_req_host_get_by_name(host)))
- THROW1(mismatch_error, 0,
+ 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)))
- THROW1(mismatch_error, 0,
+ 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);
sock->data = data;
sock->incoming = 1;
- DEBUG8("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
+ 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(),
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 = 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_self_get_name(), port);
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_req_process_get_name(SIMIX_process_self()), gras_os_getpid(),
SIMIX_host_self_get_name(), port,
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_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");
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;
SIMIX_req_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_req_host_get_name(sock_data->to_host),
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);