From b44c790e41e281965955a83408f35ea53ecdb3d2 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 09:29:43 +0000 Subject: *: fix various kinds of damage to letter 'c' in Arkadiusz Mickiewicz' surname. chrt,taskset,dc,eject: shrink crontab: call "vi" with just name, no path watchdog: intercept all fatal signals function old new delta xstrtoull_range - 35 +35 static.sg_commands - 18 +18 packed_usage 23698 23712 +14 watchdog_main 148 151 +3 crontab_main 637 638 +1 base 1 - -1 static.ps 4 - -4 pointer 4 - -4 stack_machine 99 92 -7 run_command 273 260 -13 eject_main 360 343 -17 static.C 30 12 -18 ptok 61 38 -23 xstrtol_range 27 - -27 get_token 35 - -35 taskset_main 586 550 -36 chrt_main 411 372 -39 dc_main 158 117 -41 time_main 1127 1037 -90 ------------------------------------------------------------------------------ (add/remove: 2/5 grow/shrink: 3/9 up/down: 71/-355) Total: -284 bytes text data bss dec hex filename 793680 662 7420 801762 c3be2 busybox_old 793327 662 7412 801401 c3a79 busybox_unstripped --- miscutils/taskset.c | 88 +++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 39 deletions(-) (limited to 'miscutils/taskset.c') diff --git a/miscutils/taskset.c b/miscutils/taskset.c index e64fd655b..6247aa869 100644 --- a/miscutils/taskset.c +++ b/miscutils/taskset.c @@ -39,61 +39,71 @@ static char *__from_cpuset(cpu_set_t *mask) #define from_cpuset(mask) (*(unsigned*)(void*)&(mask)) #endif -#define OPT_p 1 int taskset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int taskset_main(int argc, char **argv) +int taskset_main(int argc ATTRIBUTE_UNUSED, char **argv) { - cpu_set_t mask, new_mask; + cpu_set_t mask; pid_t pid = 0; - unsigned opt; - const char *state = "current\0new"; - char *p_opt = NULL, *aff = NULL; + unsigned opt_p; + const char *current_new; + char *pid_str; + char *aff = aff; /* for compiler */ - opt = getopt32(argv, "+p:", &p_opt); + opt_complementary = "-1"; /* at least 1 arg */ + opt_p = getopt32(argv, "+p"); + argv += optind; - if (opt & OPT_p) { - if (argc == optind+1) { /* -p */ - aff = p_opt; - p_opt = argv[optind]; - } - argv += optind; /* me -p */ - pid = xatoul_range(p_opt, 1, ULONG_MAX); /* -p */ - } else - aff = *++argv; /* */ - if (aff) { - unsigned i = 0; - unsigned long l = xstrtol_range(aff, 0, 1, LONG_MAX); - - CPU_ZERO(&new_mask); - while (i < CPU_SETSIZE && l >= (1< ...rest.is.ignored..." */ + aff = pid_str; + pid_str = *argv; /* NB: *argv != NULL in this case */ } + /* else it was just "-p ", and *argv == NULL */ + pid = xatoul_range(pid_str, 1, ((unsigned)(pid_t)ULONG_MAX) >> 1); + } else { + aff = *argv++; /* */ + if (!*argv) + bb_show_usage(); } - if (opt & OPT_p) { + current_new = "current\0new"; + if (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_perror_msg_and_die("can't %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. */ + pid, current_new, from_cpuset(mask)); + if (!*argv) { + /* Either it was just "-p ", + * or it was "-p " and we came here + * for the second time (see goto below) */ return EXIT_SUCCESS; + } + *argv = NULL; + current_new += 8; /* "new" */ } - 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; + { /* Affinity was specified, translate it into cpu_set_t */ + unsigned i; + /* Do not allow zero mask: */ + unsigned long long m = xstrtoull_range(aff, 0, 1, ULLONG_MAX); + CPU_ZERO(&mask); + for (i = 0; i < CPU_SETSIZE; i++) { + unsigned long long bit = (1ULL << i); + if (bit & m) + CPU_SET(i, &mask); + } } - ++argv; + + /* Set pid's or our own (pid==0) affinity */ + if (sched_setaffinity(pid, sizeof(mask), &mask)) + bb_perror_msg_and_die("can't %cet pid %d's affinity", 's', pid); + + if (!*argv) /* "-p [...ignored...]" */ + goto print_aff; /* print new affinity and exit */ + BB_EXECVP(*argv, argv); bb_simple_perror_msg_and_die(*argv); } -#undef OPT_p -#undef TASKSET_PRINTF_MASK -#undef from_cpuset -- cgit v1.2.3-55-g6feb