HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r30:be684d1d67fb

Fixed bug on AHBUART (wrong mutex usage).

Jeandet Alexis -

r30:be684d1d67fb default

parent child

Context file:

r30:be684d1d67fb

Collapse all files

APBUARTPLUGIN/uartpollingthread.cpp +1 -1

                             SocExplorerEngine::message(this->plugin,QString("Received one char from APBUART"),3);
                             emit this->apbUartTextReceived(QString(ch[0]));
                         }
-                        msleep(1);
+                        msleep(10);
                     }
                 }
             }

ahbuartplugin/ahbuartplugin.cpp +10 -6

                 int read = 0;
                 timeout.start();
                 SocExplorerEngine::message(this,"Check connection",2);
+                QMutexLocker lock(portMutex);
                 while(writen!=5)
                 {
                     writen+=rs232write(this->port,test+writen,5-writen);
                 QTime timeout;
                 SocExplorerEngine::message(this,"Try to connect to port "+PortName,2);
                 timeout.start();
+                QMutexLocker lock(portMutex);
                 if(this->port==(rs232port_t)NULL)
                 {
                     SocExplorerEngine::message(this,"Open port "+PortName,2);
                 SocExplorerEngine::message(this,QString("Read ")+ QString::number(count) + QString(" words @0x")+ QString::number(address,16),2);
                 if((this->port!= badPortValue)||(this->port!=(rs232port_t)NULL))
                 {
-                    if(!this->portMutex->tryLock())
+                    QMutexLocker lock(portMutex);
-                        return 0;
+            //        if(!this->portMutex->tryLock())
+            //            return 0;
                     if(!this->checkConnection())
                     {
                         this->Connected = false;
                     if(cnt>128)
                         SocExplorerEngine::deleteProgressBar(progress);
                     free(result);
-                    this->portMutex->unlock();
+            //        this->portMutex->unlock();
                 }
                 return read/4;
             }
                 SocExplorerEngine::message(this,QString("Write ")+ QString::number(count) + QString(" words @0x")+ QString::number(address,16),2);
                 if((this->port!= badPortValue)||(this->port!=(rs232port_t)NULL))
                 {
-                    if(!this->portMutex->tryLock())
+                    QMutexLocker lock(portMutex);
-                        return 0;
+            //        if(!this->portMutex->tryLock())
+            //            return 0;
                     if(!this->checkConnection())
                     {
                         emit this->activateSig(false);
                         SocExplorerEngine::deleteProgressBar(progress);
                     }
                     free(CMD);
-                    this->portMutex->unlock();
+            //        this->portMutex->unlock();
                     return writen;
                 }
                 return 0;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages