Refactor saturatingSub() to be part of Macros.h

tangyiyong · Jun 26, 2021 · 2f5b3ef · 2f5b3ef
1 parent e42ae55
commit 2f5b3ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Macros.h b/Macros.h
@@ -69,4 +69,9 @@
 #define IGNORE_WCASTQUAL_END
 #endif
 
+/* This subtraction is used by NetBSD / OpenBSD for calculation of CPU usage items. */
+static inline unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
+   return a > b ? a - b : 0;
+}
+
 #endif
diff --git a/netbsd/NetBSDProcessList.c b/netbsd/NetBSDProcessList.c
@@ -242,10 +242,6 @@ static void NetBSDProcessList_scanProcs(NetBSDProcessList* this) {
    }
 }
 
-static unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
-   return a > b ? a - b : 0;
-}
-
 static void getKernelCPUTimes(int cpuId, u_int64_t* times) {
    const int mib[] = { CTL_KERN, KERN_CP_TIME, cpuId };
    size_t length = sizeof(*times) * CPUSTATES;

diff --git a/openbsd/OpenBSDProcessList.c b/openbsd/OpenBSDProcessList.c
@@ -351,10 +351,6 @@ static void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) {
    }
 }
 
-static unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
-   return a > b ? a - b : 0;
-}
-
 static void getKernelCPUTimes(int cpuId, u_int64_t* times) {
    const int mib[] = { CTL_KERN, KERN_CPTIME2, cpuId };
    size_t length = sizeof(*times) * CPUSTATES;