HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r82:f085b545eb20

Removed crash on spwplugin while closing the manager thread didn't quit correctly.

Alexis Jeandet -

r82:f085b545eb20 socexplorer-plugins-0.7-2 default

parent child

Context file:

r82:f085b545eb20

SocExplorer-plugins.spec +8 -2

-            %global upstream_name socexplorer-plugins-0.7-0
+            %global upstream_name socexplorer-plugins-0.7-2
             Name:           socexplorer-plugins
             Version:        0.7
-            Release:        0%{?dist}
+            Release:        2%{?dist}
             Summary:        Base plugins for SocExplorer.
             Group:          Development/Tools
             License:        GPLv2
                %{_qt5_libdir}/SocExplorer/plugins/libspwplugin.so*
             %changelog
+            * Fri May 13 2016 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.7-2
+            - Fixed another segfault on SpwPlugin.
+            * Thu Apr 21 2016 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.7-1
+            - Fixed segfault on SpwPlugin.
             * Wed Apr 20 2016 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.7-0
             - Updated to SocExplorer 0.7, some work on spwplugin merged.

spwplugin/StarDundee/stardundeespw_usb.cpp +6 -3

             stardundeeSPW_USB::~stardundeeSPW_USB()
             {
-                this->manager->requestInterruption();
-                while(this->manager->isRunning());
             }
             void stardundeeSPW_USB::toggleBridgeConnection()
             stardundeeSPW_USB_Manager::~stardundeeSPW_USB_Manager()
             {
+                if(this->connected)disconnectBridge();
+                this->requestInterruption();
+                while(!this->isFinished());
             }
             void stardundeeSPW_USB_Manager::run()
                 USB_SPACEWIRE_STATUS stat;
                 SocExplorerEngine::message(this->plugin,"Starting Startdundee USB pooling thread",1);
                 char buffer[(RMAP_MAX_XFER_SIZE*4)+50];
-                while (!this->isInterruptionRequested())
+                while (!QThread::currentThread()->isInterruptionRequested())
                 {
                     if(this->connected)
                     {
                 this->RMAP_Answers.clear();
                 this->RMAP_AnswersMtx->unlock();
                 this->RMAP_AnswersSem->acquire(this->RMAP_AnswersSem->available());
+                this->connected=false;
                 return true;
             }

spwplugin/StarDundee/stardundeespw_usb.h +4 -4

             public:
                 explicit stardundeeSPW_USB_Manager(socexplorerplugin *plugin = 0,QObject* parent=0);
                 ~stardundeeSPW_USB_Manager();
-                void run();
+                virtual void run();
-                bool connectBridge();
+                virtual bool connectBridge();
                 bool connectBridgeAsInterface();
                 bool connectBridgeAsRouter();
                 void initDialog( void );
                 void initializeTimecodeGeneration();
                 void setTimecodeFrequency(double requestedFrequency);
                 unsigned int getLinkStatus(unsigned char link);
-                bool disconnectBridge();
+                virtual bool disconnectBridge();
-                bool sendPacket(char* packet,int size);
+                virtual bool sendPacket(char* packet,int size);
             signals:
                 void updateAvailableBrickCount(int count);

spwplugin/abstractspwbridge.cpp +2 -5

             abstractSpwManager::~abstractSpwManager()
             {
-                this->terminate();
+                this->requestInterruption();
-                while (!this->isFinished())
+                while(!this->isFinished());
-                    this->usleep(1000);
             }
             int abstractSpwManager::getRMAPtransactionID()

spwplugin/abstractspwbridge.h +1 -1

             public:
                 explicit abstractSpwManager(socexplorerplugin *plugin = 0,QObject* parent=0);
                 ~abstractSpwManager();
-                virtual void run(){}
+                virtual void run(){};
                 virtual bool connectBridge()=0;
                 virtual bool disconnectBridge()=0;
                 int getRMAPtransactionID();

spwplugin/spwplugin.cpp +3 -2

             {
                 Q_UNUSED(parent)
                 FakeStarDundeeSpwUSB_Lib::resolve();
-                this->bridge = NULL;
+                this->bridge = Q_NULLPTR;
                 this->scanDone = false;
             //    this->pyObject = new spwPyWrapper(this);
                 this->tcpServer = new SpwTcpPacketServer(this);
             spwplugin::~spwplugin()
             {
+                if(this->bridge!=Q_NULLPTR)
+                    delete this->bridge;
             }

General Comments 0

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

No TODOs yet

	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