Changeset 14586

Timestamp:

11/08/12 12:11:29 (12 years ago)

Author:

tbretz

Message:

Moved cout to gLog and added a debug file which can be switched on on purpose

File:

• trunk/Cosy/candrv/sdolist.cc (modified) (13 diffs)

trunk/Cosy/candrv/sdolist.cc

@@ -1 +1 @@
 #include "sdolist.h"
 
-#include <iostream>
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MTime.h"
+
 
 ClassImp(PendingSDO);
@@ -8 +12 @@
 using namespace std;
 
+#undef DEBUG
+
+#ifdef DEBUG
+#include <fstream>
+static ofstream fout;
+#endif
+
 PendingSDOList::PendingSDOList()
 {
+#ifdef DEBUG
+    fout.open("sdolist.txt", ios::app);
+    fout.rdbuf()->pubsetbuf(0,0);
+    fout << hex;
+#endif
+
     fFirst = new PendingSDO;
     fLast  = fFirst;
@@ -18 +35 @@
     DelAll();
     delete fFirst;
+
+#ifdef DEBUG
+    fout.close();
+#endif
 }
 
@@ -23 +44 @@
 {
     if (fMux.Lock()==13)
-        cout << "PendingSDOList::DelAll - mutex is already locked by this thread" << endl;
+        gLog << err << MTime(-1) << " -  PendingSDOList::DelAll - mutex is already locked by this thread" << endl;
+
+#ifdef DEBUG
+    fout << MTime(-1) << " - DelAll" << endl;
+#endif
 
     PendingSDO *prev = fFirst;
@@ -39 +64 @@
 
     if (fMux.UnLock()==13)
-        cout << "PendingSDOList::DelAll - tried to unlock mutex locked by other thread." << endl;
+        gLog << err << MTime(-1) << " -  PendingSDOList::DelAll - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -47 +72 @@
 
     if (fMux.Lock()==13)
-        cout << "PendingSDOList::Add - mutex is already locked by this thread" << endl;
+        gLog << err << MTime(-1) << " -  PendingSDOList::Add - mutex is already locked by this thread" << endl;
+
+#ifdef DEBUG
+    fout << MTime(-1) << " - Add " << idx << "/" << subidx << " @ " << node << endl;
+#endif
+
     while ((sdo=sdo->Next))
         if (sdo->Node==node && sdo->Idx==idx && sdo->Subidx==subidx)
         {
-            cout << "Warning: SDO Node #" << dec << (int)node << ", 0x";
-            cout << hex << idx << "/" << (int)subidx;
-            cout << " still pending." << endl;
+            gLog << warn << MTime(-1) << " - SDO Node #" << dec << (int)node << ", 0x";
+            gLog << hex << idx << "/" << (int)subidx;
+            gLog << " still pending." << endl;
             break;
         }
@@ -60 +90 @@
     fLast = fLast->Next;
     if (fMux.UnLock()==13)
-        cout << "PendingSDOList::Add - tried to unlock mutex locked by other thread." << endl;
+        gLog << err << MTime(-1) << " - PendingSDOList::Add - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -69 +99 @@
 
     if (fMux.Lock()==13)
-        cout << "PendingSDOList::Del - mutex is already locked by this thread" << endl;
+        gLog << err << MTime(-1) << " -  PendingSDOList::Del - mutex is already locked by this thread" << endl;
+
+#ifdef DEBUG
+    fout << MTime(-1) << " - Del " << idx << "/" << subidx << " @ " << node << endl;
+#endif
+
     while ((sdo=prev->Next))
     {
@@ -88 +123 @@
     }
     if (fMux.UnLock()==13)
-        cout << "PendingSDOList::Del - tried to unlock mutex locked by other thread." << endl;
+        gLog << err <<  MTime(-1) << " - PendingSDOList::Del - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -102 +137 @@
 
     if (fMux.Lock()==13)
-        cout << "PendingSDOList::IsPending(byte) - mutex is already locked by this thread" << endl;
+        gLog << err << MTime(-1) << " - PendingSDOList::IsPending(byte) - mutex is already locked by this thread" << endl;
     while ((sdo=sdo->Next))
         if (sdo->Node==node)
@@ -110 +145 @@
         }
     if (fMux.UnLock()==13)
-        cout << "PendingSDOList::IsPending(byte) - tried to unlock mutex locked by other thread." << endl;
+        gLog << err << MTime(-1) << " - PendingSDOList::IsPending(byte) - tried to unlock mutex locked by other thread." << endl;
 
     return rc;
@@ -121 +156 @@
 
     if (fMux.Lock()==13)
-        cout << "PendingSDOList::IsPending - mutex is already locked by this thread" << endl;
+        gLog << err <<  MTime(-1) << " - PendingSDOList::IsPending - mutex is already locked by this thread" << endl;
     while ((sdo=sdo->Next))
         if (sdo->Node==node && sdo->Idx==idx && sdo->Subidx==subidx)
@@ -129 +164 @@
         }
     if (fMux.UnLock()==13)
-        cout << "PendingSDOList::IsPending - tried to unlock mutex locked by other thread." << endl;
+        gLog << err <<  MTime(-1) << " - PendingSDOList::IsPending - tried to unlock mutex locked by other thread." << endl;
 
     return rc;