From 84bc00a275d12c1c97110714ce1b515daa211dea Mon Sep 17 00:00:00 2001 From: Kamyar Rasta Date: Wed, 1 Feb 2017 00:03:55 +0100 Subject: [PATCH] Issue #502 update Session ID column --- darwin/Platform.c | 4 ++-- freebsd/FreeBSDProcess.c | 4 ++-- htop.1.in | 2 +- linux/LinuxProcess.c | 4 ++-- unsupported/Platform.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/darwin/Platform.c b/darwin/Platform.c index 29934899..7755a01e 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -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 = " SESN ", .description = "Process's session ID", .flags = 0, }, + [SESSION] = { .name = "SESSION", .title = " SID ", .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 = "SESN" }, + { .id = SESSION, .label = "SID" }, { .id = 0, .label = NULL }, }; diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index 22e00043..9b903783 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -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 = " SESN ", .description = "Process's session ID", .flags = 0, }, + [SESSION] = { .name = "SESSION", .title = " SID ", .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 = "SESN" }, + { .id = SESSION, .label = "SID" }, { .id = 0, .label = NULL }, }; diff --git a/htop.1.in b/htop.1.in index 3bdb2984..4388be12 100644 --- a/htop.1.in +++ b/htop.1.in @@ -217,7 +217,7 @@ The parent process ID. .B PGRP The process's group ID. .TP -.B SESSION (SESN) +.B SESSION (SID) The process's session ID. .TP .B TTY_NR (TTY) diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index d0e9acd2..590d0d0b 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -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 = " SESN ", .description = "Process's session ID", .flags = 0, }, + [SESSION] = { .name = "SESSION", .title = " SID ", .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 = "SESN" }, + { .id = SESSION, .label = "SID" }, { .id = OOM, .label = "OOM" }, { .id = 0, .label = NULL }, }; diff --git a/unsupported/Platform.c b/unsupported/Platform.c index 0df3ef9f..40316b48 100644 --- a/unsupported/Platform.c +++ b/unsupported/Platform.c @@ -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 = " SESN ", .description = "Process's session ID", .flags = 0, }, + [SESSION] = { .name = "SESSION", .title = " SID ", .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, },