Changeset 11580 for trunk

Timestamp:

07/24/11 22:34:29 (13 years ago)

Author:

tbretz

Message:

Added --null option to suppress the output more or less completely.

Location:

trunk/FACT++/src

Files:

• Console.h (modified) (1 diff)
• LocalControl.h (modified) (1 diff)
• Main.h (modified) (3 diffs)

trunk/FACT++/src/Console.h

@@ -12 +12 @@
 public:
     ConsoleStream(const char *name);
+
+    void SetNullOutput(bool null) { fLogO.SetNullOutput(null); }
 
     // I/O

trunk/FACT++/src/LocalControl.h

@@ -154 +154 @@
 {
 public:
-    LocalStream(const char *name, bool = false)
-        : LocalControl<ConsoleStream>(name) { }
+    LocalStream(const char *name, bool null = false)
+        : LocalControl<ConsoleStream>(name) { SetNullOutput(null); }
 };
 

trunk/FACT++/src/Main.h

@@ -20 +20 @@
             ("host",      var<string>(""),                "Address with which the Dim nameserver can connect to this host (overwites DIM_HOST_NODE environment variable)")
             ("log,l",     var<string>(n), "Write log-file")
+            ("null",      po_switch(),    "Suppresses almost all console output - including errors (only available without --console option)")
             ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
             ("cmd",       vars<string>(), "Execute one or more commands at startup")
@@ -47 +48 @@
         // -----------------------------------------------------------------
 
+        cout << conf.Has("console") << endl;
+        cout << conf.Has("null") << endl;
         static T shell(conf.GetName().c_str(),
-                   conf.Has("console") ? conf.Get<int>("console")!=1 : 0);
+                   conf.Has("console") ? conf.Get<int>("console")!=1 : conf.Get<bool>("null"));
 
         WindowLog &win  = shell.GetStreamIn();
         WindowLog &wout = shell.GetStreamOut();
 
+        // Switching off buffering is not strictly necessary, since
+        // the destructor of shell should flush everything still buffered,
+        // nevertheless it helps to debug problems in the initialization
+        // sequence.
         const bool backlog = wout.GetBacklog();
         const bool null    = wout.GetNullOutput();
-        wout.SetBacklog(false);
-        wout.SetNullOutput(false);
-        wout.Display(true);
+        if (conf.Has("console") || !conf.Get<bool>("null"))
+        {
+            wout.SetBacklog(false);
+            wout.SetNullOutput(false);
+            wout.Display(true);
+        }
 
         if (conf.Has("log"))
@@ -116 +126 @@
         io_service.Message("==================== Starting main loop =================");
 
-        wout.SetNullOutput(null);
-        wout.SetBacklog(backlog);
+        if (conf.Has("console") || !conf.Get<bool>("null"))
+        {
+            wout.SetNullOutput(null);
+            wout.SetBacklog(backlog);
+        }
 
         shell.SetReceiver(io_service);