Files moved and added for supporting separate platforms.

IOPriorityPanel.c → linux/IOPriorityPanel.c

@@ -41,3 +41,4 @@ Panel* IOPriorityPanel_new(IOPriority currPrio) {
 IOPriority IOPriorityPanel_getIOPriority(Panel* this) {
    return (IOPriority) ( ((ListItem*) Panel_getSelected(this))->key );
 }
+

IOPriorityPanel.h → linux/IOPriorityPanel.h

@@ -17,4 +17,5 @@ Panel* IOPriorityPanel_new(IOPriority currPrio);
 
 IOPriority IOPriorityPanel_getIOPriority(Panel* this);
 
+
 #endif

linux/LinuxCRT.c

+/*
+htop - LinuxCRT.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"
+#include "CRT.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
+#endif
+
+void CRT_handleSIGSEGV(int sgn) {
+   (void) sgn;
+   CRT_done();
+   #ifdef __linux
+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://hisham.hm/htop\n");
+   #ifdef HAVE_EXECINFO_H
+   size_t size = backtrace(backtraceArray, sizeof(backtraceArray) / sizeof(void *));
+   fprintf(stderr, "\n Please include in your report the following backtrace: \n");
+   backtrace_symbols_fd(backtraceArray, size, 2);
+   fprintf(stderr, "\nAdditionally, in order to make the above backtrace useful,");
+   fprintf(stderr, "\nplease also run the following command to generate a disassembly of your binary:");
+   fprintf(stderr, "\n\n   objdump -d `which htop` > ~/htop.objdump");
+   fprintf(stderr, "\n\nand then attach the file ~/htop.objdump to your bug report.");
+   fprintf(stderr, "\n\nThank you for helping to improve htop!\n\n");
+   #endif
+   #else
+   fprintf(stderr, "\nUnfortunately, you seem to be using an unsupported platform!");
+   fprintf(stderr, "\nPlease contact your platform package mantainer!\n\n");
+   #endif
+   abort();
+}

linux/LinuxProcess.c

+/*
+htop - LinuxProcess.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Process.h"
+
+/*{
+
+typedef struct LinuxProcess_ {
+   Process super;
+   IOPriority ioPriority;
+} LinuxProcess;
+
+}*/
+
+/*
+[1] Note that before kernel 2.6.26 a process that has not asked for
+an io priority formally uses "none" as scheduling class, but the
+io scheduler will treat such processes as if it were in the best
+effort class. The priority within the best effort class will  be
+dynamically  derived  from  the  cpu  nice level of the process:
+io_priority = (cpu_nice + 20) / 5. -- From ionice(1) man page
+*/
+#define LinuxProcess_effectiveIOPriority(p_) (IOPriority_class(p_->ioPriority) == IOPRIO_CLASS_NONE ? IOPriority_tuple(IOPRIO_CLASS_BE, (p_->nice + 20) / 5) : p_->ioPriority)
+
+IOPriority LinuxProcess_updateIOPriority(Process* this) {
+   IOPriority ioprio = syscall(SYS_ioprio_get, IOPRIO_WHO_PROCESS, this->pid);
+   this->ioPriority = ioprio;
+   return ioprio;
+}
+
+bool LinuxProcess_setIOPriority(Process* this, IOPriority ioprio) {
+   syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, this->pid, ioprio);
+   return (Process_updateIOPriority(this) == ioprio);
+}
+
+void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field) {
+   switch (field) {
+   case IO_PRIORITY: {
+      int klass = IOPriority_class(this->ioPriority);
+      if (klass == IOPRIO_CLASS_NONE) {
+         // see note [1] above
+         snprintf(buffer, n, "B%1d ", (int) (this->nice + 20) / 5);
+      } else if (klass == IOPRIO_CLASS_BE) {
+         snprintf(buffer, n, "B%1d ", IOPriority_data(this->ioPriority));
+      } else if (klass == IOPRIO_CLASS_RT) {
+         attr = CRT_colors[PROCESS_HIGH_PRIORITY];
+         snprintf(buffer, n, "R%1d ", IOPriority_data(this->ioPriority));
+      } else if (this->ioPriority == IOPriority_Idle) {
+         attr = CRT_colors[PROCESS_LOW_PRIORITY]; 
+         snprintf(buffer, n, "id ");
+      } else {
+         snprintf(buffer, n, "?? ");
+      }
+      break;
+   }
+   default:
+      snprintf(buffer, n, "- ");
+   }
+   RichString_append(str, attr, buffer);
+   }
+}
+
+long LinuxProcess_compare(const void* v1, const void* v2) {
+   LinuxProcess *p1, *p2;
+   ProcessList *pl = ((Process*)v1)->pl;
+   if (pl->direction == 1) {
+      p1 = (LinuxProcess*)v1;
+      p2 = (LinuxProcess*)v2;
+   } else {
+      p2 = (LinuxProcess*)v1;
+      p1 = (LinuxProcess*)v2;
+   }
+   switch (pl->sortKey) {
+   case IO_PRIORITY:
+      return Process_effectiveIOPriority(p1) - Process_effectiveIOPriority(p2);
+   default:
+      return (p1->pid - p2->pid);
+   }
+   test_diff:
+   return (diff > 0) ? 1 : (diff < 0 ? -1 : 0);
+}

linux/Platform.c

+/*
+htop - linux/Platform.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "IOPriority.h"
+#include "IOPriorityPanel.h"
+
+static Htop_Reaction Platform_actionSetIOPriority(Panel* panel, ProcessList* pl, Header* header) {
+   (void) panel, (void) pl;
+   Process* p = (Process*) Panel_getSelected(panel);
+   if (!p) return HTOP_OK;
+   IOPriority ioprio = p->ioPriority;
+   Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
+   const char* fuFunctions[] = {"Set    ", "Cancel ", NULL};
+   void* set = pickFromVector(panel, ioprioPanel, 21, fuFunctions, header);
+   if (set) {
+      IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
+      bool ok = Action_foreachProcess(panel, (Action_ForeachProcessFn) Process_setIOPriority, (size_t) ioprio, NULL);
+      if (!ok)
+         beep();
+   }
+   Panel_delete((Object*)ioprioPanel);
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   keys['i'] = Platform_actionSetIOPriority;
+}

unsupported/Platform.c

+/*
+htop - unsupported/Platform.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Platform.h"
+
+/*{
+#include "Action.h"
+}*/
+
+void Platform_setBindings(Htop_Action* keys) {
+   (void) keys;
+}
+

unsupported/Platform.h

+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - unsupported/Platform.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Action.h"
+
+void Platform_setBindings(Htop_Action* keys);
+
+
+#endif

unsupported/UnsupportedCRT.c

+/*
+htop - UnsupportedCRT.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"
+#include "CRT.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void CRT_handleSIGSEGV(int sgn) {
+   (void) sgn;
+   CRT_done();
+   fprintf(stderr, "\n\nhtop " VERSION " aborting.\n");
+   fprintf(stderr, "\nUnfortunately, you seem to be using an unsupported platform!");
+   fprintf(stderr, "\nPlease contact your platform package mantainer!\n\n");
+   abort();
+}
+

unsupported/UnsupportedCRT.h

+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_UnsupportedCRT
+#define HEADER_UnsupportedCRT
+/*
+htop - UnsupportedCRT.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+void CRT_handleSIGSEGV(int sgn);
+
+
+#endif

unsupported/UnsupportedProcessList.c

+/*
+htop - UnsupportedProcessList.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProcessList.h"
+
+#include <stdlib.h>
+
+/*{
+
+}*/
+
+ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList) {
+   ProcessList* this = calloc(1, sizeof(ProcessList));
+   ProcessList_init(this, usersTable, pidWhiteList);
+
+   // Update CPU count:
+   this->cpuCount = 1;
+   this->cpus = calloc(1, sizeof(CPUData));
+   this->cpus[0].totalTime = 1;
+   this->cpus[0].totalPeriod = 1;
+   
+   return this;
+}
+
+void ProcessList_scan(ProcessList* this) {
+   (void) this;
+   // stub!
+}

unsupported/UnsupportedProcessList.h

+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_UnsupportedProcessList
+#define HEADER_UnsupportedProcessList
+/*
+htop - UnsupportedProcessList.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+
+ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList);
+
+void ProcessList_scan(ProcessList* this);
+
+#endif