diff options
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/Config.in | 6 | ||||
| -rw-r--r-- | miscutils/Makefile.in | 1 | ||||
| -rw-r--r-- | miscutils/taskset.c | 67 |
3 files changed, 6 insertions, 68 deletions
diff --git a/miscutils/Config.in b/miscutils/Config.in index 75a48c879..2d60fb65e 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in @@ -311,6 +311,12 @@ config CONFIG_TASKSET help Retrieve or set a processes's CPU affinity +config CONFIG_TASKSET + bool "taskset" + default n + help + Retrieve or set a processes's CPU affinity (on linux) + config CONFIG_TIME bool "time" default n diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index d60d687b0..a0b6b7233 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in @@ -28,7 +28,6 @@ MISCUTILS-$(CONFIG_RUNLEVEL) += runlevel.o MISCUTILS-$(CONFIG_RX) += rx.o MISCUTILS-$(CONFIG_SETSID) += setsid.o MISCUTILS-$(CONFIG_STRINGS) += strings.o -MISCUTILS-$(CONFIG_TASKSET) += taskset.o MISCUTILS-$(CONFIG_TIME) += time.o MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o diff --git a/miscutils/taskset.c b/miscutils/taskset.c deleted file mode 100644 index a72f3ff53..000000000 --- a/miscutils/taskset.c +++ /dev/null @@ -1,67 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * taskset - retrieve or set a processes's CPU affinity - * Copyright (c) 2006 Bernhard Fischer - * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - */ - -#include "busybox.h" -#include <sched.h> -#include <unistd.h> -#include <getopt.h> /* optind */ - -int taskset_main(int argc, char** argv) -{ - cpu_set_t mask, new_mask; - pid_t pid = 0; - unsigned long ul; - 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) - - if (ul & TASKSET_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> */ - } 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); - - CPU_ZERO(&new_mask); - while (i < CPU_SETSIZE && l >= (1<<i)) { - if ((1<<i) & l) - CPU_SET(i, &new_mask); - ++i; - } - } - - 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 (!*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) { - state += 8; - ++argv; - goto print_aff; - } - ++argv; - execvp(*argv, argv); - bb_perror_msg_and_die("%s", *argv); -} |