New upstream version 3.0.2upstream/3.0.2

8 files changed, 3 insertions, 69 deletions

diff --git a/darwin/Battery.h b/darwin/Battery.h
index 8dc0cef..21a1579 100644
--- a/darwin/Battery.h
+++ b/darwin/Battery.h
@@ -1,9 +1,6 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Battery
 #define HEADER_Battery
 
 void Battery_getData(double* level, ACPresence* isOnAC);
 
-
 #endif
diff --git a/darwin/DarwinCRT.h b/darwin/DarwinCRT.h
index e1c22bb..5e08422 100644
--- a/darwin/DarwinCRT.h
+++ b/darwin/DarwinCRT.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_DarwinCRT
 #define HEADER_DarwinCRT
 /*
@@ -11,5 +9,4 @@ in the source distribution for its full text.
 
 void CRT_handleSIGSEGV(int sgn);
 
-
 #endif
diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
index bf5fd57..430b2b4 100644
--- a/darwin/DarwinProcess.c
+++ b/darwin/DarwinProcess.c
@@ -15,21 +15,6 @@ in the source distribution for its full text.
 
 #include <mach/mach.h>
 
-/*{
-#include "Settings.h"
-#include "DarwinProcessList.h"
-
-#include <sys/sysctl.h>
-
-typedef struct DarwinProcess_ {
-   Process super;
-
-   uint64_t utime;
-   uint64_t stime;
-   bool taskAccess;
-} DarwinProcess;
-
-}*/
 
 ProcessClass DarwinProcess_class = {
    .super = {
diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h
index c2058e2..cf76fa8 100644
--- a/darwin/DarwinProcess.h
+++ b/darwin/DarwinProcess.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_DarwinProcess
 #define HEADER_DarwinProcess
 /*
@@ -22,7 +20,6 @@ typedef struct DarwinProcess_ {
    bool taskAccess;
 } DarwinProcess;
 
-
 extern ProcessClass DarwinProcess_class;
 
 DarwinProcess* DarwinProcess_new(Settings* settings);
diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c
index 9b4ba11..39d99c1 100644
--- a/darwin/DarwinProcessList.c
+++ b/darwin/DarwinProcessList.c
@@ -54,28 +54,6 @@ int CompareKernelVersion(short int major, short int minor, short int component)
     return 0;
 }
 
-/*{
-#include "ProcessList.h"
-#include "zfs/ZfsArcStats.h"
-#include <mach/mach_host.h>
-#include <sys/sysctl.h>
-
-typedef struct DarwinProcessList_ {
-   ProcessList super;
-
-   host_basic_info_data_t host_info;
-   vm_statistics_data_t vm_stats;
-   processor_cpu_load_info_t prev_load;
-   processor_cpu_load_info_t curr_load;
-   uint64_t kernel_threads;
-   uint64_t user_threads;
-   uint64_t global_diff;
-
-   ZfsArcStats zfs;
-} DarwinProcessList;
-
-}*/
-
 void ProcessList_getHostInfo(host_basic_info_data_t *p) {
    mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT;
 
@@ -136,11 +114,11 @@ struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) {
    return processes;
 }
 
-ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
+ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId) {
    size_t len;
    DarwinProcessList* this = xCalloc(1, sizeof(DarwinProcessList));
 
-   ProcessList_init(&this->super, Class(Process), usersTable, pidWhiteList, userId);
+   ProcessList_init(&this->super, Class(Process), usersTable, pidMatchList, userId);
 
    /* Initialize the CPU information */
    this->super.cpuCount = ProcessList_allocateCPULoadInfo(&this->prev_load);
diff --git a/darwin/DarwinProcessList.h b/darwin/DarwinProcessList.h
index 73fbd34..c6b2966 100644
--- a/darwin/DarwinProcessList.h
+++ b/darwin/DarwinProcessList.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_DarwinProcessList
 #define HEADER_DarwinProcessList
 /*
@@ -39,7 +37,6 @@ typedef struct DarwinProcessList_ {
    ZfsArcStats zfs;
 } DarwinProcessList;
 
-
 void ProcessList_getHostInfo(host_basic_info_data_t *p);
 
 void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p);
@@ -50,7 +47,7 @@ void ProcessList_getVMStats(vm_statistics_t p);
 
 struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count);
 
-ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
+ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId);
 
 void ProcessList_delete(ProcessList* this);
 
diff --git a/darwin/Platform.c b/darwin/Platform.c
index 26e8411..a8ca45b 100644
--- a/darwin/Platform.c
+++ b/darwin/Platform.c
@@ -21,17 +21,6 @@ in the source distribution for its full text.
 
 #include <stdlib.h>
 
-/*{
-#include "Action.h"
-#include "SignalsPanel.h"
-#include "CPUMeter.h"
-#include "BatteryMeter.h"
-#include "DarwinProcess.h"
-}*/
-
-#ifndef CLAMP
-#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
-#endif
 
 ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
diff --git a/darwin/Platform.h b/darwin/Platform.h
index e17661d..7dd4ae6 100644
--- a/darwin/Platform.h
+++ b/darwin/Platform.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Platform
 #define HEADER_Platform
 /*
@@ -16,10 +14,6 @@ in the source distribution for its full text.
 #include "BatteryMeter.h"
 #include "DarwinProcess.h"
 
-#ifndef CLAMP
-#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
-#endif
-
 extern ProcessField Platform_defaultFields[];
 
 extern const SignalItem Platform_signals[];