From 31193e2f576367d6ebb8ca177ec1f3005cf5ee30 Mon Sep 17 00:00:00 2001 From: Ishaan Ahuja Date: Sat, 5 Nov 2022 23:07:14 +0530 Subject: [PATCH 1/3] Update darwin_sigar.c --- src/os/darwin/darwin_sigar.c | 47 +++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index fbf1e6921..e8ba07392 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -29,6 +29,42 @@ #include #include #include +#if defined(__aarch64__) +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 @@ -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"; From 1f81fb782fbb1db908cfd8ab1fdcd142cb27bd7c Mon Sep 17 00:00:00 2001 From: Ishaan Ahuja Date: Sun, 6 Nov 2022 03:23:13 +0530 Subject: [PATCH 2/3] Update darwin_sigar.c --- src/os/darwin/darwin_sigar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index e8ba07392..5f708dce1 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -29,7 +29,7 @@ #include #include #include -#if defined(__aarch64__) +#if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) struct nfsstats { uint64_t attrcache_hits; uint64_t attrcache_misses; From 0ec7a64a4caa5f6c81e942026826a0eeabb829e1 Mon Sep 17 00:00:00 2001 From: Ishaan Ahuja Date: Sun, 6 Nov 2022 22:59:53 +0530 Subject: [PATCH 3/3] Update darwin_sigar.c --- src/os/darwin/darwin_sigar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index 5f708dce1..f82fbc967 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -29,7 +29,7 @@ #include #include #include -#if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) +#if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 120001) struct nfsstats { uint64_t attrcache_hits; uint64_t attrcache_misses;