← Commit list

0e5254191

Denis Vlasenko
Denis Vlasenko
2008-07-11
FAILED Duration: 24s

Subject

taskset: fix some careless code in both fancy and non-fancy cases. -5 bytes for fancy, +5 for non-fancy

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

libbb/mode_string.c +2 -2miscutils/last.c +2 -0miscutils/taskset.c +35 -13
libbb/mode_string.c+2 -2
@@ -48,7 +48,7 @@ static const mode_t mode_flags[] = {
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
-/* 0123456789abcdef */
+/***************************************** 0123456789abcdef */
static const char mode_chars[7] ALIGN1 = "rwxSTst";
const char* FAST_FUNC bb_mode_string(mode_t mode)
@@ -88,7 +88,7 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
static const char type_chars[16] = "?pc?d?b?-?l?s???";
-/* 0123456789abcdef */
+/********************************** 0123456789abcdef */
static const char mode_chars[7] = "rwxSTst";
const char* FAST_FUNC bb_mode_string(mode_t mode)
miscutils/last.c+2 -0
@@ -117,6 +117,8 @@ int last_main(int argc, char **argv UNUSED_PARAM)
strcpy(ut.ut_line, "system boot");
}
}
+ /* manpages say ut_tv.tv_sec *is* time_t,
+ * but some systems have it wrong */
t_tmp = (time_t)ut.ut_tv.tv_sec;
printf("%-10s %-14s %-18s %-12.12s\n",
ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
miscutils/taskset.c+35 -13
@@ -11,31 +11,53 @@
#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)
+static char *from_cpuset(cpu_set_t *mask)
{
int i;
- char *ret = 0, *str = xzalloc(9);
+ char *ret = NULL;
+ char *str = xzalloc((CPU_SETSIZE / 4) + 1); /* we will leak it */
for (i = CPU_SETSIZE - 4; i >= 0; i -= 4) {
- char val = 0;
+ int val = 0;
int off;
for (off = 0; off <= 3; ++off)
- if (CPU_ISSET(i+off, mask))
- val |= 1<<off;
-
+ if (CPU_ISSET(i + off, mask))
+ val |= 1 << off;
if (!ret && val)
ret = str;
- *str++ = (val-'0'<=9) ? (val+48) : (val+87);
+ *str++ = bb_hexdigits_upcase[val] | 0x20;
}
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))
+#define TASKSET_PRINTF_MASK "%llx"
+static unsigned long long from_cpuset(cpu_set_t *mask)
+{
+ struct BUG_CPU_SETSIZE_is_too_small {
+ char BUG_CPU_SETSIZE_is_too_small[
+ CPU_SETSIZE < sizeof(int) ? -1 : 1];
+ };
+ char *p = (void*)mask;
+
+ /* Take the least significant bits. Careful!
+ * Consider both CPU_SETSIZE=4 and CPU_SETSIZE=1024 cases
+ */
+#if BB_BIG_ENDIAN
+ /* For big endian, it means LAST bits */
+ if (CPU_SETSIZE < sizeof(long))
+ p += CPU_SETSIZE - sizeof(int);
+ else if (CPU_SETSIZE < sizeof(long long))
+ p += CPU_SETSIZE - sizeof(long);
+ else
+ p += CPU_SETSIZE - sizeof(long long);
+#endif
+ if (CPU_SETSIZE < sizeof(long))
+ return *(unsigned*)p;
+ if (CPU_SETSIZE < sizeof(long long))
+ return *(unsigned long*)p;
+ return *(unsigned long long*)p;
+}
#endif
@@ -78,7 +100,7 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
if (sched_getaffinity(pid, sizeof(mask), &mask) < 0)
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, current_new, from_cpuset(mask));
+ pid, current_new, from_cpuset(&mask));
if (!*argv) {
/* Either it was just "-p <pid>",
* or it was "-p <aff> <pid>" and we came here