config: more tweaks

[oweals/busybox.git] / coreutils / nproc.c

diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 0ae55e70a827744fca1ab93d600431747fdac17a..31e452bc4e5ae17c7aa561a450fa73f559f71a82 100644 (file)
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see LICENSE in this source tree
  */
 //config:config NPROC
-//config:      bool "nproc (248 bytes)"
+//config:      bool "nproc (3.7 kb)"
 //config:      default y
 //config:      help
 //config:      Print number of CPUs
@@ -14,10 +14,14 @@
 //kbuild:lib-$(CONFIG_NPROC) += nproc.o
 
 //usage:#define nproc_trivial_usage
-//usage:       ""
-//TODO: "[--all] [--ignore=N]"
+//usage:       ""IF_LONG_OPTS("--all --ignore=N")
 //usage:#define nproc_full_usage "\n\n"
-//usage:       "Print number of CPUs"
+//usage:       "Print number of available CPUs"
+//usage:       IF_LONG_OPTS(
+//usage:     "\n"
+//usage:     "\n       --all           Number of installed CPUs"
+//usage:     "\n       --ignore=N      Exclude N CPUs"
+//usage:       )
 
 #include <sched.h>
 #include "libbb.h"
@@ -26,14 +30,30 @@ int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        unsigned long mask[1024];
-       unsigned i, count = 0;
-
-       //applet_long_options = ...;
-       //getopt32(argv, "");
-
-       //if --all, count /sys/devices/system/cpu/cpuN dirs, else:
+       int count = 0;
+#if ENABLE_LONG_OPTS
+       int ignore = 0;
+       int opts = getopt32long(argv, "\xfe:+",
+                       "ignore\0" Required_argument "\xfe"
+                       "all\0"    No_argument       "\xff"
+                       , &ignore
+       );
 
+       if (opts & (1 << 1)) {
+               DIR *cpusd = opendir("/sys/devices/system/cpu");
+               if (cpusd) {
+                       struct dirent *de;
+                       while (NULL != (de = readdir(cpusd))) {
+                               char *cpuid = strstr(de->d_name, "cpu");
+                               if (cpuid && isdigit(cpuid[strlen(cpuid) - 1]))
+                                       count++;
+                       }
+                       closedir(cpusd);
+               }
+       } else
+#endif
        if (sched_getaffinity(0, sizeof(mask), (void*)mask) == 0) {
+               int i;
                for (i = 0; i < ARRAY_SIZE(mask); i++) {
                        unsigned long m = mask[i];
                        while (m) {
@@ -43,8 +63,11 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                        }
                }
        }
-       if (count == 0)
-               count++;
+
+       IF_LONG_OPTS(count -= ignore;)
+       if (count <= 0)
+               count = 1;
+
        printf("%u\n", count);
 
        return 0;