Linux: add process column whether it is marked a container process

Might be useful for some users and for debugging the
hideRunningInContainer detection.

4 files changed, 19 insertions, 1 deletions

diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index b97a9ad7..61fb10e9 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -106,6 +106,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
    [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
    [AUTOGROUP_ID] = { .name = "AUTOGROUP_ID", .title = "AGRP", .description = "The autogroup identifier of the process", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
    [AUTOGROUP_NICE] = { .name = "AUTOGROUP_NICE", .title = " ANI", .description = "Nice value (the higher the value, the more other processes take priority) associated with the process autogroup", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
+   [ISCONTAINER] = { .name = "ISCONTAINER", .title = "CONT ", .description = "Whether the process is running inside a child container", .flags = PROCESS_FLAG_LINUX_CONTAINER, },
 #ifdef SCHEDULER_SUPPORT
    [SCHEDULERPOLICY] = { .name = "SCHEDULERPOLICY", .title = "SCHED ", .description = "Current scheduling policy of the process", .flags = PROCESS_FLAG_SCHEDPOL, },
 #endif
@@ -336,6 +337,19 @@ static void LinuxProcess_rowWriteField(const Row* super, RichString* str, Proces
          xSnprintf(buffer, n, "N/A ");
       }
       break;
+   case ISCONTAINER:
+      switch (this->isRunningInContainer) {
+      case TRI_ON:
+         xSnprintf(buffer, n, "YES  ");
+         break;
+      case TRI_OFF:
+         xSnprintf(buffer, n, "NO   ");
+         break;
+      default:
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, "N/A  ");
+      }
+      break;
    default:
       Process_writeField(this, str, field);
       return;
@@ -438,6 +452,8 @@ static int LinuxProcess_compareByKey(const Process* v1, const Process* v2, Proce
    }
    case GPU_TIME:
       return SPACESHIP_NUMBER(p1->gpu_time, p2->gpu_time);
+   case ISCONTAINER:
+      return SPACESHIP_NUMBER(v1->isRunningInContainer, v2->isRunningInContainer);
    default:
       return Process_compareByKey_Base(v1, v2, key);
    }
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 5a1e6272..fafd7d00 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -30,6 +30,7 @@ in the source distribution for its full text.
 #define PROCESS_FLAG_LINUX_DELAYACCT 0x00040000
 #define PROCESS_FLAG_LINUX_AUTOGROUP 0x00080000
 #define PROCESS_FLAG_LINUX_GPU       0x00100000
+#define PROCESS_FLAG_LINUX_CONTAINER 0x00200000
 
 typedef struct LinuxProcess_ {
    Process super;
diff --git a/linux/LinuxProcessTable.c b/linux/LinuxProcessTable.c
index 7044314e..2f8e4a5e 100644
--- a/linux/LinuxProcessTable.c
+++ b/linux/LinuxProcessTable.c
@@ -1590,7 +1590,7 @@ static bool LinuxProcessTable_recurseProcTree(LinuxProcessTable* this, openat_ar
       }
 
       if (ss->flags & PROCESS_FLAG_LINUX_CTXT
-         || (hideRunningInContainer && proc->isRunningInContainer == TRI_INITIAL)
+         || ((hideRunningInContainer || ss->flags & PROCESS_FLAG_LINUX_CONTAINER) && proc->isRunningInContainer == TRI_INITIAL)
 #ifdef HAVE_VSERVER
          || ss->flags & PROCESS_FLAG_LINUX_VSERVER
 #endif
diff --git a/linux/ProcessField.h b/linux/ProcessField.h
index 735423b9..47c4199f 100644
--- a/linux/ProcessField.h
+++ b/linux/ProcessField.h
@@ -50,6 +50,7 @@ in the source distribution for its full text.
    M_PRIV = 131,                 \
    GPU_TIME = 132,               \
    GPU_PERCENT = 133,            \
+   ISCONTAINER = 134,            \
    // End of list