Index: uspace/app/ps/Makefile =================================================================== --- uspace/app/ps/Makefile (revision 07640dfd0f06086a843fa228d6305345338c4f0c) +++ uspace/app/ps/Makefile (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) @@ -32,5 +32,6 @@ SOURCES = \ - ps.c + ps.c \ + func.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/ps/func.c =================================================================== --- uspace/app/ps/func.c (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) +++ uspace/app/ps/func.c (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ps + * @{ + */ + +/** + * @file + * @brief Miscellaneous functions. + */ + +#include + +#include "func.h" + +void order(const uint64_t val, uint64_t *rv, char *suffix) +{ + if (val > 10000000000000000000ULL) { + *rv = val / 1000000000000000000ULL; + *suffix = 'Z'; + } else if (val > 1000000000000000000ULL) { + *rv = val / 1000000000000000ULL; + *suffix = 'E'; + } else if (val > 1000000000000000ULL) { + *rv = val / 1000000000000ULL; + *suffix = 'T'; + } else if (val > 1000000000000ULL) { + *rv = val / 1000000000ULL; + *suffix = 'G'; + } else if (val > 1000000000ULL) { + *rv = val / 1000000ULL; + *suffix = 'M'; + } else if (val > 1000000ULL) { + *rv = val / 1000ULL; + *suffix = 'k'; + } else { + *rv = val; + *suffix = ' '; + } +} + +/** @} + */ Index: uspace/app/ps/func.h =================================================================== --- uspace/app/ps/func.h (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) +++ uspace/app/ps/func.h (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ps + * @{ + */ +/** @file + */ + +#ifndef FUNC_H_ +#define FUNC_H_ + +extern void order(const uint64_t val, uint64_t *rv, char *suffix); + +#endif + +/** @} + */ Index: uspace/app/ps/ps.c =================================================================== --- uspace/app/ps/ps.c (revision 07640dfd0f06086a843fa228d6305345338c4f0c) +++ uspace/app/ps/ps.c (revision ea55bc4de5768018b35ca09e60ec4f2e79c979d0) @@ -41,6 +41,7 @@ #include #include -/* #include */ #include + +#include "func.h" #define TASK_COUNT 10 @@ -70,5 +71,5 @@ } - printf(" ID Threads Pages [k]uCycles [k]kCycles Cycle fault Name\n"); + printf(" ID Threads Pages uCycles kCycles Cycle fault Name\n"); int i; @@ -76,8 +77,12 @@ task_info_t taskinfo; get_task_info(tasks[i], &taskinfo); - printf("%8llu %8u %8u %12llu %12llu %12llu %s\n", tasks[i], - taskinfo.thread_count, taskinfo.pages, taskinfo.ucycles / 1000, - taskinfo.kcycles / 1000, (taskinfo.ucycles + taskinfo.kcycles) - - taskinfo.cycles, taskinfo.name); + uint64_t ucycles, kcycles, fault; + char usuffix, ksuffix, fsuffix; + order(taskinfo.ucycles, &ucycles, &usuffix); + order(taskinfo.kcycles, &kcycles, &ksuffix); + order((taskinfo.kcycles + taskinfo.ucycles) - taskinfo.cycles, &fault, &fsuffix); + printf("%8llu %8u %8u %12llu%c %12llu%c %12llu%c %s\n", tasks[i], + taskinfo.thread_count, taskinfo.pages, ucycles, usuffix, + kcycles, ksuffix, fault, fsuffix, taskinfo.name); } } @@ -101,11 +106,15 @@ int i; - printf(" ID State CPU Prio [k]uCycles [k]kcycles Cycle fault\n"); + printf(" ID State CPU Prio [k]uCycles [k]kcycles Cycle fault\n"); for (i = 0; i < result; ++i) { - printf("%6llu %-8s %4u %6d %12llu %12llu %12llu\n", threads[i].tid, + uint64_t ucycles, kcycles, fault; + char usuffix, ksuffix, fsuffix; + order(threads[i].ucycles, &ucycles, &usuffix); + order(threads[i].kcycles, &kcycles, &ksuffix); + order((threads[i].kcycles + threads[i].ucycles) - threads[i].cycles, &fault, &fsuffix); + printf("%6llu %-8s %4u %6d %12llu%c %12llu%c %12llu%c\n", threads[i].tid, thread_states[threads[i].state], threads[i].cpu, - threads[i].priority, threads[i].ucycles / 1000, - threads[i].kcycles / 1000, - threads[i].ucycles + threads[i].kcycles - threads[i].cycles); + threads[i].priority, ucycles, usuffix, + kcycles, ksuffix, fault, fsuffix); } }