Changeset 1953 for trunk/MagicSoft/Cosy/base

Timestamp:

04/12/03 19:06:27 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• MThread.cc (modified) (6 diffs)
• msgqueue.cc (modified) (7 diffs)

trunk/MagicSoft/Cosy/base/MThread.cc

@@ -5 +5 @@
 #include <pthread.h>
 #include <sys/resource.h>  // PRIO_PROCESS
+
+#undef DEBUG
 
 // ----------------------------------------------------------------------
@@ -14 +16 @@
 MThread::MThread(bool start, int prio) : fIsRunning(false), fIsDetached(false), fThread(NULL), fReturn(NULL)
 {
+#ifdef DEBUG
+    cout << "MThread::MThread" << endl;
+#endif
     if (!start)
         return;
@@ -29 +34 @@
 MThread::~MThread()
 {
+#ifdef DEBUG
     cout << "~MThread::MThread" << endl;
+#endif
     Stop();
 }
@@ -122 +129 @@
 void MThread::Stop()
 {
+#ifdef DEBUG
     cout << "MThread::Stop: fThread=" << fThread << ", fIsRunning=" << (int)fIsRunning << endl;
+#endif
+
     if (!fThread || !fIsRunning)
         return;
@@ -128 +138 @@
     if (fIsDetached)
     {
+#ifdef DEBUG
         cout << "Stopping detached thread..." << flush;
+#endif
         pthread_cancel(*fThread);
         fIsRunning = false;
@@ -134 +146 @@
     else
     {
+#ifdef DEBUG
         cout << "Stopping thread..." << flush;
+#endif
         fStop = true;
         pthread_join(*fThread, &fReturn);
     }
+#ifdef DEBUG
     cout << "done." << endl;
+#endif
 
     delete fThread;
     fThread = NULL;
 
+#ifdef DEBUG
     cout << "MThread::Stop() done." << endl;
+#endif
 }

trunk/MagicSoft/Cosy/base/msgqueue.cc

@@ -6 +6 @@
 #include <sys/resource.h>  // PRIO_PROCESS
 
+#undef DEBUG
+
 // --------------------------------------------------------------------------
 //
@@ -22 +24 @@
 MsgQueue::~MsgQueue()
 {
+#ifdef DEBUG
     cout << "~MsgQueue::MsgQueue" << endl;
+#endif
     pthread_cancel(fThread);
     delete (unsigned char*)fMp;
@@ -89 +93 @@
         pthread_mutex_unlock(&fMuxMsg);
 
+#ifdef DEBUG
         cout << "MsgQueue::Thread: Processing Msg 0x" << hex << fMsg << endl;
+#endif
         // --- bool quit = fMsg==WM_QUIT;
         fRc=Proc(fMsg, fMp);
+#ifdef DEBUG
         cout << "MsgQueue::PostMsg: Msg 0x" << hex << fMsg << " processed (rc=" << fRc << ")" << endl;
+#endif
 
         // --- if (quit)
@@ -119 +127 @@
     // stopped and the messages are processed serialized
     //
+#ifdef DEBUG
     cout << "MsgQueue::PostMsg: Locking MsgQueue mutex..." << flush;
+#endif
     pthread_mutex_lock(&fMuxMsg);
+#ifdef DEBUG
     cout << "done." << endl;
+#endif
 
     //
@@ -134 +146 @@
     {
         pthread_mutex_unlock(&fMuxMsg);
+#ifdef DEBUG
         cout << "------------> MsgQueue::PostMsg: Proc still pending... Message IGNORED." << endl;
+#endif
         return NULL;
     }
     /**** NEW 20/01/2003 ****/
+#ifdef DEBUG
     cout << "MsgQueue::PostMsg: ---> Break <---" << endl;
+#endif
     fBreak = 1;
 
@@ -156 +172 @@
     // Start Proc()
     //
+#ifdef DEBUG
     cout << "MsgQueue::PostMsg: Releasing MsgQueue mutex..." << flush;
+#endif
     fStart = 1;
     pthread_mutex_unlock(&fMuxMsg);
+#ifdef DEBUG
     cout << "done." << endl;
+#endif
 
     /*
@@ -175 +195 @@
     //    usleep(1);
  
+#ifdef DEBUG
     cout << "MsgQueue::PostMsg: Returning rc = " << hex << rc << endl;
+#endif
     return rc;
 }