Changeset 16737

Timestamp:

06/05/13 22:15:43 (12 years ago)

Author:

tbretz

Message:

Implement a way to check if the (Log) Message Queue is empty. Only then the Boot message of the ReadlineColor (MCP) is printed... just cosmetics for startup.

Location:

trunk/FACT++/src

Files:

• Main.h (modified) (2 diffs)
• MessageDim.h (modified) (1 diff)
• MessageImp.h (modified) (1 diff)
• StateMachineDim.h (modified) (1 diff)

trunk/FACT++/src/Main.h

@@ -200 +200 @@
         // Hopefully checking the readline (see Threed) should fix
         // that -- difficult to test.)
-        while (io_service.GetCurrentState()<StateMachineImp::kSM_Ready && !shell.IsStopped())
+        while ((io_service.GetCurrentState()<StateMachineImp::kSM_Ready ||
+                !io_service.MessageQueueEmpty()) && !shell.IsStopped())
             usleep(1);
 
@@ -212 +213 @@
             shell.Execute(*it, args);
 
+        cout << "==============="<< endl;
+
         // Run the shell if no immediate exit was requested
         if (!conf.Get<bool>("quit"))

trunk/FACT++/src/MessageDim.h

@@ -23 +23 @@
 
     void SetDebug(bool b=true) { fDebug=b; }
+
+    bool MessageQueueEmpty() const { return fMsgQueue.empty(); }
 };
 

trunk/FACT++/src/MessageImp.h

@@ -69 +69 @@
     std::ostream &operator()() const { return fOut; }
     std::ostream &Out() const { return fOut; }
+
+    virtual bool MessageQueueEmpty() const { return true; }
 };
 

trunk/FACT++/src/StateMachineDim.h

@@ -100 +100 @@
 
     bool AddStateName(const int state, const std::string &name, const std::string &doc="");
+
+    bool MessageQueueEmpty() const { return DimLog::fLog.MessageQueueEmpty(); }
 };