New upstream version 3.0.2upstream/3.0.2

1 files changed, 2 insertions, 24 deletions

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);