From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 22 Feb 2011 22:57:15 +0000 (+0100)
Subject: Improve output alignment.
X-Git-Tag: v0.1~117
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/26173071a8897d8cd839d6a354816bad7d671547

Improve output alignment.
---

diff --git a/main.cpp b/main.cpp
index 7af6b74..ff1fa1b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,6 +26,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "tracing.h"
 #include "version.h"
 
+#define DATA_DESCR_WIDTH 37
+
 namespace {
     // Failure exit status
     enum {
@@ -130,8 +132,8 @@ static void check_for_lost_load()
 }
 
 #define PR_STATS(descr, st)                                             \
-    XBT_INFO("| %.*s: %g / %g / %g", 39,                                \
-             descr " total/avg./stddev. at exit.........................", \
+    XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
+             descr " (total/avg./stddev)................................", \
              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])
@@ -255,17 +257,19 @@ int main(int argc, char* argv[])
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
-        PR_STATS("Data send", data_send_amount);
-        PR_STATS("Data recv", data_recv_amount);
-        PR_STATS("Data send #", data_send_count);
-        PR_STATS("Data recv #", data_recv_count);
-        PR_STATS("Ctrl send", ctrl_send_amount);
-        PR_STATS("Ctrl recv", ctrl_recv_amount);
-        PR_STATS("Ctrl send #", ctrl_send_count);
-        PR_STATS("Ctrl recv #", ctrl_recv_count);
-        XBT_INFO("| Total simulated time...................: %g",
+        PR_STATS("Data send amount", data_send_amount);
+        PR_STATS("Data recv amount", data_recv_amount);
+        PR_STATS("Data send count", data_send_count);
+        PR_STATS("Data recv count", data_recv_count);
+        PR_STATS("Ctrl send amount", ctrl_send_amount);
+        PR_STATS("Ctrl recv amount", ctrl_recv_amount);
+        PR_STATS("Ctrl send count", ctrl_send_count);
+        PR_STATS("Ctrl recv count", ctrl_recv_count);
+        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+                 "Total simulated time..................................",
                  simulated_time);
-        XBT_INFO("| Total simulation time..................: %g",
+        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
+                 "Total simulation time.................................",
                  simulation_time.duration());
         XBT_INFO("`----");
     }
diff --git a/options.cpp b/options.cpp
index e9aa9b0..0d269d6 100644
--- a/options.cpp
+++ b/options.cpp
@@ -16,6 +16,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "options.h"
 
+#define DATA_DESCR_WIDTH 42
+
 namespace opt {
 
     // Constants
@@ -135,10 +137,9 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
-    const int descr_width = 40;
     std::string& res = descr_str;
     res = str;
-    res.resize(descr_width, '.');
+    res.resize(DATA_DESCR_WIDTH, '.');
     return res.c_str();
 }