Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
htop
Commits
820c079b
Commit
820c079b
authored
Feb 02, 2016
by
Hisham
Browse files
Initialize default meter modes properly.
parent
f87462d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Settings.c
View file @
820c079b
...
@@ -118,19 +118,29 @@ static void Settings_defaultMeters(Settings* this) {
...
@@ -118,19 +118,29 @@ static void Settings_defaultMeters(Settings* this) {
int
r
=
0
;
int
r
=
0
;
if
(
this
->
cpuCount
>
8
)
{
if
(
this
->
cpuCount
>
8
)
{
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"LeftCPUs2"
);
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"LeftCPUs2"
);
this
->
columns
[
1
].
names
[
r
++
]
=
xStrdup
(
"RightCPUs2"
);
this
->
columns
[
0
].
modes
[
0
]
=
BAR_METERMODE
;
this
->
columns
[
1
].
names
[
r
]
=
xStrdup
(
"RightCPUs2"
);
this
->
columns
[
1
].
modes
[
r
++
]
=
BAR_METERMODE
;
}
else
if
(
this
->
cpuCount
>
4
)
{
}
else
if
(
this
->
cpuCount
>
4
)
{
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"LeftCPUs"
);
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"LeftCPUs"
);
this
->
columns
[
1
].
names
[
r
++
]
=
xStrdup
(
"RightCPUs"
);
this
->
columns
[
0
].
modes
[
0
]
=
BAR_METERMODE
;
this
->
columns
[
1
].
names
[
r
]
=
xStrdup
(
"RightCPUs"
);
this
->
columns
[
1
].
modes
[
r
++
]
=
BAR_METERMODE
;
}
else
{
}
else
{
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"AllCPUs"
);
this
->
columns
[
0
].
names
[
0
]
=
xStrdup
(
"AllCPUs"
);
this
->
columns
[
0
].
modes
[
0
]
=
BAR_METERMODE
;
}
}
this
->
columns
[
0
].
names
[
1
]
=
xStrdup
(
"Memory"
);
this
->
columns
[
0
].
names
[
1
]
=
xStrdup
(
"Memory"
);
this
->
columns
[
0
].
modes
[
1
]
=
BAR_METERMODE
;
this
->
columns
[
0
].
names
[
2
]
=
xStrdup
(
"Swap"
);
this
->
columns
[
0
].
names
[
2
]
=
xStrdup
(
"Swap"
);
this
->
columns
[
0
].
modes
[
2
]
=
BAR_METERMODE
;
this
->
columns
[
1
].
names
[
r
++
]
=
xStrdup
(
"Tasks"
);
this
->
columns
[
1
].
names
[
r
]
=
xStrdup
(
"Tasks"
);
this
->
columns
[
1
].
names
[
r
++
]
=
xStrdup
(
"LoadAverage"
);
this
->
columns
[
1
].
modes
[
r
++
]
=
TEXT_METERMODE
;
this
->
columns
[
1
].
names
[
r
++
]
=
xStrdup
(
"Uptime"
);
this
->
columns
[
1
].
names
[
r
]
=
xStrdup
(
"LoadAverage"
);
this
->
columns
[
1
].
modes
[
r
++
]
=
TEXT_METERMODE
;
this
->
columns
[
1
].
names
[
r
]
=
xStrdup
(
"Uptime"
);
this
->
columns
[
1
].
modes
[
r
++
]
=
TEXT_METERMODE
;
}
}
static
void
readFields
(
ProcessField
*
fields
,
int
*
flags
,
const
char
*
line
)
{
static
void
readFields
(
ProcessField
*
fields
,
int
*
flags
,
const
char
*
line
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment