From e83c4322d00571841dd76ad4f71d32aa0019d549 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Sat, 25 Jul 2015 10:45:42 +0200 Subject: [PATCH] s/smx_host/host/ because of API change --- src/mc/mc_request.cpp | 28 ++++++++++++++-------------- src/mc/mc_smx.cpp | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 5e03b8572d..2c9dd02d07 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -257,7 +257,7 @@ char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t req type = "iSend"; char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req)); char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req)); - if (issuer->smx_host) + if (issuer->host) args = bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_process_get_host_name(issuer), @@ -284,7 +284,7 @@ char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t req type = "iRecv"; char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req)); char* bs = buff_size_to_string(size); - if (issuer->smx_host) + if (issuer->host) args = bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid, MC_smx_process_get_host_name(issuer), @@ -541,7 +541,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) switch (req->call) { case SIMCALL_COMM_ISEND: - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] iSend", issuer->pid, MC_smx_process_get_host_name(issuer)); @@ -550,7 +550,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) break; case SIMCALL_COMM_IRECV: - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] iRecv", issuer->pid, MC_smx_process_get_host_name(issuer)); @@ -560,7 +560,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_WAIT: { if (value == -1) { - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] WaitTimeout", issuer->pid, MC_smx_process_get_host_name(issuer)); @@ -574,7 +574,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc); smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc); - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid, MC_smx_process_get_host_name(issuer), @@ -595,14 +595,14 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) mc_model_checker->process().read_bytes(&synchro, sizeof(synchro), remote(remote_act)); if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) { - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] Test FALSE", issuer->pid, MC_smx_process_get_host_name(issuer)); else label = bprintf("[(%lu)] Test FALSE", issuer->pid); } else { - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] Test TRUE", issuer->pid, MC_smx_process_get_host_name(issuer)); @@ -615,7 +615,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_WAITANY: { unsigned long comms_size = read_length( mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req))); - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid, MC_smx_process_get_host_name(issuer), value + 1, @@ -629,14 +629,14 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_TESTANY: if (value == -1) { - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] TestAny FALSE", issuer->pid, MC_smx_process_get_host_name(issuer)); else label = bprintf("[(%lu)] TestAny FALSE", issuer->pid); } else { - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid, MC_smx_process_get_host_name(issuer), value + 1, @@ -654,7 +654,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) break; case SIMCALL_MC_RANDOM: - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, MC_smx_process_get_host_name(issuer), value); @@ -663,7 +663,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) break; case SIMCALL_MC_SNAPSHOT: - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid, MC_smx_process_get_host_name(issuer)); @@ -672,7 +672,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value) break; case SIMCALL_MC_COMPARE_SNAPSHOTS: - if (issuer->smx_host) + if (issuer->host) label = bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid, MC_smx_process_get_host_name(issuer)); diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 805d655e5c..643726e64d 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -176,7 +176,7 @@ mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_a const char* MC_smx_process_get_host_name(smx_process_t p) { if (mc_mode == MC_MODE_CLIENT) - return SIMIX_host_get_name(p->smx_host); + return SIMIX_host_get_name(p->host); simgrid::mc::Process* process = &mc_model_checker->process(); @@ -188,7 +188,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p) if (!info->hostname) { // Read the hostname from the MCed process: - process->read_bytes(&host_copy, sizeof(host_copy), remote(p->smx_host)); + process->read_bytes(&host_copy, sizeof(host_copy), remote(p->host)); int len = host_copy.key_len + 1; char hostname[len]; process->read_bytes(hostname, len, remote(host_copy.key)); -- 2.20.1