HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r77:9bf6663d5c21

Fixed Memory leak, GERSB still W.I.P.

Jeandet Alexis -

r77:9bf6663d5c21 GRESB

parent child

Context file:

r77:9bf6663d5c21

Collapse all files

spwplugin/GR-ESB/gr_esb_bridge.cpp +12 -8

                                 RMAP_MAX_XFER_SIZE*4,
                                 writeBuffer);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(RMAP_MAX_XFER_SIZE*4));
-                    int len = manager->getRMAPanswer(transactionID,&RMAPAckBuff);
+                    manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
                                 count*4,
                                 writeBuffer);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(count*4));
-                    int len = manager->getRMAPanswer(transactionID,&RMAPAckBuff);
+                    manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=count;
                     if(progress!=NULL)
                     free(RMAP_AnswerBuffer);
                     read+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
-                    progress->setValue(read);
+                    if(progress!=NULL)
-                    qApp->processEvents();
+                        progress->setValue(read);
+                        qApp->processEvents();
+                    }
                 }
                 if((int)count>0)
                 {
                     SPWpacket[1]=(size>>16) & 0x0FF;
                     SPWpacket[2]=(size>>8) & 0x0FF;
                     SPWpacket[3]=size & 0x0FF;
+                    this->handleMutex->lock();
+                    result = ((size+4) == this->Write_soc.write(SPWpacket,size+4));
+                    this->Write_soc.flush();
+                    this->handleMutex->unlock();
+                    free(SPWpacket);
                 }
-                this->handleMutex->lock();
-                result = ((size+4) == this->Write_soc.write(SPWpacket,size+4));
-                this->Write_soc.flush();
-                this->handleMutex->unlock();
                 if (Q_UNLIKELY(!result))
                 {
                     SocExplorerEngine::message(this->plugin,"ERR sending the READ command ",2);

spwplugin/StarDundee/stardundeespw_usb.cpp +6 -3

                     free(RMAP_AnswerBuffer);
                     read+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
-                    progress->setValue(read);
+                    if(progress!=NULL)
-                    qApp->processEvents();
+                        progress->setValue(read);
+                        qApp->processEvents();
+                    }
                 }
                 if((int)count>0)
                 {
             unsigned int stardundeeSPW_USB_Manager::getLinkStatus(unsigned char link)
             {
                 U32 statusControl, errorStatus, portType;
-                U32 linkStatus, operatingSpeed, outputPortConnection;
+                U32 linkStatus=0, operatingSpeed, outputPortConnection;
                 char isLinkRunning, isAutoStart, isStart, isDisabled, isTristate;
                 // Read the link status control register

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