Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/procps/mpstat.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/procps/mpstat.c (modified) (4 diffs)

branches/3.3/mindi-busybox/procps/mpstat.c

@@ -523 +523 @@
     char buf[1024];
 
-    fp = fopen_for_read(PROCFS_STAT);
-    if (!fp)
-        return;
+    fp = xfopen_for_read(PROCFS_STAT);
 
     while (fgets(buf, sizeof(buf), fp)) {
         //bb_error_msg("/proc/stat:'%s'", buf);
-        if (strncmp(buf, "intr ", 5) == 0) {
+        if (is_prefixed_with(buf, "intr ")) {
             /* Read total number of IRQs since system boot */
             sscanf(buf + 5, "%"FMT_DATA"u", &irq->irq_nr);
@@ -645 +643 @@
     unsigned long uptime_sec, decimal;
 
-    fp = fopen_for_read(PROCFS_UPTIME);
-    if (!fp)
-        return;
+    fp = xfopen_for_read(PROCFS_UPTIME);
     if (fgets(buf, sizeof(buf), fp)) {
         if (sscanf(buf, "%lu.%lu", &uptime_sec, &decimal) == 2) {
@@ -776 +772 @@
 /* Initialization */
 
-/* Get number of clock ticks per sec */
-static ALWAYS_INLINE unsigned get_hz(void)
-{
-    return sysconf(_SC_CLK_TCK);
-}
-
 static void alloc_struct(int cpus)
 {
@@ -874 +864 @@
 
     /* Get number of clock ticks per sec */
-    G.hz = get_hz();
+    G.hz = bb_clk_tck();
 
     /* Calculate number of interrupts per processor */