Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added updated darwin support for Apple Silicon Macs and new Software Updates #2

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Added updated darwin support for Apple Silicon Macs and new Software Updates #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31193e2
Update darwin_sigar.c
Ishaanahuja7 Nov 5, 2022
1f81fb7
Update darwin_sigar.c
Ishaanahuja7 Nov 5, 2022
0ec7a64
Update darwin_sigar.c
Ishaanahuja7 Nov 6, 2022
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
47 changes: 46 additions & 1 deletion src/os/darwin/darwin_sigar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,42 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 120001)
struct nfsstats {
uint64_t attrcache_hits;
uint64_t attrcache_misses;
uint64_t lookupcache_hits;
uint64_t lookupcache_misses;
uint64_t direofcache_hits;
uint64_t direofcache_misses;
uint64_t biocache_reads;
uint64_t read_bios;
uint64_t read_physios;
uint64_t biocache_writes;
uint64_t write_bios;
uint64_t write_physios;
uint64_t biocache_readlinks;
uint64_t readlink_bios;
uint64_t biocache_readdirs;
uint64_t readdir_bios;
uint64_t rpccnt[NFS_NPROCS];
uint64_t rpcretries;
uint64_t srvrpccnt[NFS_NPROCS];
uint64_t srvrpc_errs;
uint64_t srv_errs;
uint64_t rpcrequests;
uint64_t rpctimeouts;
uint64_t rpcunexpected;
uint64_t rpcinvalid;
uint64_t srvcache_inproghits;
uint64_t srvcache_idemdonehits;
uint64_t srvcache_nonidemdonehits;
uint64_t srvcache_misses;
uint64_t srvvop_writes;
uint64_t pageins;
uint64_t pageouts;
};
#endif
#endif

#include <dlfcn.h>
Expand Down Expand Up @@ -2619,7 +2655,16 @@ int sigar_os_sys_info_get(sigar_t *sigar,
"%s.%d",
sysinfo->vendor_version, version_fix);

if (version_major == 10) {
if (version_major == 13) {
codename = "Ventura";
}
else if (version_major == 12) {
codename = "Monterey";
}
else if (version_major == 11) {
codename = "Big Sur";
}
else if (version_major == 10) {
switch (version_minor) {
case 2:
codename = "Jaguar";
Expand Down