[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Fri, 14 Jul 2017 01:37:44 -0400 (EDT) |
branch: master
commit 13bbf8457da146ec640859577f3a45354430e226
Author: rpplx <address@hidden>
Date: Wed Jul 12 23:09:12 2017 +0200
Substituted traditional way of handling trace message (printing to
std::cout) with the mechanism base on feedback manager and feedback handlers.
Besides GMM_TRACE* macros add GMM_SIMPLE_TRACE* macros than in trace
messages do not include file name and line number.
---
src/gmm/gmm_except.h | 55 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 38 insertions(+), 17 deletions(-)
diff --git a/src/gmm/gmm_except.h b/src/gmm/gmm_except.h
index 5d94d2a..4536c4b 100644
--- a/src/gmm/gmm_except.h
+++ b/src/gmm/gmm_except.h
@@ -242,43 +242,64 @@ namespace gmm {
// 4 Susceptible to occur very often (>1000).
#define GMM_TRACE_MSG_MPI // for Parallelized version
-#define GMM_TRACE_MSG(level_, thestr) { \
- GMM_TRACE_MSG_MPI { \
- std::stringstream msg__; \
- msg__ << "Trace " << level_ << " in " << __FILE__ << ", line " \
- << __LINE__ << ": " << thestr; \
- std::cout << msg__.str() << std::endl; \
- } \
- }
+#define GMM_TRACE_MSG(level_, thestr) {
\
+ GMM_TRACE_MSG_MPI {
\
+ std::stringstream msg__;
\
+ msg__ << "Trace " << level_ << " in " << __FILE__ << ", line "
\
+ << __LINE__ << ": " << thestr;
\
+ gmm::feedback_manager::send(msg__.str(), gmm::FeedbackType::TRACE,
level_); \
+ }
\
+}
+
+#define GMM_TRACE_SIMPLE_MSG(level_, thestr) { \
+ GMM_TRACE_MSG_MPI { \
+ std::stringstream msg__; \
+ msg__ << "Trace " << level_ << ": " << thestr; \
+ gmm::feedback_manager::send(msg__.str(), gmm::FeedbackType::TRACE, level_); \
+ } \
+}
#define GMM_TRACE0(thestr) GMM_TRACE_MSG(0, thestr)
+#define GMM_SIMPLE_TRACE0(thestr) GMM_TRACE_MSG_SIMPLE(0, thestr)
#if GMM_TRACES_LEVEL > 0
-# define GMM_TRACE1(thestr) \
- { if (1 <= gmm::traces_level::level()) GMM_TRACE_MSG(1, thestr) }
+# define GMM_TRACE1(thestr)
\
+ { if (1 <= gmm::feedback_manager::traces_level()) GMM_TRACE_MSG(1, thestr) }
+# define GMM_SIMPLE_TRACE1(thestr)
\
+ { if (1 <= gmm::feedback_manager::traces_level()) GMM_TRACE_SIMPLE_MSG(1,
thestr) }
#else
# define GMM_TRACE1(thestr) {}
+# define GMM_SIMPLE_TRACE1(thestr) {}
#endif
-
+
#if GMM_TRACES_LEVEL > 1
-# define GMM_TRACE2(thestr) \
- { if (2 <= gmm::traces_level::level()) GMM_TRACE_MSG(2, thestr) }
+# define GMM_TRACE2(thestr)
\
+ { if (2 <= gmm::feedback_manager::traces_level()) GMM_TRACE_MSG(2, thestr) }
+# define GMM_SIMPLE_TRACE2(thestr)
\
+ { if (2 <= gmm::feedback_manager::traces_level()) GMM_TRACE_SIMPLE_MSG(2,
thestr) }
#else
# define GMM_TRACE2(thestr) {}
+# define GMM_SIMPLE_TRACE2(thestr) {}
#endif
#if GMM_TRACES_LEVEL > 2
-# define GMM_TRACE3(thestr) \
- { if (3 <= gmm::traces_level::level()) GMM_TRACE_MSG(3, thestr) }
+# define GMM_TRACE3(thestr)
\
+ { if (3 <= gmm::feedback_manager::traces_level()) GMM_TRACE_MSG(3, thestr) }
+# define GMM_SIMPLE_TRACE3(thestr)
\
+ { if (3 <= gmm::feedback_manager::traces_level()) GMM_TRACE_SIMPLE_MSG(3,
thestr) }
#else
# define GMM_TRACE3(thestr) {}
+# define GMM_SIMPLE_TRACE3(thestr) {}
#endif
#if GMM_TRACES_LEVEL > 3
-# define GMM_TRACE4(thestr) \
- { if (4 <= gmm::traces_level::level()) GMM_TRACE_MSG(4, thestr) }
+# define GMM_TRACE4(thestr)
\
+ { if (4 <= gmm::feedback_manager::traces_level()) GMM_TRACE_MSG(4, thestr) }
+# define GMM_SIMPLE_TRACE4(thestr)
\
+ { if (4 <= gmm::feedback_manager::traces_level()) GMM_TRACE_SIMPLE_MSG(4,
thestr) }
#else
# define GMM_TRACE4(thestr) {}
+# define GMM_SIMPLE_TRACE4(thestr) {}
#endif
- [Getfem-commits] (no subject), (continued)
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject),
Yves Renard <=
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14
- [Getfem-commits] (no subject), Yves Renard, 2017/07/14