Changeset 4076 for trunk/MagicSoft/Cosy/candrv

Timestamp:

05/15/04 16:46:27 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• sdolist.cc (modified) (10 diffs)
• vmodican.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/candrv/sdolist.cc

@@ -20 +20 @@
 void PendingSDOList::DelAll()
 {
-    fMux.Lock();
+    if (fMux.Lock()==13)
+        cout << "PendingSDOList::DelAll - mutex is already locked by this thread" << endl;
 
     PendingSDO *prev = fFirst;
@@ -35 +36 @@
     fLast  = fFirst;
 
-    fMux.UnLock();
+    if (fMux.UnLock()==13)
+        cout << "PendingSDOList::DelAll - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -42 +44 @@
     PendingSDO *sdo = fFirst;
 
-    fMux.Lock();
+    if (fMux.Lock()==13)
+        cout << "PendingSDOList::Add - mutex is already locked by this thread" << endl;
     while ((sdo=sdo->Next))
         if (sdo->Node==node && sdo->Idx==idx && sdo->Subidx==subidx)
@@ -54 +57 @@
     fLast->Next = new PendingSDO(node, idx, subidx);
     fLast = fLast->Next;
-    fMux.UnLock();
+    if (fMux.UnLock()==13)
+        cout << "PendingSDOList::Add - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -62 +66 @@
     PendingSDO *sdo;
 
-    fMux.Lock();
+    if (fMux.Lock()==13)
+        cout << "PendingSDOList::Del - mutex is already locked by this thread" << endl;
     while ((sdo=prev->Next))
     {
@@ -80 +85 @@
         break;
     }
-    fMux.UnLock();
+    if (fMux.UnLock()==13)
+        cout << "PendingSDOList::Del - tried to unlock mutex locked by other thread." << endl;
 }
 
@@ -93 +99 @@
     PendingSDO *sdo = fFirst;
 
-    fMux.Lock();
+    if (fMux.Lock()==13)
+        cout << "PendingSDOList::IsPending(byte) - mutex is already locked by this thread" << endl;
     while ((sdo=sdo->Next))
         if (sdo->Node==node)
@@ -100 +107 @@
             break;
         }
-    fMux.UnLock();
+    if (fMux.UnLock()==13)
+        cout << "PendingSDOList::IsPending(byte) - tried to unlock mutex locked by other thread." << endl;
 
     return rc;
@@ -110 +118 @@
     PendingSDO *sdo = fFirst;
 
-    fMux.Lock();
+    if (fMux.Lock()==13)
+        cout << "PendingSDOList::IsPending - mutex is already locked by this thread" << endl;
     while ((sdo=sdo->Next))
         if (sdo->Node==node && sdo->Idx==idx && sdo->Subidx==subidx)
@@ -117 +126 @@
             break;
         }
-    fMux.UnLock();
+    if (fMux.UnLock()==13)
+        cout << "PendingSDOList::IsPending - tried to unlock mutex locked by other thread." << endl;
 
     return rc;

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -116 +116 @@
         unsigned char c;
         const int n = read(fd, &c, 1);
-
         if (n<0)
         {
             cerr << "Vmodican: read(" << dec << (int)fd << "," << (void*)&c;
-            cerr << ",1) returned c=" << (int)c << " '" << strerror(errno);
-            cerr << "' (errno = " << errno << ")" << endl;
+            cerr << ",1) returned rc=" << n << " c=" << (int)c << " '";
+            cerr << strerror(errno) << "' (errno = " << errno << ")" << endl;
             continue;
-            //return (void *)1;
         }
 
@@ -936 +934 @@
 //  and switch the can bus communication on
 //
-VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false, -10)//: CanDriver(dev, baud)
+VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false, 10)//: CanDriver(dev, baud)
 {
     //