A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Remove MC_state_get_internal_request()
[simgrid.git]
/
src
/
mc
/
mc_request.cpp
diff --git
a/src/mc/mc_request.cpp
b/src/mc/mc_request.cpp
index
556e335
..
cc84403
100644
(file)
--- a/
src/mc/mc_request.cpp
+++ b/
src/mc/mc_request.cpp
@@
-10,6
+10,7
@@
#include <xbt/str.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
#include <xbt/str.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
+#include <xbt/swag.h>
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
@@
-106,7
+107,7
@@
bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
if (r1->call == SIMCALL_COMM_WAIT
&& (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
if (r1->call == SIMCALL_COMM_WAIT
&& (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
- && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc ==
NULL
))
+ && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc ==
nullptr
))
return false;
if (r1->call == SIMCALL_COMM_TEST &&
return false;
if (r1->call == SIMCALL_COMM_TEST &&
@@
-133,7
+134,7
@@
bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
return true;
}
return true;
}
-// Those are
MC_state_get_internal_request(state)
+// Those are
internal_req
bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
{
if (r1->issuer == r2->issuer)
bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
{
if (r1->issuer == r2->issuer)
@@
-313,7
+314,7
@@
std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
act = remote_act;
char* p;
act = remote_act;
char* p;
- if (act->comm.src_proc == nullptr || act->comm.dst_proc ==
NULL
) {
+ if (act->comm.src_proc == nullptr || act->comm.dst_proc ==
nullptr
) {
type = "Test FALSE";
p = pointer_to_string(remote_act);
args = bprintf("comm=%s", p);
type = "Test FALSE";
p = pointer_to_string(remote_act);
args = bprintf("comm=%s", p);
@@
-481,17
+482,16
@@
static inline const char* get_color(int id)
return colors[id % (sizeof(colors) / sizeof(colors[0])) ];
}
return colors[id % (sizeof(colors) / sizeof(colors[0])) ];
}
-
char *
request_get_dot_output(smx_simcall_t req, int value)
+
std::string
request_get_dot_output(smx_simcall_t req, int value)
{
{
-
char *label = nullptr
;
+
std::string label
;
const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
if (issuer->host)
const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
switch (req->call) {
case SIMCALL_COMM_ISEND:
if (issuer->host)
- label =
- bprintf("[(%lu)%s] iSend", issuer->pid,
+ label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] iSend", issuer->pid);
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] iSend", issuer->pid);
@@
-499,21
+499,19
@@
char *request_get_dot_output(smx_simcall_t req, int value)
case SIMCALL_COMM_IRECV:
if (issuer->host)
case SIMCALL_COMM_IRECV:
if (issuer->host)
- label =
- bprintf("[(%lu)%s] iRecv", issuer->pid,
+ label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
MC_smx_process_get_host_name(issuer));
else
- label =
b
printf("[(%lu)] iRecv", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] iRecv", issuer->pid);
break;
case SIMCALL_COMM_WAIT: {
if (value == -1) {
if (issuer->host)
break;
case SIMCALL_COMM_WAIT: {
if (value == -1) {
if (issuer->host)
- label =
- bprintf("[(%lu)%s] WaitTimeout", issuer->pid,
+ label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
MC_smx_process_get_host_name(issuer));
else
- label =
b
printf("[(%lu)] WaitTimeout", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] WaitTimeout", issuer->pid);
} else {
smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
s_smx_synchro_t synchro;
} else {
smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
s_smx_synchro_t synchro;
@@
-523,14
+521,14
@@
char *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->host)
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->host)
- label =
-
bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]",
+
issuer->pid,
MC_smx_process_get_host_name(issuer),
src_proc ? src_proc->pid : 0,
dst_proc ? dst_proc->pid : 0);
else
MC_smx_process_get_host_name(issuer),
src_proc ? src_proc->pid : 0,
dst_proc ? dst_proc->pid : 0);
else
- label =
-
bprintf("[(%lu)] Wait [(%lu)->(%lu)]",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)] Wait [(%lu)->(%lu)]",
+
issuer->pid,
src_proc ? src_proc->pid : 0,
dst_proc ? dst_proc->pid : 0);
}
src_proc ? src_proc->pid : 0,
dst_proc ? dst_proc->pid : 0);
}
@@
-542,20
+540,19
@@
char *request_get_dot_output(smx_simcall_t req, int value)
s_smx_synchro_t synchro;
mc_model_checker->process().read_bytes(&synchro,
sizeof(synchro), remote(remote_act));
s_smx_synchro_t synchro;
mc_model_checker->process().read_bytes(&synchro,
sizeof(synchro), remote(remote_act));
- if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc ==
NULL
) {
+ if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc ==
nullptr
) {
if (issuer->host)
if (issuer->host)
- label =
-
bprintf("[(%lu)%s] Test FALSE",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)%s] Test FALSE",
+
issuer->pid,
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test FALSE", issuer->pid);
} else {
if (issuer->host)
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test FALSE", issuer->pid);
} else {
if (issuer->host)
- label =
- bprintf("[(%lu)%s] Test TRUE", issuer->pid,
+ label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
MC_smx_process_get_host_name(issuer));
else
- label =
b
printf("[(%lu)] Test TRUE", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] Test TRUE", issuer->pid);
}
break;
}
}
break;
}
@@
-564,54
+561,51
@@
char *request_get_dot_output(smx_simcall_t req, int value)
unsigned long comms_size = read_length(
mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req)));
if (issuer->host)
unsigned long comms_size = read_length(
mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req)));
if (issuer->host)
- label =
-
bprintf("[(%lu)%s] WaitAny [%d of %lu]",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]",
+
issuer->pid,
MC_smx_process_get_host_name(issuer), value + 1,
comms_size);
else
MC_smx_process_get_host_name(issuer), value + 1,
comms_size);
else
- label =
- bprintf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1,
- comms_size);
+ label = simgrid::xbt::string_printf("[(%lu)] WaitAny [%d of %lu]",
+ issuer->pid, value + 1, comms_size);
break;
}
case SIMCALL_COMM_TESTANY:
if (value == -1) {
if (issuer->host)
break;
}
case SIMCALL_COMM_TESTANY:
if (value == -1) {
if (issuer->host)
- label =
- bprintf("[(%lu)%s] TestAny FALSE", issuer->pid,
- MC_smx_process_get_host_name(issuer));
+ label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE",
+ issuer->pid, MC_smx_process_get_host_name(issuer));
else
else
- label =
b
printf("[(%lu)] TestAny FALSE", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] TestAny FALSE", issuer->pid);
} else {
if (issuer->host)
} else {
if (issuer->host)
- label =
-
bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]",
+
issuer->pid,
MC_smx_process_get_host_name(issuer), value + 1,
xbt_dynar_length(simcall_comm_testany__get__comms(req)));
else
MC_smx_process_get_host_name(issuer), value + 1,
xbt_dynar_length(simcall_comm_testany__get__comms(req)));
else
- label =
-
bprintf("[(%lu)] TestAny TRUE [%d of %lu]",
issuer->pid,
+ label =
simgrid::xbt::string_printf("[(%lu)] TestAny TRUE [%d of %lu]",
+
issuer->pid,
value + 1,
xbt_dynar_length(simcall_comm_testany__get__comms(req)));
}
break;
case SIMCALL_MUTEX_TRYLOCK:
value + 1,
xbt_dynar_length(simcall_comm_testany__get__comms(req)));
}
break;
case SIMCALL_MUTEX_TRYLOCK:
- label =
b
printf("[(%lu)] Mutex TRYLOCK", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] Mutex TRYLOCK", issuer->pid);
break;
case SIMCALL_MUTEX_LOCK:
break;
case SIMCALL_MUTEX_LOCK:
- label =
b
printf("[(%lu)] Mutex LOCK", issuer->pid);
+ label =
simgrid::xbt::string_
printf("[(%lu)] Mutex LOCK", issuer->pid);
break;
case SIMCALL_MC_RANDOM:
if (issuer->host)
break;
case SIMCALL_MC_RANDOM:
if (issuer->host)
- label =
- bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid,
- MC_smx_process_get_host_name(issuer), value);
+ label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)",
+ issuer->pid, MC_smx_process_get_host_name(issuer), value);
else
else
- label =
b
printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
+ label =
simgrid::xbt::string_
printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
break;
default:
break;
default:
@@
-619,12
+613,9
@@
char *request_get_dot_output(smx_simcall_t req, int value)
}
const char* color = get_color(issuer->pid - 1);
}
const char* color = get_color(issuer->pid - 1);
- char* str =
- bprintf("label = \"%s\", color = %s, fontcolor = %s", label,
- color, color);
- xbt_free(label);
- return str;
-
+ return simgrid::xbt::string_printf(
+ "label = \"%s\", color = %s, fontcolor = %s", label.c_str(),
+ color, color);
}
}
}
}