Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cellframe-node-diagtool
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-node-diagtool
Commits
a02007a6
Commit
a02007a6
authored
1 month ago
by
Dmitry Pyzyrkov
Browse files
Options
Downloads
Patches
Plain Diff
[+] partial macos build
parent
0dd7cf98
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-0
2 additions, 0 deletions
CMakeLists.txt
CellframeNodeDiagtool/MacDiagnostic.cpp
+36
-2
36 additions, 2 deletions
CellframeNodeDiagtool/MacDiagnostic.cpp
CellframeNodeDiagtool/MacDiagnostic.h
+4
-1
4 additions, 1 deletion
CellframeNodeDiagtool/MacDiagnostic.h
with
42 additions
and
3 deletions
CMakeLists.txt
+
2
−
0
View file @
a02007a6
cmake_minimum_required
(
VERSION 3.10
)
cmake_minimum_required
(
VERSION 3.10
)
project
(
cellframe-diagtool
)
project
(
cellframe-diagtool
)
set
(
CMAKE_CXX_STANDARD 17
)
if
(
DEFINED ENV{OSXCROSS_HOST}
)
if
(
DEFINED ENV{OSXCROSS_HOST}
)
message
(
STATUS
"[*] Using OSXCROSS for build (OSXCROSS_HOST is set)"
)
message
(
STATUS
"[*] Using OSXCROSS for build (OSXCROSS_HOST is set)"
)
...
...
This diff is collapsed.
Click to expand it.
CellframeNodeDiagtool/MacDiagnostic.cpp
+
36
−
2
View file @
a02007a6
#include
"MacDiagnostic.h"
#include
"MacDiagnostic.h"
#include
<sys/stat.h>
#include
<filesystem>
#include
<unistd.h>
static
unsigned
long
long
_previousTotalTicks
=
0
;
static
unsigned
long
long
_previousTotalTicks
=
0
;
static
unsigned
long
long
_previousIdleTicks
=
0
;
static
unsigned
long
long
_previousIdleTicks
=
0
;
...
@@ -11,6 +13,37 @@ MacDiagnostic::MacDiagnostic(AbstractDiagnostic *parent)
...
@@ -11,6 +13,37 @@ MacDiagnostic::MacDiagnostic(AbstractDiagnostic *parent)
Qt
::
QueuedConnection
);
Qt
::
QueuedConnection
);
}
}
#include
<filesystem>
long
MacDiagnostic
::
get_pid
()
{
return
getpid
();
}
QJsonObject
MacDiagnostic
::
get_disk_info
()
{
QString
path
=
"/opt/cellframe-node"
;
QString
apath
=
QDir
(
path
).
absolutePath
();
std
::
error_code
ec
;
const
std
::
filesystem
::
space_info
si
=
std
::
filesystem
::
space
(
apath
.
toStdString
(),
ec
);
quint64
total
=
si
.
capacity
;
quint64
free
=
si
.
free
;
quint64
available
=
si
.
available
;
quint64
used
=
si
.
free
-
si
.
available
;
QJsonObject
diskObj
;
diskObj
.
insert
(
"total"
,
QString
::
number
(
total
));
diskObj
.
insert
(
"free"
,
QString
::
number
(
free
));
diskObj
.
insert
(
"available"
,
QString
::
number
(
available
));
diskObj
.
insert
(
"used"
,
QString
::
number
(
used
));
return
diskObj
;
}
QJsonObject
MacDiagnostic
::
get_sys_info
()
QJsonObject
MacDiagnostic
::
get_sys_info
()
{
{
// qInfo()<<"MacDiagnostic::get_sys_info ";
// qInfo()<<"MacDiagnostic::get_sys_info ";
...
@@ -115,7 +148,8 @@ float MacDiagnostic::calculate_cpu_load(unsigned long long idleTicks, unsigned l
...
@@ -115,7 +148,8 @@ float MacDiagnostic::calculate_cpu_load(unsigned long long idleTicks, unsigned l
/// ---------------------------------------------------------------
/// ---------------------------------------------------------------
/// Process info
/// Process info
/// ---------------------------------------------------------------
/// ---------------------------------------------------------------
QJsonObject
MacDiagnostic
::
get_process_info
(
int
totalRam
)
QJsonObject
MacDiagnostic
::
get_process_info
(
long
proc_id
,
int
totalRam
)
{
{
// qInfo()<<"MacDiagnostic::get_process_info ";
// qInfo()<<"MacDiagnostic::get_process_info ";
QJsonObject
process_info
;
QJsonObject
process_info
;
...
...
This diff is collapsed.
Click to expand it.
CellframeNodeDiagtool/MacDiagnostic.h
+
4
−
1
View file @
a02007a6
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
#include
<time.h>
#include
<time.h>
#include
<mach/mach_time.h>
#include
<mach/mach_time.h>
using
namespace
std
;
using
namespace
std
;
...
@@ -23,7 +24,9 @@ public:
...
@@ -23,7 +24,9 @@ public:
private:
private:
QJsonObject
get_sys_info
();
QJsonObject
get_sys_info
();
QJsonObject
get_process_info
(
int
totalRam
);
QJsonObject
get_process_info
(
long
proc_id
=
0
,
int
totalRam
=
0
);
QJsonObject
get_disk_info
();
long
get_pid
();
//cpu
//cpu
float
calculate_cpu_load
(
unsigned
long
long
idleTick
,
unsigned
long
long
totakTicks
);
float
calculate_cpu_load
(
unsigned
long
long
idleTick
,
unsigned
long
long
totakTicks
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment