projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Python agent event name to omit "user"
[lttng-tools.git]
/
src
/
common
/
error.h
diff --git
a/src/common/error.h
b/src/common/error.h
index 1b000ab7a58759bcf62422368d4d05474454ef95..1ee6e675a5b752eb600c0e2f4d19dc2891fcd6e7 100644
(file)
--- a/
src/common/error.h
+++ b/
src/common/error.h
@@
-49,6
+49,7
@@
extern DECLARE_URCU_TLS(struct log_time, error_log_time);
extern int lttng_opt_quiet;
extern int lttng_opt_verbose;
extern int lttng_opt_quiet;
extern int lttng_opt_verbose;
+extern int lttng_opt_mi;
/* Error type. */
#define PRINT_ERR 0x1
/* Error type. */
#define PRINT_ERR 0x1
@@
-61,12
+62,18
@@
extern int lttng_opt_verbose;
/*
* Macro for printing message depending on command line option and verbosity.
/*
* Macro for printing message depending on command line option and verbosity.
+ *
+ * Machine interface:
+ * We use lttng_opt_mi to suppress all normal msg to stdout. We don't
+ * want any nested msg to show up when printing mi to stdout(if it's the case).
+ * All warnings and errors should be printed to stderr as normal.
*/
#define __lttng_print(type, fmt, args...) \
do { \
*/
#define __lttng_print(type, fmt, args...) \
do { \
- if (lttng_opt_quiet == 0 && type == PRINT_MSG) { \
+ if (lttng_opt_quiet == 0 && lttng_opt_mi == 0 && \
+ type == PRINT_MSG) { \
fprintf(stdout, fmt, ## args); \
fprintf(stdout, fmt, ## args); \
- } else if (lttng_opt_quiet == 0 &&
\
+ } else if (lttng_opt_quiet == 0 &&
lttng_opt_mi == 0 &&
\
(((type & PRINT_DBG) && lttng_opt_verbose == 1) || \
((type & (PRINT_DBG | PRINT_DBG2)) && \
lttng_opt_verbose == 2) || \
(((type & PRINT_DBG) && lttng_opt_verbose == 1) || \
((type & (PRINT_DBG | PRINT_DBG2)) && \
lttng_opt_verbose == 2) || \
@@
-90,9
+97,9
@@
extern int lttng_opt_verbose;
#define _MSG(fmt, args...) \
__lttng_print(PRINT_MSG, fmt, ## args)
#define ERR(fmt, args...) \
#define _MSG(fmt, args...) \
__lttng_print(PRINT_MSG, fmt, ## args)
#define ERR(fmt, args...) \
- _
ERRMSG("ERROR", PRINT_ERR, fmt
, ## args)
+ _
_lttng_print(PRINT_ERR, "Error: " fmt "\n"
, ## args)
#define WARN(fmt, args...) \
#define WARN(fmt, args...) \
- _
ERRMSG("WARN", PRINT_WARN, fmt
, ## args)
+ _
_lttng_print(PRINT_ERR, "Warning: " fmt "\n"
, ## args)
#define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
#define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
This page took
0.024292 seconds
and
4
git commands to generate.