diff options
| -rw-r--r-- | darwin/DarwinProcessList.c | 14 | ||||
| -rw-r--r-- | openbsd/OpenBSDProcessList.c | 9 |
2 files changed, 11 insertions, 12 deletions
diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c index d45ac09c..f4933aee 100644 --- a/darwin/DarwinProcessList.c +++ b/darwin/DarwinProcessList.c @@ -40,14 +40,14 @@ void ProcessList_getHostInfo(host_basic_info_data_t *p) { mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT; if(0 != host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)p, &info_size)) { - err(2, "Unable to retrieve host info\n"); + CRT_fatalError("Unable to retrieve host info\n"); } } void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p) { if(NULL != p && NULL != *p) { if(0 != munmap(*p, vm_page_size)) { - err(8, "Unable to free old CPU load information\n"); + CRT_fatalError("Unable to free old CPU load information\n"); } } @@ -60,7 +60,7 @@ unsigned ProcessList_allocateCPULoadInfo(processor_cpu_load_info_t *p) { // TODO Improving the accuracy of the load counts woule help a lot. if(0 != host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &cpu_count, (processor_info_array_t *)p, &info_size)) { - err(4, "Unable to retrieve CPU info\n"); + CRT_fatalError("Unable to retrieve CPU info\n"); } return cpu_count; @@ -70,7 +70,7 @@ void ProcessList_getVMStats(vm_statistics64_t p) { mach_msg_type_number_t info_size = HOST_VM_INFO64_COUNT; if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info_t)p, &info_size) != 0) - err(9, "Unable to retrieve VM statistics\n"); + CRT_fatalError("Unable to retrieve VM statistics\n"); } struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) { @@ -83,14 +83,14 @@ struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) { */ *count = 0; if (sysctl(mib, 4, NULL, count, NULL, 0) < 0) - err(5, "Unable to get size of kproc_infos"); + CRT_fatalError("Unable to get size of kproc_infos"); processes = malloc(*count); if (processes == NULL) - errx(6, "Out of memory for kproc_infos"); + CRT_fatalError("Out of memory for kproc_infos"); if (sysctl(mib, 4, processes, count, NULL, 0) < 0) - err(7, "Unable to get kinfo_procs"); + CRT_fatalError("Unable to get kinfo_procs"); *count = *count / sizeof(struct kinfo_proc); diff --git a/openbsd/OpenBSDProcessList.c b/openbsd/OpenBSDProcessList.c index 0dad4534..210328aa 100644 --- a/openbsd/OpenBSDProcessList.c +++ b/openbsd/OpenBSDProcessList.c @@ -13,7 +13,6 @@ in the source distribution for its full text. #include <unistd.h> #include <stdlib.h> #include <errno.h> -#include <err.h> #include <sys/types.h> #include <sys/param.h> #include <sys/proc.h> @@ -60,7 +59,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui size = sizeof(fscale); if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) - err(1, "fscale sysctl call failed"); + CRT_fatalError("fscale sysctl call failed"); for (i = 0; i < pl->cpuCount; i++) { fpl->cpus[i].totalTime = 1; @@ -90,7 +89,7 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) { size_t size = sizeof(uvmexp); if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) < 0) { - err(1, "uvmexp sysctl call failed"); + CRT_fatalError("uvmexp sysctl call failed"); } //kb_pagesize = uvmexp.pagesize / 1024; @@ -133,11 +132,11 @@ char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in argv = kvm_getargv(kd, kproc, 500); if (argv == NULL) - err(1, "kvm call failed"); + CRT_fatalError("kvm call failed"); str = buf = malloc(len+1); if (str == NULL) - err(1, "out of memory"); + CRT_fatalError("out of memory"); while (*argv != NULL) { cpsz = MIN(len, strlen(*argv)); |