Changeset 1727 for trunk/MagicSoft/Cosy/base

Timestamp:

01/23/03 13:32:58 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/base/msgqueue.cc (modified) (5 diffs)

trunk/MagicSoft/Cosy/base/msgqueue.cc

@@ -77 +77 @@
     while(1)
     {
-        while (!fStart) usleep(1);
+        while (!fStart)
+            usleep(1);
         fStart = 0;
 
@@ -88 +89 @@
         pthread_mutex_unlock(&fMuxMsg);
 
-        cout << "Processing Msg 0x" << hex << fMsg << endl;
+        cout << "MsgQueue::Thread: Processing Msg 0x" << hex << fMsg << endl;
         // --- bool quit = fMsg==WM_QUIT;
         fRc=Proc(fMsg, fMp);
-        cout << "Msg 0x" << hex << fMsg << " processed." << endl;
+        cout << "MsgQueue::PostMsg: Msg 0x" << hex << fMsg << " processed (rc=" << fRc << ")" << endl;
 
         // --- if (quit)
@@ -118 +119 @@
     // stopped and the messages are processed serialized
     //
-    cout << "Locking MsgQueue mutex..." << flush;
+    cout << "MsgQueue::PostMsg: Locking MsgQueue mutex..." << flush;
     pthread_mutex_lock(&fMuxMsg);
     cout << "done." << endl;
@@ -129 +130 @@
     // This is some kind of controlled user break without using signals
     //
+    /**** NEW 20/01/2003 ****/
+    if (fBreak)
+    {
+        pthread_mutex_unlock(&fMuxMsg);
+        cout << "------------> MsgQueue::PostMsg: Proc still pending... Message IGNORED." << endl;
+        return NULL;
+    }
+    /**** NEW 20/01/2003 ****/
+    cout << "MsgQueue::PostMsg: ---> Break <---" << endl;
     fBreak = 1;
 
@@ -146 +156 @@
     // Start Proc()
     //
+    cout << "MsgQueue::PostMsg: Releasing MsgQueue mutex..." << flush;
     fStart = 1;
-    cout << "Releasing MsgQueue mutex..." << flush;
     pthread_mutex_unlock(&fMuxMsg);
     cout << "done." << endl;
-    while (fStart)
-        usleep(1);
-
-    cout << "Returning rc = 0x" << hex << rc << endl;
+
+    /*
+     * **** NEW 20/01/2003 ***
+     *
+     * This can halt the main thread, because it is waiting until
+     * Proc has finished its execution which can take a while
+     *
+     * A side effect is, because you don't wait for the end of
+     * the execution of Proc, if a new message is posted fBreak
+     * and fStart is set again, new values are copied to fMsg and
+     * fMp (FIXME? Harmefull?) and the message is not processed at all.
+     */
+    //while (fStart)
+    //    usleep(1);
+ 
+    cout << "MsgQueue::PostMsg: Returning rc = " << hex << rc << endl;
     return rc;
 }
-
+/*
+Start positioning.
+MsgQueue::PostMsg: Locking MsgQueue mutex...done.
+MsgQueue::PostMsg: ---> Break <---
++++++ MsgQueue::PostMsg: Releasing MsgQueue mutex...done.
+
+===== MsgQueue::PostMsg: Returning rc = (nil)
+PostMsg (WM_Position) returned.
+done.
+Stopping movement...Movement stopped.
+WM_Position: done. (return 0x7777)
+MsgQueue::PostMsg: Msg 0x1001 processed (rc=0x7777)
+MsgQueue::Thread: Processing Msg 0x1001
+WM_Position: start.
+Positioning to Target...
+ */
+/*
+Start positioning.
+MsgQueue::PostMsg: Locking MsgQueue mutex...done.
+MsgQueue::PostMsg: ---> Break <---
++++++ MsgQueue::PostMsg: Releasing MsgQueue mutex...done.
+
+done.
+Stopping movement...Movement stopped.
+WM_Position: done. (return 0x7777)
+MsgQueue::PostMsg: Msg 0x1001 processed (rc=0x7777)
+MsgQueue::Thread: Processing Msg 0x1001
+WM_Position: start.
+Positioning to Target...
+===== MsgQueue::PostMsg: Returning rc = (nil)
+*/