Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
84bc00a2
Commit
84bc00a2
authored
8 years ago
by
Kamyar Rasta
Browse files
Options
Download
Email Patches
Plain Diff
Issue #502 update Session ID column
parent
6141edc7
master
fixedgray
lua
next
perfcounters
pkgconfig-on-linux
solaris
3.0.0beta5
3.0.0beta4
3.0.0beta3
3.0.0beta2
3.0.0beta1
2.2.0
2.1.0
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
darwin/Platform.c
+2
-2
darwin/Platform.c
freebsd/FreeBSDProcess.c
+2
-2
freebsd/FreeBSDProcess.c
htop.1.in
+1
-1
htop.1.in
linux/LinuxProcess.c
+2
-2
linux/LinuxProcess.c
unsupported/Platform.c
+1
-1
unsupported/Platform.c
with
8 additions
and
8 deletions
+8
-8
darwin/Platform.c
View file @
84bc00a2
...
...
@@ -78,7 +78,7 @@ ProcessFieldData Process_fields[] = {
[
STATE
]
=
{
.
name
=
"STATE"
,
.
title
=
"S "
,
.
description
=
"Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)"
,
.
flags
=
0
,
},
[
PPID
]
=
{
.
name
=
"PPID"
,
.
title
=
" PPID "
,
.
description
=
"Parent process ID"
,
.
flags
=
0
,
},
[
PGRP
]
=
{
.
name
=
"PGRP"
,
.
title
=
" PGRP "
,
.
description
=
"Process group ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ESN
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ID
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
TTY_NR
]
=
{
.
name
=
"TTY_NR"
,
.
title
=
" TTY "
,
.
description
=
"Controlling terminal"
,
.
flags
=
0
,
},
[
TPGID
]
=
{
.
name
=
"TPGID"
,
.
title
=
" TPGID "
,
.
description
=
"Process ID of the fg process group of the controlling terminal"
,
.
flags
=
0
,
},
[
MINFLT
]
=
{
.
name
=
"MINFLT"
,
.
title
=
" MINFLT "
,
.
description
=
"Number of minor faults which have not required loading a memory page from disk"
,
.
flags
=
0
,
},
...
...
@@ -166,7 +166,7 @@ ProcessPidColumn Process_pidColumns[] = {
{
.
id
=
TPGID
,
.
label
=
"TPGID"
},
{
.
id
=
TGID
,
.
label
=
"TGID"
},
{
.
id
=
PGRP
,
.
label
=
"PGRP"
},
{
.
id
=
SESSION
,
.
label
=
"S
ESN
"
},
{
.
id
=
SESSION
,
.
label
=
"S
ID
"
},
{
.
id
=
0
,
.
label
=
NULL
},
};
...
...
This diff is collapsed.
Click to expand it.
freebsd/FreeBSDProcess.c
View file @
84bc00a2
...
...
@@ -61,7 +61,7 @@ ProcessFieldData Process_fields[] = {
[
STATE
]
=
{
.
name
=
"STATE"
,
.
title
=
"S "
,
.
description
=
"Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)"
,
.
flags
=
0
,
},
[
PPID
]
=
{
.
name
=
"PPID"
,
.
title
=
" PPID "
,
.
description
=
"Parent process ID"
,
.
flags
=
0
,
},
[
PGRP
]
=
{
.
name
=
"PGRP"
,
.
title
=
" PGRP "
,
.
description
=
"Process group ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ESN
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ID
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
TTY_NR
]
=
{
.
name
=
"TTY_NR"
,
.
title
=
" TTY "
,
.
description
=
"Controlling terminal"
,
.
flags
=
0
,
},
[
TPGID
]
=
{
.
name
=
"TPGID"
,
.
title
=
" TPGID "
,
.
description
=
"Process ID of the fg process group of the controlling terminal"
,
.
flags
=
0
,
},
[
MINFLT
]
=
{
.
name
=
"MINFLT"
,
.
title
=
" MINFLT "
,
.
description
=
"Number of minor faults which have not required loading a memory page from disk"
,
.
flags
=
0
,
},
...
...
@@ -92,7 +92,7 @@ ProcessPidColumn Process_pidColumns[] = {
{
.
id
=
TPGID
,
.
label
=
"TPGID"
},
{
.
id
=
TGID
,
.
label
=
"TGID"
},
{
.
id
=
PGRP
,
.
label
=
"PGRP"
},
{
.
id
=
SESSION
,
.
label
=
"S
ESN
"
},
{
.
id
=
SESSION
,
.
label
=
"S
ID
"
},
{
.
id
=
0
,
.
label
=
NULL
},
};
...
...
This diff is collapsed.
Click to expand it.
htop.1.in
View file @
84bc00a2
...
...
@@ -217,7 +217,7 @@ The parent process ID.
.B PGRP
The process's group ID.
.TP
.B SESSION (S
ESN
)
.B SESSION (S
ID
)
The process's session ID.
.TP
.B TTY_NR (TTY)
...
...
This diff is collapsed.
Click to expand it.
linux/LinuxProcess.c
View file @
84bc00a2
...
...
@@ -144,7 +144,7 @@ ProcessFieldData Process_fields[] = {
[
STATE
]
=
{
.
name
=
"STATE"
,
.
title
=
"S "
,
.
description
=
"Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)"
,
.
flags
=
0
,
},
[
PPID
]
=
{
.
name
=
"PPID"
,
.
title
=
" PPID "
,
.
description
=
"Parent process ID"
,
.
flags
=
0
,
},
[
PGRP
]
=
{
.
name
=
"PGRP"
,
.
title
=
" PGRP "
,
.
description
=
"Process group ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ESN
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ID
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
TTY_NR
]
=
{
.
name
=
"TTY_NR"
,
.
title
=
"TTY "
,
.
description
=
"Controlling terminal"
,
.
flags
=
0
,
},
[
TPGID
]
=
{
.
name
=
"TPGID"
,
.
title
=
" TPGID "
,
.
description
=
"Process ID of the fg process group of the controlling terminal"
,
.
flags
=
0
,
},
[
FLAGS
]
=
{
.
name
=
"FLAGS"
,
.
title
=
NULL
,
.
description
=
NULL
,
.
flags
=
0
,
},
...
...
@@ -227,7 +227,7 @@ ProcessPidColumn Process_pidColumns[] = {
{
.
id
=
TPGID
,
.
label
=
"TPGID"
},
{
.
id
=
TGID
,
.
label
=
"TGID"
},
{
.
id
=
PGRP
,
.
label
=
"PGRP"
},
{
.
id
=
SESSION
,
.
label
=
"S
ESN
"
},
{
.
id
=
SESSION
,
.
label
=
"S
ID
"
},
{
.
id
=
OOM
,
.
label
=
"OOM"
},
{
.
id
=
0
,
.
label
=
NULL
},
};
...
...
This diff is collapsed.
Click to expand it.
unsupported/Platform.c
View file @
84bc00a2
...
...
@@ -38,7 +38,7 @@ ProcessFieldData Process_fields[] = {
[
STATE
]
=
{
.
name
=
"STATE"
,
.
title
=
"S "
,
.
description
=
"Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)"
,
.
flags
=
0
,
},
[
PPID
]
=
{
.
name
=
"PPID"
,
.
title
=
" PPID "
,
.
description
=
"Parent process ID"
,
.
flags
=
0
,
},
[
PGRP
]
=
{
.
name
=
"PGRP"
,
.
title
=
" PGRP "
,
.
description
=
"Process group ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ESN
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
SESSION
]
=
{
.
name
=
"SESSION"
,
.
title
=
" S
ID
"
,
.
description
=
"Process's session ID"
,
.
flags
=
0
,
},
[
TTY_NR
]
=
{
.
name
=
"TTY_NR"
,
.
title
=
" TTY "
,
.
description
=
"Controlling terminal"
,
.
flags
=
0
,
},
[
TPGID
]
=
{
.
name
=
"TPGID"
,
.
title
=
" TPGID "
,
.
description
=
"Process ID of the fg process group of the controlling terminal"
,
.
flags
=
0
,
},
[
MINFLT
]
=
{
.
name
=
"MINFLT"
,
.
title
=
" MINFLT "
,
.
description
=
"Number of minor faults which have not required loading a memory page from disk"
,
.
flags
=
0
,
},
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help