mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-20 13:44:12 +02:00
Shane Ringrose
c586a2d3a3
1. machine_info.h: zero-initialise Screen struct members Max_width, Max_height, count, width[] and height[] were bare int32_t with no initialiser. The comparisons in init_get_Screen_info() read them before any write, producing undefined behaviour flagged by Valgrind as 'Conditional jump or move depends on uninitialised value(s)'. 2. main.cpp: pre-initialise MachineInfo on the main thread MachineInfo::instance() was first called inside QtConcurrent::run(), causing its constructor (which calls qApp->screens()) to run on a background thread. QScreen methods are not thread-safe in Qt5. Calling instance() once on the main thread before the worker launches guarantees the singleton is fully built first; subsequent calls from the worker just return the cached pointer. 3. qetdiagrameditor.h: move m_first_show before the QActionGroup members C++ initialises members in declaration order. m_first_show was declared after the QActionGroup members (line 256 vs 168). During construction of m_row_column_actions_group(this), Qt dispatches a QObject parent-change event that reaches QETDiagramEditor::event(), which reads m_first_show before it has been initialised. Moving the declaration to the top of the first private: block ensures it is initialised before any member that can trigger events. All three found via Valgrind --tool=memcheck on Ubuntu 22.04 / Qt 5.15.3. Relates-to: PR #514 (same QtConcurrent thread-safety pattern).
131 lines
2.8 KiB
C++
131 lines
2.8 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef MACHINE_INFO_H
|
|
#define MACHINE_INFO_H
|
|
|
|
#include <QThread>
|
|
#include <QMutex>
|
|
|
|
/**
|
|
@brief The MachineInfo class
|
|
This class hold information from your PC.
|
|
*/
|
|
class MachineInfo
|
|
{
|
|
static MachineInfo *m_instance;
|
|
public:
|
|
static MachineInfo *instance()
|
|
{
|
|
static QMutex mutex;
|
|
if (!m_instance)
|
|
{
|
|
mutex.lock();
|
|
if (!m_instance) {
|
|
m_instance = new MachineInfo();
|
|
}
|
|
mutex.unlock();
|
|
}
|
|
|
|
return m_instance;
|
|
}
|
|
|
|
static void dropInstance()
|
|
{
|
|
static QMutex mutex;
|
|
if (m_instance) {
|
|
mutex.lock();
|
|
delete m_instance;
|
|
m_instance = nullptr;
|
|
mutex.unlock();
|
|
}
|
|
}
|
|
|
|
int32_t i_max_screen_width();
|
|
int32_t i_max_screen_height();
|
|
int32_t i_max_available_width();
|
|
int32_t i_max_available_height();
|
|
QString compilation_info();
|
|
void send_info_to_debug();
|
|
|
|
|
|
private:
|
|
MachineInfo();
|
|
void init_get_Screen_info();
|
|
void init_get_cpu_info();
|
|
void init_get_cpu_info_linux();
|
|
void init_get_cpu_info_winnt();
|
|
void init_get_cpu_info_macos();
|
|
|
|
struct Pc
|
|
{
|
|
struct Screen
|
|
{
|
|
int32_t count = 0;
|
|
int32_t width[10] = {};
|
|
int32_t height[10]= {};
|
|
int32_t Max_width = 0;
|
|
int32_t Max_height= 0;
|
|
}screen;
|
|
struct Built
|
|
{
|
|
QString version=
|
|
#ifdef __GNUC__
|
|
#ifdef __APPLE_CC__
|
|
"CLANG " + QString(__clang_version__);
|
|
#else
|
|
"GCC " + QString(__VERSION__);
|
|
#endif
|
|
#elif defined(Q_CC_MSVC)
|
|
"MSVC " + QString(QT_STRINGIFY(_MSC_FULL_VER));
|
|
#endif
|
|
QString QT=QString(QT_VERSION_STR);
|
|
QString date=QString(__DATE__);
|
|
QString time=QString(__TIME__);
|
|
QString arch=QString(QSysInfo::buildCpuArchitecture());
|
|
}built;
|
|
struct CPU
|
|
{
|
|
QString info;
|
|
QString Architecture=QString(
|
|
QSysInfo::currentCpuArchitecture());
|
|
int32_t ThreadCount=QThread::idealThreadCount();
|
|
}cpu;
|
|
struct RAM
|
|
{
|
|
QString Total;
|
|
QString Available;
|
|
}ram;
|
|
struct GPU
|
|
{
|
|
QString info;
|
|
QString RAM;
|
|
|
|
}gpu;
|
|
struct OS
|
|
{
|
|
QString type=QString(QSysInfo::kernelType());
|
|
QString name=QString(QSysInfo::prettyProductName());
|
|
QString kernel=QString(QSysInfo::kernelVersion());
|
|
}os;
|
|
}pc;
|
|
|
|
|
|
};
|
|
|
|
#endif // MACHINE_INFO_H
|