Enhancements to ktop

main.c

 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  * Distributed under the terms of the GNU General Public License v2
  */
 
 
 #include <sys/syscall.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <debug.h>
 #include <eprintf.h>
 #include <style.h>
 
 #include "ktop.h"
 
-int Command;
+bool Halt = FALSE;
 
 bool Dump = FALSE;
-bool Trace_exit = FALSE;
+bool Trace_exit = TRUE;
 bool Trace_self = FALSE;
 
+display_fn Display = kernel_display;
+
 pid_t gettid(void) { return syscall(__NR_gettid); }
 
 u8 Ignore_pid[(MAX_PID + 4) / 8];
 pthread_mutex_t Ignore_pid_lock = PTHREAD_MUTEX_INITIALIZER;
 
 void ignore_pid(int pid)
 {
         if ((pid < 0) || (pid >= MAX_PID)) warn("pid out of range %d", pid);
 
         pthread_mutex_lock(&Ignore_pid_lock);
         Ignore_pid[pid / 8] |= (1 << (pid & 0x7));
         pthread_mutex_unlock(&Ignore_pid_lock);
 }
 
 bool do_ignore_pid(int pid)
 {
         if ((pid < 0) || (pid >= MAX_PID)) {
                 warn("pid out of range %d", pid);
                 return TRUE;
         }
         return Ignore_pid[pid / 8] & (1 << (pid & 0x7));
 }
 
 
 void cleanup(int sig)
 {
+PRd(sig);
+        if (sig) {
+                fprintf(stderr, "died because %d\n", sig);
+        }
         cleanup_collector();
         cleanup_display();
         exit(0);
 }
 
 void set_signals(void)
 {
         signal(SIGHUP,  cleanup);
         signal(SIGINT,  cleanup);
         signal(SIGQUIT, cleanup);
@@ skipping 40 matching lines @@
                 default:
                         fprintf(stderr, "unknown option %c\n", c);
                         usage();
                         break;
                 }
         }
 }
 
 void quit(void)
 {
-        Command = 1;
+        Halt = TRUE;
 }
 
 void clear(void)
 {
-        clear_display();
+        reset_reduce();
 }
 
 void commander(void)
 {
         for (;;) {
                 int c = getchar();
                 if (c == EOF) cleanup(0);
                 switch (c) {
                 case 'q':
                         quit();
                         return;
                 case 'c':
                         clear();
                         break;
+                case '<':
+                        decrease_reduce_interval();
+                        break;
+                case '>':
+                        increase_reduce_interval();
+                        break;
+                case 'i':
+                        Display = internal_display;
+                        break;
+                case 'k':
+                        Display = kernel_display;
+                        break;
+                case 'f':
+                        Display = file_system_display;
+                        break;
                 default:
                         break;  // ignore
                 }
         }
 }
 
 int main(int argc, char **argv)
 {
-        pthread_t display_thread;
+        pthread_t reduce_thread;
         int rc;
 
+        debugstderr();
+
         init(argc, argv);
 
         ignore_pid(gettid());
 
         start_collector();
 
         if (!Dump) {
-                rc = pthread_create(&display_thread, NULL, display, NULL);
+                rc = pthread_create(&reduce_thread, NULL, reduce, NULL);
         }
         commander();
 
         cleanup(0);
         return 0;
 }