mirror of https://github.com/xzeldon/htop.git
Minor style fixes.
This commit is contained in:
parent
63e1417b8c
commit
657836a2ae
|
@ -21,37 +21,6 @@ in the source distribution for its full text.
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
struct kern {
|
|
||||||
short int version[3];
|
|
||||||
};
|
|
||||||
|
|
||||||
void GetKernelVersion(struct kern *k) {
|
|
||||||
static short int version_[3] = {0};
|
|
||||||
if (!version_[0]) {
|
|
||||||
// just in case it fails someday
|
|
||||||
version_[0] = version_[1] = version_[2] = -1;
|
|
||||||
char str[256] = {0};
|
|
||||||
size_t size = sizeof(str);
|
|
||||||
int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
|
|
||||||
if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
|
|
||||||
}
|
|
||||||
memcpy(k->version, version_, sizeof(version_));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* compare the given os version with the one installed returns:
|
|
||||||
0 if equals the installed version
|
|
||||||
positive value if less than the installed version
|
|
||||||
negative value if more than the installed version
|
|
||||||
*/
|
|
||||||
int CompareKernelVersion(short int major, short int minor, short int component) {
|
|
||||||
struct kern k;
|
|
||||||
GetKernelVersion(&k);
|
|
||||||
if ( k.version[0] != major) return k.version[0] - major;
|
|
||||||
if ( k.version[1] != minor) return k.version[1] - minor;
|
|
||||||
if ( k.version[2] != component) return k.version[2] - component;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
#include "ProcessList.h"
|
#include "ProcessList.h"
|
||||||
#include <mach/mach_host.h>
|
#include <mach/mach_host.h>
|
||||||
|
@ -71,6 +40,38 @@ typedef struct DarwinProcessList_ {
|
||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
typedef struct kern {
|
||||||
|
short int version[3];
|
||||||
|
} kern_;
|
||||||
|
|
||||||
|
static void getKernelVersion(struct kern *k) {
|
||||||
|
static short int version_[3] = {0};
|
||||||
|
if (!version_[0]) {
|
||||||
|
// just in case it fails someday
|
||||||
|
version_[0] = version_[1] = version_[2] = -1;
|
||||||
|
char str[256] = {0};
|
||||||
|
size_t size = sizeof(str);
|
||||||
|
int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
|
||||||
|
if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
|
||||||
|
}
|
||||||
|
memcpy(k->version, version_, sizeof(version_));
|
||||||
|
}
|
||||||
|
|
||||||
|
static int compareKernelVersion(short int major, short int minor, short int component) {
|
||||||
|
/*
|
||||||
|
compare the given os version with the one installed returns:
|
||||||
|
0 if equals the installed version
|
||||||
|
positive value if less than the installed version
|
||||||
|
negative value if more than the installed version
|
||||||
|
*/
|
||||||
|
struct kern k;
|
||||||
|
getKernelVersion(&k);
|
||||||
|
if ( k.version[0] != major) return k.version[0] - major;
|
||||||
|
if ( k.version[1] != minor) return k.version[1] - minor;
|
||||||
|
if ( k.version[2] != component) return k.version[2] - component;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void ProcessList_getHostInfo(host_basic_info_data_t *p) {
|
void ProcessList_getHostInfo(host_basic_info_data_t *p) {
|
||||||
mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT;
|
mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT;
|
||||||
|
|
||||||
|
@ -205,7 +206,7 @@ void ProcessList_goThroughEntries(ProcessList* super) {
|
||||||
DarwinProcess_setFromLibprocPidinfo(proc, dpl);
|
DarwinProcess_setFromLibprocPidinfo(proc, dpl);
|
||||||
|
|
||||||
// Disabled for High Sierra due to bug in macOS High Sierra
|
// Disabled for High Sierra due to bug in macOS High Sierra
|
||||||
bool isScanThreadSupported = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0);
|
bool isScanThreadSupported = ! ( compareKernelVersion(17, 0, 0) >= 0 && compareKernelVersion(17, 5, 0) < 0);
|
||||||
|
|
||||||
if (isScanThreadSupported){
|
if (isScanThreadSupported){
|
||||||
DarwinProcess_scanThreads(proc);
|
DarwinProcess_scanThreads(proc);
|
||||||
|
|
|
@ -26,6 +26,7 @@ typedef struct DarwinProcessList_ {
|
||||||
} DarwinProcessList;
|
} DarwinProcessList;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ProcessList_getHostInfo(host_basic_info_data_t *p);
|
void ProcessList_getHostInfo(host_basic_info_data_t *p);
|
||||||
|
|
||||||
void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p);
|
void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p);
|
||||||
|
|
Loading…
Reference in New Issue