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
Uncomment debug message.
[simgrid.git]
/
teshsuite
/
mc
/
random-bug
/
random-bug.cpp
diff --git
a/teshsuite/mc/random-bug/random-bug.cpp
b/teshsuite/mc/random-bug/random-bug.cpp
index
6f8463d
..
ca5b2fe
100644
(file)
--- a/
teshsuite/mc/random-bug/random-bug.cpp
+++ b/
teshsuite/mc/random-bug/random-bug.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-20
21
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-10,20
+10,23
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(random_bug, "For this example");
XBT_LOG_NEW_DEFAULT_CATEGORY(random_bug, "For this example");
-enum
{ ABORT, ASSERT, PRINTF } behavior
;
+enum
class Behavior { ABORT, ASSERT, PRINTF }
;
-/** An (fake) application with a bug occuring for some random values */
+Behavior behavior;
+
+/** A fake application with a bug occurring for some random values */
static void app()
{
int x = MC_random(0, 5);
int y = MC_random(0, 5);
static void app()
{
int x = MC_random(0, 5);
int y = MC_random(0, 5);
+ XBT_DEBUG("got %d %d", x, y);
- if (behavior == ASSERT) {
+ if (behavior ==
Behavior::
ASSERT) {
MC_assert(x != 3 || y != 4);
MC_assert(x != 3 || y != 4);
- } else if (behavior == PRINTF) {
+ } else if (behavior ==
Behavior::
PRINTF) {
if (x == 3 && y == 4)
XBT_ERROR("Error reached");
if (x == 3 && y == 4)
XBT_ERROR("Error reached");
- } else { // behavior == ABORT
+ } else { // behavior ==
Behavior::
ABORT
abort();
}
}
abort();
}
}
@@
-32,16
+35,19
@@
static void app()
int main(int argc, char* argv[])
{
simgrid::s4u::Engine e(&argc, argv);
int main(int argc, char* argv[])
{
simgrid::s4u::Engine e(&argc, argv);
- xbt_assert(argc == 3, "Usage: random-bug
raise|assert
<platformfile>");
+ xbt_assert(argc == 3, "Usage: random-bug
abort|assert|printf
<platformfile>");
if (strcmp(argv[1], "abort") == 0) {
XBT_INFO("Behavior: abort");
if (strcmp(argv[1], "abort") == 0) {
XBT_INFO("Behavior: abort");
- behavior = ABORT;
+ behavior =
Behavior::
ABORT;
} else if (strcmp(argv[1], "assert") == 0) {
XBT_INFO("Behavior: assert");
} else if (strcmp(argv[1], "assert") == 0) {
XBT_INFO("Behavior: assert");
- behavior = ASSERT;
+ behavior =
Behavior::
ASSERT;
} else if (strcmp(argv[1], "printf") == 0) {
XBT_INFO("Behavior: printf");
} else if (strcmp(argv[1], "printf") == 0) {
XBT_INFO("Behavior: printf");
- behavior = PRINTF;
+ behavior = Behavior::PRINTF;
+ } else {
+ xbt_die("Please use either 'abort', 'assert' or 'printf' as first parameter, to specify what to do when the error "
+ "is found.");
}
e.load_platform(argv[2]);
}
e.load_platform(argv[2]);