From e7372d18a1a661d8c3dba9f51e1f17b5f94171a7 Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Wed, 10 Jan 2024 11:17:08 +0100
Subject: New upstream version 3.3.0

---
 TraceScreen.c | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'TraceScreen.c')

diff --git a/TraceScreen.c b/TraceScreen.c
index 90400b4..8a69b67 100644
--- a/TraceScreen.c
+++ b/TraceScreen.c
@@ -62,7 +62,7 @@ void TraceScreen_delete(Object* cast) {
 }
 
 static void TraceScreen_draw(InfoScreen* this) {
-   InfoScreen_drawTitled(this, "Trace of process %d - %s", this->process->pid, Process_getCommand(this->process));
+   InfoScreen_drawTitled(this, "Trace of process %d - %s", Process_getPid(this->process), Process_getCommand(this->process));
 }
 
 bool TraceScreen_forkTracer(TraceScreen* this) {
@@ -89,14 +89,26 @@ bool TraceScreen_forkTracer(TraceScreen* this) {
       close(fdpair[1]);
 
       char buffer[32] = {0};
-      xSnprintf(buffer, sizeof(buffer), "%d", this->super.process->pid);
-      // Use of NULL in variadic functions must have a pointer cast.
-      // The NULL constant is not required by standard to have a pointer type.
-      execlp("strace", "strace", "-T", "-tt", "-s", "512", "-p", buffer, (char *)NULL);
-
-      // Should never reach here, unless execlp fails ...
-      const char* message = "Could not execute 'strace'. Please make sure it is available in your $PATH.";
-      (void)! write(STDERR_FILENO, message, strlen(message));
+      xSnprintf(buffer, sizeof(buffer), "%d", Process_getPid(this->super.process));
+
+      #if defined(HTOP_FREEBSD) || defined(HTOP_OPENBSD) || defined(HTOP_NETBSD) || defined(HTOP_DRAGONFLYBSD) || defined(HTOP_SOLARIS)
+         // Use of NULL in variadic functions must have a pointer cast.
+         // The NULL constant is not required by standard to have a pointer type.
+         execlp("truss", "truss", "-s", "512", "-p", buffer, (void*)NULL);
+
+         // Should never reach here, unless execlp fails ...
+         const char* message = "Could not execute 'truss'. Please make sure it is available in your $PATH.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #elif defined(HTOP_LINUX)
+         execlp("strace", "strace", "-T", "-tt", "-s", "512", "-p", buffer, (void*)NULL);
+
+         // Should never reach here, unless execlp fails ...
+         const char* message = "Could not execute 'strace'. Please make sure it is available in your $PATH.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #else // HTOP_DARWIN, HTOP_PCP == HTOP_UNSUPPORTED
+         const char* message = "Tracing unavailable on not supported system.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #endif
 
       exit(127);
    }
@@ -164,20 +176,22 @@ static void TraceScreen_updateTrace(InfoScreen* super) {
 
 static bool TraceScreen_onKey(InfoScreen* super, int ch) {
    TraceScreen* this = (TraceScreen*) super;
-   switch(ch) {
+
+   switch (ch) {
       case 'f':
       case KEY_F(8):
          this->follow = !(this->follow);
          if (this->follow)
-            Panel_setSelected(super->display, Panel_size(super->display)-1);
+            Panel_setSelected(super->display, Panel_size(super->display) - 1);
          return true;
       case 't':
       case KEY_F(9):
          this->tracing = !this->tracing;
-         FunctionBar_setLabel(super->display->defaultBar, KEY_F(9), this->tracing?"Stop Tracing   ":"Resume Tracing ");
+         FunctionBar_setLabel(super->display->defaultBar, KEY_F(9), this->tracing ? "Stop Tracing   " : "Resume Tracing ");
          InfoScreen_draw(this);
          return true;
    }
+
    this->follow = false;
    return false;
 }
-- 
cgit v1.2.3