projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model/threads: add documentation comments
[model-checker.git]
/
common.cc
diff --git
a/common.cc
b/common.cc
index f8df1335b00cbe57001d4efacea2191134a4653c..b71c00ab804e5a7b1817790ac825791761b8f0d8 100644
(file)
--- a/
common.cc
+++ b/
common.cc
@@
-14,15
+14,15
@@
#define MAX_TRACE_LEN 100
#define MAX_TRACE_LEN 100
-FILE *model_out;
-int fd_user_out; /**< @brief File descriptor from which to read user program output */
+/** @brief Model-checker output stream; default to stdout until redirected */
+FILE *model_out = stdout;
#define CONFIG_STACKTRACE
/** Print a backtrace of the current program state. */
void print_trace(void)
{
#ifdef CONFIG_STACKTRACE
#define CONFIG_STACKTRACE
/** Print a backtrace of the current program state. */
void print_trace(void)
{
#ifdef CONFIG_STACKTRACE
- print_stacktrace(
std
out);
+ print_stacktrace(
model_
out);
#else
void *array[MAX_TRACE_LEN];
char **strings;
#else
void *array[MAX_TRACE_LEN];
char **strings;
@@
-47,7
+47,7
@@
void model_print_summary(void)
void assert_hook(void)
{
void assert_hook(void)
{
- model_print("Add breakpoint to line %u in file %s.\n",
__LINE__,
__FILE__);
+ model_print("Add breakpoint to line %u in file %s.\n",
__LINE__,
__FILE__);
}
void model_assert(bool expr, const char *file, int line)
}
void model_assert(bool expr, const char *file, int line)
@@
-60,6
+60,10
@@
void model_assert(bool expr, const char *file, int line)
}
}
}
}
+#ifndef CONFIG_DEBUG
+
+static int fd_user_out; /**< @brief File descriptor from which to read user program output */
+
/**
* @brief Setup output redirecting
*
/**
* @brief Setup output redirecting
*
@@
-161,3
+165,4
@@
void print_program_output()
}
}
}
}
}
}
+#endif /* ! CONFIG_DEBUG */