[simulation] Fix some potential crashes & 26 memory leaks, improve LCD redraws. (#4634)
* [simulation] Hardening: Fix some potential crashes & 26 memory leaks, improve LCD performance. * [simpgmspace] Init trims; Make sure `REa` is really defined (to match board files). * [simpgmspace][opentxsimulator] Verify current running state before start/stop; Move rotary enc. init. * [simpgmspace][LcdWidget] Improve performance by moving LCD content change check to lcdRefresh() & limiting LcdWidget refresh time to 60 fps max. * [simueeprom] Ensure thread could be started, set default running state to false. * [simufatfs] Fix paths report trace. * [eepromimportexport] Fix memory leaks resulting from import debugging scheme being used. * [customdebug] Introduce new scheme for custom debug output in compliance with Qt recommendations (see docs for QLoggingCategory). * [opentxeeprom] Fix extra conversion table cache elements being created and also not properly deleted (and hence leaking). * [opentxinterface] Unregister EEpromInterfaces in unregisterOpenTxFirmwares(); * [storage] Unregister storage factories on exit (fixes leak); create virtual StorageFormat/StorageFactory destructors (prevents warnings). * [helpers] GVarGroup now emits own signal, no need to pass ModelPanel pointer (removes dependency on modeledit.h) * [DebugOutput] Clear simulator trace hook before exiting (prevent possible issues); Fix leak and possible bad QString allocations when reading from buffer; Fix leak with combo box event filter. * [TelemetrySimulator] Fix leak by deleting LogPlaybackController object on exit; Only set up data fields once; convert timers to static. * [build] Consolidate all Companion/Simulator shared items in `common` library to reduce build time/etc (node & edge still remain awkward). * [simulatorwidget] Delete removed spacer object (previously-forgotten "26th" leak). * [DebugOutput] Fix stray trailing characters issue with new text buffer allocation (from previous commit); Increase maximum buffer sizes to better accommodate slower systems. * Cosmetics.
This commit is contained in:
committed by
Bertrand Songis
parent
52e65179a8
commit
4aa0c1bbe4
@@ -26,10 +26,15 @@
|
||||
#include <QPainter>
|
||||
#include <QClipboard>
|
||||
#include <QDir>
|
||||
#include <QElapsedTimer>
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
|
||||
#include "appdata.h"
|
||||
#include "appdebugmessagehandler.h"
|
||||
|
||||
#define LCD_WIDGET_REFRESH_PERIOD 16 // [ms] 16 = 62.5fps
|
||||
|
||||
class LcdWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -39,7 +44,7 @@ class LcdWidget : public QWidget
|
||||
LcdWidget(QWidget * parent = 0):
|
||||
QWidget(parent),
|
||||
lcdBuf(NULL),
|
||||
previousBuf(NULL),
|
||||
localBuf(NULL),
|
||||
lightEnable(false),
|
||||
bgDefaultColor(QColor(198, 208, 199))
|
||||
{
|
||||
@@ -47,8 +52,8 @@ class LcdWidget : public QWidget
|
||||
|
||||
~LcdWidget()
|
||||
{
|
||||
if (previousBuf) {
|
||||
free(previousBuf);
|
||||
if (localBuf) {
|
||||
free(localBuf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,8 +67,9 @@ class LcdWidget : public QWidget
|
||||
lcdSize = (width * height) * ((depth+7) / 8);
|
||||
else
|
||||
lcdSize = (width * ((height+7)/8)) * depth;
|
||||
previousBuf = (unsigned char *)malloc(lcdSize);
|
||||
memset(previousBuf, 0, lcdSize);
|
||||
|
||||
localBuf = (unsigned char *)malloc(lcdSize);
|
||||
memset(localBuf, 0, lcdSize);
|
||||
}
|
||||
|
||||
void setBgDefaultColor(const QColor & color)
|
||||
@@ -102,10 +108,12 @@ class LcdWidget : public QWidget
|
||||
|
||||
void onLcdChanged(bool light)
|
||||
{
|
||||
if (light != lightEnable || memcmp(previousBuf, lcdBuf, lcdSize)) {
|
||||
lightEnable = light;
|
||||
memcpy(previousBuf, lcdBuf, lcdSize);
|
||||
QMutexLocker locker(&lcdMtx);
|
||||
lightEnable = light;
|
||||
memcpy(localBuf, lcdBuf, lcdSize);
|
||||
if (!redrawTimer.isValid() || redrawTimer.hasExpired(LCD_WIDGET_REFRESH_PERIOD)) {
|
||||
update();
|
||||
redrawTimer.start();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,24 +125,26 @@ class LcdWidget : public QWidget
|
||||
int lcdSize;
|
||||
|
||||
unsigned char *lcdBuf;
|
||||
unsigned char *previousBuf;
|
||||
unsigned char *localBuf;
|
||||
|
||||
bool lightEnable;
|
||||
QColor bgColor;
|
||||
QColor bgDefaultColor;
|
||||
QMutex lcdMtx;
|
||||
QElapsedTimer redrawTimer;
|
||||
|
||||
inline void doPaint(QPainter & p)
|
||||
{
|
||||
QRgb rgb;
|
||||
uint16_t z;
|
||||
|
||||
if (!lcdBuf)
|
||||
if (!localBuf)
|
||||
return;
|
||||
|
||||
if (lcdDepth == 16) {
|
||||
for (int x = 0; x < lcdWidth; x++) {
|
||||
for (int y = 0; y < lcdHeight; y++) {
|
||||
z = ((uint16_t *)lcdBuf)[y * lcdWidth + x];
|
||||
z = ((uint16_t *)localBuf)[y * lcdWidth + x];
|
||||
rgb = qRgb(255 * ((z & 0xF800) >> 11) / 0x1F,
|
||||
255 * ((z & 0x07E0) >> 5) / 0x3F,
|
||||
255 * (z & 0x001F) / 0x1F);
|
||||
@@ -147,7 +157,7 @@ class LcdWidget : public QWidget
|
||||
if (lcdDepth == 12) {
|
||||
for (int x = 0; x < lcdWidth; x++) {
|
||||
for (int y = 0; y < lcdHeight; y++) {
|
||||
z = ((uint16_t *)lcdBuf)[y * lcdWidth + x];
|
||||
z = ((uint16_t *)localBuf)[y * lcdWidth + x];
|
||||
rgb = qRgb(255 * ((z & 0xF00) >> 8) / 0x0F,
|
||||
255 * ((z & 0x0F0) >> 4) / 0x0F,
|
||||
255 * (z & 0x00F) / 0x0F);
|
||||
@@ -181,12 +191,12 @@ class LcdWidget : public QWidget
|
||||
mask = (1 << (y % 8));
|
||||
for (int x = 0; x < lcdWidth; x++, idx++) {
|
||||
if (lcdDepth == 1) {
|
||||
if (lcdBuf[idx] & mask)
|
||||
if (localBuf[idx] & mask)
|
||||
p.drawRect(2 * x, 2 * y, 1, 1);
|
||||
continue;
|
||||
}
|
||||
// lcdDepth == 4
|
||||
z = (y & 1) ? (lcdBuf[idx] >> 4) : (lcdBuf[idx] & 0x0F);
|
||||
z = (y & 1) ? (localBuf[idx] >> 4) : (localBuf[idx] & 0x0F);
|
||||
if (!z)
|
||||
continue;
|
||||
if (z != previousDepth) {
|
||||
|
||||
Reference in New Issue
Block a user