accidentally applied wrong (old) patch, fixing up...

[oweals/busybox.git] / miscutils / taskset.c

diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index a72f3ff5300a951a1446420942a7422ae9eb28ac..a4d41ac9c3f716d3116fe5cfec33df68c4c41bc6 100644 (file)
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * taskset - retrieve or set a processes's CPU affinity
+ * taskset - retrieve or set a processes' CPU affinity
  * Copyright (c) 2006 Bernhard Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
@@ -8,33 +8,61 @@
 
 #include "busybox.h"
 #include <sched.h>
-#include <unistd.h>
 #include <getopt.h> /* optind */
 
+#if ENABLE_FEATURE_TASKSET_FANCY
+#define TASKSET_PRINTF_MASK "%s"
+#define from_cpuset(x) __from_cpuset(&x)
+/* craft a string from the mask */
+static char *__from_cpuset(cpu_set_t *mask)
+{
+       int i;
+       char *ret = 0, *str = xzalloc(9);
+
+       for (i = CPU_SETSIZE - 4; i >= 0; i -= 4) {
+               char val = 0;
+               int off;
+               for (off = 0; off <= 3; ++off)
+                       if (CPU_ISSET(i+off, mask))
+                               val |= 1<<off;
+
+               if (!ret && val)
+                       ret = str;
+               *str++ = (val-'0'<=9) ? (val+48) : (val+87);
+       }
+       return ret;
+}
+#else
+#define TASKSET_PRINTF_MASK "%x"
+/* (void*) cast is for battling gcc: */
+/* "dereferencing type-punned pointer will break strict-aliasing rules" */
+#define from_cpuset(mask) (*(unsigned*)(void*)&(mask))
+#endif
+
+#define OPT_p 1
+
 int taskset_main(int argc, char** argv)
 {
        cpu_set_t mask, new_mask;
        pid_t pid = 0;
-       unsigned long ul;
+       unsigned opt;
        const char *state = "current\0new";
        char *p_opt = NULL, *aff = NULL;
 
-       ul = bb_getopt_ulflags(argc, argv, "+p:", &p_opt);
-#define TASKSET_OPT_p (1)
+       opt = getopt32(argc, argv, "+p:", &p_opt);
 
-       if (ul & TASKSET_OPT_p) {
+       if (opt & OPT_p) {
                if (argc == optind+1) { /* -p <aff> <pid> */
                        aff = p_opt;
                        p_opt = argv[optind];
                }
                argv += optind; /* me -p <arg> */
-               pid = bb_xgetularg10_bnd(p_opt, 1, ULONG_MAX); /* -p <pid> */
+               pid = xatoul_range(p_opt, 1, ULONG_MAX); /* -p <pid> */
        } else
                aff = *++argv; /* <aff> <cmd...> */
        if (aff) {
-/*             to_cpuset(bb_xgetularg_bnd(aff, 16, 1, ULONG_MAX), &new_mask); */
                unsigned i = 0;
-               unsigned long l = bb_xgetularg_bnd(aff, 16, 1, ULONG_MAX);
+               unsigned long l = xstrtol_range(aff, 16, 1, ULONG_MAX);
 
                CPU_ZERO(&new_mask);
                while (i < CPU_SETSIZE && l >= (1<<i)) {
@@ -44,19 +72,19 @@ int taskset_main(int argc, char** argv)
                }
        }
 
-       if (ul & TASKSET_OPT_p) {
-print_aff:
-               if (sched_getaffinity(pid, sizeof (mask), &mask) < 0)
-                       bb_perror_msg_and_die("Failed to %cet pid %d's affinity", 'g', pid);
-               bb_printf("pid %d's %s affinity mask: %x\n", /* %x .. perhaps _FANCY */
-                               pid, state, mask);
+       if (opt & OPT_p) {
+ print_aff:
+               if (sched_getaffinity(pid, sizeof(mask), &mask) < 0)
+                       bb_perror_msg_and_die("failed to %cet pid %d's affinity", 'g', pid);
+               printf("pid %d's %s affinity mask: "TASKSET_PRINTF_MASK"\n",
+                               pid, state, from_cpuset(mask));
                if (!*argv) /* no new affinity given or we did print already, done. */
                        return EXIT_SUCCESS;
        }
 
-       if (sched_setaffinity(pid, sizeof (new_mask), &new_mask))
-               bb_perror_msg_and_die("Failed to %cet pid %d's affinity", 's', pid);
-       if (ul & TASKSET_OPT_p) {
+       if (sched_setaffinity(pid, sizeof(new_mask), &new_mask))
+               bb_perror_msg_and_die("failed to %cet pid %d's affinity", 's', pid);
+       if (opt & OPT_p) {
                state += 8;
                ++argv;
                goto print_aff;
@@ -65,3 +93,6 @@ print_aff:
        execvp(*argv, argv);
        bb_perror_msg_and_die("%s", *argv);
 }
+#undef OPT_p
+#undef TASKSET_PRINTF_MASK
+#undef from_cpuset