8000 keep scan thread for version before high sierra by pmalhaire · Pull Request #728 · hishamhm/htop · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

keep scan thread for version before high sierra #728

Merged
hishamhm merged 2 commits into from
Mar 25, 2018
Merged

keep scan thread for version before high sierra #728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9c38b
keep scan thread for version before high sierra 13.0.0 and after 13.3.0
pmalhaire Feb 6, 2018
08dbac0
compact version test code for osx
pmalhaire Feb 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions darwin/DarwinProcessList.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,34 @@ in the source distribution for its full text.
#include <sys/mman.h>
#include <utmpx.h>
#include <err.h>
#include <sys/sysctl.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_));
}

int CompareKernelVersion(short int major, short int minor, short int component) {
struct kern k;
GetKernelVersion(&k);
if ( k.version[0] != major) return major - k.version[0];
if ( k.version[1] != minor) return minor - k.version[1];
if ( k.version[2] != component) return component - k.version[2];
return 0;
}

/*{
#include "ProcessList.h"
Expand Down Expand Up @@ -170,9 +198,13 @@ void ProcessList_goThroughEntries(ProcessList* super) {

DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
DarwinProcess_setFromLibprocPidinfo(proc, dpl);

// Disabled due to bug in macOS High Sierra
// DarwinProcess_scanThreads(proc);

// Disabled for High Sierra due to bug in macOS High Sierra
bool isScanThreadSupported = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0);

if (isScanThreadSupported){
DarwinProcess_scanThreads(proc);
}

super->totalTasks += 1;

Expand Down
0