From 0a80706891864fd0c304495a37231e77bee595fe Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Thu, 3 May 2018 21:51:24 +0800 Subject: [PATCH] update sysinfo --- src/frame/qqtsysteminfo.cpp | 6 ++ src/frame/qqtsysteminfo.h | 80 +++++++++++++++++++ src/frame/systeminfo/qqtsysteminfo.cpp | 6 -- src/frame/systeminfo/qqtsysteminfo.h | 23 ------ src/frame/systeminfo/qqtsysteminfoprivate.cpp | 6 -- src/frame/systeminfo/qqtsysteminfoprivate.h | 17 ---- src/linux_cd_path.sh | 0 src/linux_cp_files.sh | 0 src/linux_cur_path.sh | 0 src/network/qqtprotocol.h | 11 +-- src/qqt_source.pri | 11 ++- 11 files changed, 97 insertions(+), 63 deletions(-) create mode 100644 src/frame/qqtsysteminfo.cpp create mode 100644 src/frame/qqtsysteminfo.h delete mode 100644 src/frame/systeminfo/qqtsysteminfo.cpp delete mode 100644 src/frame/systeminfo/qqtsysteminfo.h delete mode 100644 src/frame/systeminfo/qqtsysteminfoprivate.cpp delete mode 100644 src/frame/systeminfo/qqtsysteminfoprivate.h mode change 100644 => 100755 src/linux_cd_path.sh mode change 100644 => 100755 src/linux_cp_files.sh mode change 100644 => 100755 src/linux_cur_path.sh diff --git a/src/frame/qqtsysteminfo.cpp b/src/frame/qqtsysteminfo.cpp new file mode 100644 index 00000000..a5a38602 --- /dev/null +++ b/src/frame/qqtsysteminfo.cpp @@ -0,0 +1,6 @@ +#include "qqtsysteminfo.h" + +QQtSystemInfo::QQtSystemInfo ( QObject* parent ) : QObject ( parent ) +{ + +} diff --git a/src/frame/qqtsysteminfo.h b/src/frame/qqtsysteminfo.h new file mode 100644 index 00000000..9463292d --- /dev/null +++ b/src/frame/qqtsysteminfo.h @@ -0,0 +1,80 @@ +#ifndef QQTSYSTEMINFO_H +#define QQTSYSTEMINFO_H + +#include + +typedef struct tDiskInfo +{ + tDiskInfo() {} + quint32 mSize; //B + quint32 mAvalableSize; //B +} TDiskInfo; + +typedef struct tDiskTable +{ + tDiskTable() {} + quint32 mNum; + QList mList; +} TDiskTable; + +typedef struct tMemInfo +{ + tMemInfo() {} +} TMemInfo; + +typedef struct tMemTable +{ + tMemTable() {} + quint32 mTotalSize;//B + quint32 mAvalableSize;//B + quint32 mNum; + QList mList; +} TMemTable; + +typedef struct tCPUInfo +{ + tCPUInfo() {} + quint32 mCoreNum; + quint32 mThreadNumPerCore; + quint32 mRate; +} TCPUInfo; + +typedef struct tCPUTable +{ + tCPUTable() {} + quint32 mNum; + QList mList; +} TCPUTable; + +class QQtSystemInfo : public QObject +{ + Q_OBJECT +public: + explicit QQtSystemInfo ( QObject* parent = nullptr ); + + bool getCPUInfo ( TCPUTable& cpuInfo ) { +#if 0 +#if defined(Q_OS_WIN32) || defined (Q_OS_WIN64) + SYSTEM_INFO systemInfo; + GetSystemInfo ( &systemInfo ); + qDebug() << QStringLiteral ( "处理器掩码:" ) << systemInfo.dwActiveProcessorMask; + qDebug() << QStringLiteral ( "处理器个数:" ) << systemInfo.dwNumberOfProcessors; + qDebug() << QStringLiteral ( "处理器分页大小:" ) << systemInfo.dwPageSize; + qDebug() << QStringLiteral ( "处理器类型:" ) << systemInfo.dwProcessorType; + qDebug() << QStringLiteral ( "最大寻址单元:" ) << systemInfo.lpMaximumApplicationAddress; + qDebug() << QStringLiteral ( "最小寻址单元:" ) << systemInfo.lpMinimumApplicationAddress; + qDebug() << QStringLiteral ( "处理器等级:" ) << systemInfo.wProcessorLevel; + qDebug() << QStringLiteral ( "处理器版本:" ) << systemInfo.wProcessorRevision; +#else + +#endif +#endif + } +signals: + +public slots: + +private: +}; + +#endif // QQTSYSTEMINFO_H diff --git a/src/frame/systeminfo/qqtsysteminfo.cpp b/src/frame/systeminfo/qqtsysteminfo.cpp deleted file mode 100644 index a44d8d9f..00000000 --- a/src/frame/systeminfo/qqtsysteminfo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "qqtsysteminfo.h" - -QQtSystemInfo::QQtSystemInfo(QObject *parent) : QObject(parent) -{ - -} diff --git a/src/frame/systeminfo/qqtsysteminfo.h b/src/frame/systeminfo/qqtsysteminfo.h deleted file mode 100644 index c791de49..00000000 --- a/src/frame/systeminfo/qqtsysteminfo.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef QQTSYSTEMINFO_H -#define QQTSYSTEMINFO_H - -#include - -class QQtSystemInfoPrivate; - -class QQtSystemInfo : public QObject -{ - Q_OBJECT -public: - explicit QQtSystemInfo ( QObject* parent = nullptr ); - -signals: - -public slots: - -private: - Q_DECLARE_PRIVATE ( QQtSystemInfo ) - Q_DISABLE_COPY ( QQtSystemInfo ) -}; - -#endif // QQTSYSTEMINFO_H diff --git a/src/frame/systeminfo/qqtsysteminfoprivate.cpp b/src/frame/systeminfo/qqtsysteminfoprivate.cpp deleted file mode 100644 index 786b0589..00000000 --- a/src/frame/systeminfo/qqtsysteminfoprivate.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "qqtsysteminfoprivate.h" - -QQtSystemInfoPrivate::QQtSystemInfoPrivate(QObject *parent) : QObject(parent) -{ - -} diff --git a/src/frame/systeminfo/qqtsysteminfoprivate.h b/src/frame/systeminfo/qqtsysteminfoprivate.h deleted file mode 100644 index 02bb1745..00000000 --- a/src/frame/systeminfo/qqtsysteminfoprivate.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef QQTSYSTEMINFOPRIVATE_H -#define QQTSYSTEMINFOPRIVATE_H - -#include - -class QQtSystemInfoPrivate : public QObject -{ - Q_OBJECT -public: - explicit QQtSystemInfoPrivate(QObject *parent = nullptr); - -signals: - -public slots: -}; - -#endif // QQTSYSTEMINFOPRIVATE_H \ No newline at end of file diff --git a/src/linux_cd_path.sh b/src/linux_cd_path.sh old mode 100644 new mode 100755 diff --git a/src/linux_cp_files.sh b/src/linux_cp_files.sh old mode 100644 new mode 100755 diff --git a/src/linux_cur_path.sh b/src/linux_cur_path.sh old mode 100644 new mode 100755 diff --git a/src/network/qqtprotocol.h b/src/network/qqtprotocol.h index e782a36c..bbd30dcc 100644 --- a/src/network/qqtprotocol.h +++ b/src/network/qqtprotocol.h @@ -52,29 +52,30 @@ public: */ inline virtual quint16 splitter ( const QByteArray& ) { return 0; } /** - * @brief 语义解析器 + * @brief 语义解析器 分发报文 * /.../quint16 size/.../QByteArray data/.../ * @param 数据包 * @return 0 no dispatched(others) 1 dispatched(own) */ inline virtual bool dispatcher ( const QByteArray& ) { return 0; } - /* - * 以下函数，与用户无关。 - */ signals: /** * @brief notifyToProtocolManager - * 为服务器功能的ProtocolManager添加的，用户不必管理，必要时调用。 + * 为服务器功能的ProtocolManager添加的，用户，必要时调用。 * * 用户继承下去的协议里，在dispatcher的recv函数里，如果必要把收到的信息传递给上层， * 那么通过emit notifyToProtocolManager，传递给ProtocolManager * BusinessLevel对这些接收到的信息感兴趣， * 那么通过连接ProtocolManager的notifyToBusinessLevel对拿到的信息进行处理，会包括协议句柄，使用户方便写回客户。 + * 当然，用户不必管理这个信号和PM的信号的连接，PM内部自动管理了。 * @param self * @param message */ void notifyToProtocolManager ( const QQtProtocol* self, const QQtMessage* message ); + /* + * 以下函数，与用户无关。 + */ /** * 如果Socket和这个Protocol关联，就会设置关联。 */ diff --git a/src/qqt_source.pri b/src/qqt_source.pri index 5eb0c1a5..be972b5e 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -14,12 +14,6 @@ #2018年4月6日18点12分 #这里是LibQQt源文件pri，所有开关宏都在LibQQt头文件pri里开关。 #------------------------------------------------- -SOURCES = \ - $$PWD/frame/systeminfo/qqtsysteminfo.cpp \ - $$PWD/frame/systeminfo/qqtsysteminfoprivate.cpp -HEADERS = \ - $$PWD/frame/systeminfo/qqtsysteminfo.h \ - $$PWD/frame/systeminfo/qqtsysteminfoprivate.h #root dir HEADERS += $$PWD/qqt.h \ @@ -146,6 +140,11 @@ FORMS += \ $$PWD/widgets/qqtprogressbar.ui #frame +SOURCES += \ + $$PWD/frame/qqtsysteminfo.cpp +HEADERS += \ + $$PWD/frame/qqtsysteminfo.h + SOURCES += \ $$PWD/frame/qqtlineeditwithsearch.cpp \ $$PWD/frame/qqtosdwidget.cpp