Index: uspace/app/stats/stats.c =================================================================== --- uspace/app/stats/stats.c (revision ea6a824f790b7d7257ea2c78d21cb8409ba556e9) +++ uspace/app/stats/stats.c (revision 2b9646335943ad9872daddeaffee9b749d2830c1) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Stanislav Kozina + * Copyright (c) 2010 Martin Decky * All rights reserved. * @@ -36,10 +37,16 @@ #include +#include +#include #include -#include +#include +#include +#include #include -#include - -#define NAME "sysstat" +#include +#include +#include + +#define NAME "stats" #define DAY 86400 @@ -47,39 +54,260 @@ #define MINUTE 60 -int main(int argc, char *argv[]) -{ - struct timeval time; - if (gettimeofday(&time, NULL) != 0) { - fprintf(stderr, "%s: Cannot get time of day\n", NAME); - return -1; - } - - uint64_t sec = time.tv_sec; - printf("%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64, - (sec % DAY) / HOUR, (sec % HOUR) / MINUTE, sec % MINUTE); - +static void list_tasks(void) +{ + size_t count; + stats_task_t *stats_tasks = stats_get_tasks(&count); + + if (stats_tasks == NULL) { + fprintf(stderr, "%s: Unable to get tasks\n", NAME); + return; + } + + printf("[taskid] [thrds] [resident] [virtual] [ucycles]" + " [kcycles] [name\n"); + + size_t i; + for (i = 0; i < count; i++) { + uint64_t resmem, virtmem, ucycles, kcycles; + char resmem_suffix, virtmem_suffix, usuffix, ksuffix; + + order_suffix(stats_tasks[i].resmem, &resmem, &resmem_suffix); + order_suffix(stats_tasks[i].virtmem, &virtmem, &virtmem_suffix); + order_suffix(stats_tasks[i].ucycles, &ucycles, &usuffix); + order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix); + + printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c %8" PRIu64 "%c" + " %8" PRIu64 "%c %8" PRIu64 "%c %s\n", + stats_tasks[i].task_id, stats_tasks[i].threads, + resmem, resmem_suffix, virtmem, virtmem_suffix, + ucycles, usuffix, kcycles, ksuffix, stats_tasks[i].name); + } + + free(stats_tasks); +} + +static void list_threads(task_id_t task_id, bool all) +{ + size_t count; + stats_thread_t *stats_threads = stats_get_threads(&count); + + if (stats_threads == NULL) { + fprintf(stderr, "%s: Unable to get threads\n", NAME); + return; + } + + printf("[taskid] [threadid] [state ] [prio] [cpu ] [ucycles] [kcycles]\n"); + + size_t i; + for (i = 0; i < count; i++) { + if ((all) || (stats_threads[i].task_id == task_id)) { + uint64_t ucycles, kcycles; + char usuffix, ksuffix; + + order_suffix(stats_threads[i].ucycles, &ucycles, &usuffix); + order_suffix(stats_threads[i].kcycles, &kcycles, &ksuffix); + + printf("%-8" PRIu64 " %-10" PRIu64 " %-8s %6d ", + stats_threads[i].task_id, stats_threads[i].thread_id, + thread_get_state(stats_threads[i].state), + stats_threads[i].priority); + + if (stats_threads[i].on_cpu) + printf("%6u ", stats_threads[i].cpu); + else + printf("(none) "); + + printf("%8" PRIu64"%c %8" PRIu64"%c\n", + ucycles, usuffix, kcycles, ksuffix); + } + } + + free(stats_threads); +} + +static void list_cpus(void) +{ + size_t count; + stats_cpu_t *cpus = stats_get_cpus(&count); + + if (cpus == NULL) { + fprintf(stderr, "%s: Unable to get CPU statistics\n", NAME); + return; + } + + printf("[id] [MHz ] [busy cycles] [idle cycles]\n"); + + size_t i; + for (i = 0; i < count; i++) { + printf("%-4u ", cpus[i].id); + if (cpus[i].active) { + uint64_t bcycles, icycles; + char bsuffix, isuffix; + + order_suffix(cpus[i].busy_cycles, &bcycles, &bsuffix); + order_suffix(cpus[i].idle_cycles, &icycles, &isuffix); + + printf("%10" PRIu16 " %12" PRIu64 "%c %12" PRIu64 "%c\n", + cpus[i].frequency_mhz, bcycles, bsuffix, + icycles, isuffix); + } else + printf("inactive\n"); + } + + free(cpus); +} + +static void print_load(void) +{ + size_t count; + load_t *load = stats_get_load(&count); + + if (load == NULL) { + fprintf(stderr, "%s: Unable to get load\n", NAME); + return; + } + + printf("%s: Load average: ", NAME); + + size_t i; + for (i = 0; i < count; i++) { + if (i > 0) + printf(" "); + + stats_print_load_fragment(load[i], 2); + } + + printf("\n"); + + free(load); +} + +static void print_uptime(void) +{ sysarg_t uptime = stats_get_uptime(); - printf(", up %" PRIun " days, %" PRIun " hours, " - "%" PRIun " minutes, %" PRIun " seconds", + printf("%s: Up %" PRIun " days, %" PRIun " hours, " + "%" PRIun " minutes, %" PRIun " seconds\n", NAME, uptime / DAY, (uptime % DAY) / HOUR, (uptime % HOUR) / MINUTE, uptime % MINUTE); - - size_t count; - load_t *load = stats_get_load(&count); - if (load != NULL) { - printf(", load average: "); - - size_t i; - for (i = 0; i < count; i++) { - if (i > 0) - printf(" "); - - stats_print_load_fragment(load[i], 2); - } - - free(load); - } - - printf("\n"); +} + +static void usage(const char *name) +{ + printf( + "Usage: %s [-t task_id] [-a] [-c] [-l] [-u]\n" \ + "\n" \ + "Options:\n" \ + "\t-t task_id\n" \ + "\t--task=task_id\n" \ + "\t\tList threads of the given task\n" \ + "\n" \ + "\t-a\n" \ + "\t--all\n" \ + "\t\tList all threads\n" \ + "\n" \ + "\t-c\n" \ + "\t--cpus\n" \ + "\t\tList CPUs\n" \ + "\n" \ + "\t-l\n" \ + "\t--load\n" \ + "\t\tPrint system load\n" \ + "\n" \ + "\t-u\n" \ + "\t--uptime\n" \ + "\t\tPrint system uptime\n" \ + "\n" \ + "\t-h\n" \ + "\t--help\n" \ + "\t\tPrint this usage information\n" + "\n" \ + "Without any options all tasks are listed\n", + name + ); +} + +int main(int argc, char *argv[]) +{ + bool toggle_tasks = true; + bool toggle_threads = false; + bool toggle_all = false; + bool toggle_cpus = false; + bool toggle_load = false; + bool toggle_uptime = false; + + task_id_t task_id = 0; + + int i; + for (i = 1; i < argc; i++) { + int off; + + /* Usage */ + if ((off = arg_parse_short_long(argv[i], "-h", "--help")) != -1) { + usage(argv[0]); + return 0; + } + + /* All threads */ + if ((off = arg_parse_short_long(argv[i], "-a", "--all")) != -1) { + toggle_tasks = false; + toggle_threads = true; + toggle_all = true; + continue; + } + + /* CPUs */ + if ((off = arg_parse_short_long(argv[i], "-c", "--cpus")) != -1) { + toggle_tasks = false; + toggle_cpus = true; + continue; + } + + /* Threads */ + if ((off = arg_parse_short_long(argv[i], "-t", "--task=")) != -1) { + // TODO: Support for 64b range + int tmp; + int ret = arg_parse_int(argc, argv, &i, &tmp, off); + if (ret != EOK) { + printf("%s: Malformed task_id '%s'\n", NAME, argv[i]); + return -1; + } + + task_id = tmp; + + toggle_tasks = false; + toggle_threads = true; + continue; + } + + /* Load */ + if ((off = arg_parse_short_long(argv[i], "-l", "--load")) != -1) { + toggle_tasks = false; + toggle_load = true; + continue; + } + + /* Uptime */ + if ((off = arg_parse_short_long(argv[i], "-u", "--uptime")) != -1) { + toggle_tasks = false; + toggle_uptime = true; + continue; + } + } + + if (toggle_tasks) + list_tasks(); + + if (toggle_threads) + list_threads(task_id, toggle_all); + + if (toggle_cpus) + list_cpus(); + + if (toggle_load) + print_load(); + + if (toggle_uptime) + print_uptime(); + return 0; } Index: uspace/app/tasks/Makefile =================================================================== --- uspace/app/tasks/Makefile (revision ea6a824f790b7d7257ea2c78d21cb8409ba556e9) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 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. -# - -USPACE_PREFIX = ../.. -BINARY = tasks - -SOURCES = \ - tasks.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/tasks/tasks.c =================================================================== --- uspace/app/tasks/tasks.c (revision ea6a824f790b7d7257ea2c78d21cb8409ba556e9) +++ (revision ) @@ -1,285 +1,0 @@ -/* - * Copyright (c) 2010 Stanislav Kozina - * Copyright (c) 2010 Martin Decky - * 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 tasks - * @brief Task lister. - * @{ - */ -/** - * @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "tasks" - -#define TASK_COUNT 10 -#define THREAD_COUNT 50 - -#define PRINT_LOAD1(x) ((x) >> 11) -#define PRINT_LOAD2(x) (((x) & 0x7ff) / 2) - -static void list_tasks(void) -{ - size_t count; - stats_task_t *stats_tasks = stats_get_tasks(&count); - - if (stats_tasks == NULL) { - fprintf(stderr, "%s: Unable to get tasks\n", NAME); - return; - } - - printf(" Task ID Threads Mem uCycles kCycles Name\n"); - - size_t i; - for (i = 0; i < count; i++) { - uint64_t virtmem, ucycles, kcycles; - char vmsuffix, usuffix, ksuffix; - - order_suffix(stats_tasks[i].virtmem, &virtmem, &vmsuffix); - order_suffix(stats_tasks[i].ucycles, &ucycles, &usuffix); - order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix); - - printf("%8" PRIu64 "%8zu %8" PRIu64 "%c %12" - PRIu64 "%c %12" PRIu64 "%c %s\n", stats_tasks[i].task_id, - stats_tasks[i].threads, virtmem, vmsuffix, ucycles, usuffix, - kcycles, ksuffix, stats_tasks[i].name); - } - - free(stats_tasks); -} - -static void list_threads(task_id_t task_id, bool all) -{ - size_t count; - stats_thread_t *stats_threads = stats_get_threads(&count); - - if (stats_threads == NULL) { - fprintf(stderr, "%s: Unable to get threads\n", NAME); - return; - } - - printf(" ThrID State CPU Prio [k]uCycles [k]kcycles Cycle fault\n"); - size_t i; - for (i = 0; i < count; i++) { - if ((all) || (stats_threads[i].task_id == task_id)) { - uint64_t ucycles, kcycles; - char usuffix, ksuffix; - - order_suffix(stats_threads[i].ucycles, &ucycles, &usuffix); - order_suffix(stats_threads[i].kcycles, &kcycles, &ksuffix); - - if (stats_threads[i].on_cpu) { - printf("%8" PRIu64 " %-8s %4u %6d %12" - PRIu64"%c %12" PRIu64"%c\n", stats_threads[i].thread_id, - thread_get_state(stats_threads[i].state), - stats_threads[i].cpu, stats_threads[i].priority, - ucycles, usuffix, kcycles, ksuffix); - } else { - printf("%8" PRIu64 " %-8s ---- %6d %12" - PRIu64"%c %12" PRIu64"%c\n", stats_threads[i].thread_id, - thread_get_state(stats_threads[i].state), - stats_threads[i].priority, - ucycles, usuffix, kcycles, ksuffix); - } - } - } - - free(stats_threads); -} - -static void print_load(void) -{ - size_t count; - load_t *load = stats_get_load(&count); - - if (load == NULL) { - fprintf(stderr, "%s: Unable to get load\n", NAME); - return; - } - - printf("%s: Load average: ", NAME); - - size_t i; - for (i = 0; i < count; i++) { - if (i > 0) - printf(" "); - - stats_print_load_fragment(load[i], 2); - } - - printf("\n"); - - free(load); -} - -static void list_cpus(void) -{ - size_t count; - stats_cpu_t *cpus = stats_get_cpus(&count); - - if (cpus == NULL) { - fprintf(stderr, "%s: Unable to get CPU statistics\n", NAME); - return; - } - - printf("%s: %zu CPU(s) detected\n", NAME, count); - - size_t i; - for (i = 0; i < count; i++) { - if (cpus[i].active) { - printf("cpu%u: %" PRIu16 " MHz, busy cycles: " - "%" PRIu64 ", idle cycles: %" PRIu64 "\n", - cpus[i].id, cpus[i].frequency_mhz, cpus[i].busy_cycles, - cpus[i].idle_cycles); - } else { - printf("cpu%u: inactive\n", cpus[i].id); - } - } - - free(cpus); -} - -static void usage() -{ - printf( - "Usage: tasks [-t task_id] [-a] [-l] [-c]\n" \ - "\n" \ - "Options:\n" \ - "\t-t task_id\n" \ - "\t--task=task_id\n" \ - "\t\tList threads of the given task\n" \ - "\n" \ - "\t-a\n" \ - "\t--all\n" \ - "\t\tList all threads\n" \ - "\n" \ - "\t-l\n" \ - "\t--load\n" \ - "\t\tPrint system load\n" \ - "\n" \ - "\t-c\n" \ - "\t--cpu\n" \ - "\t\tList CPUs\n" \ - "\n" \ - "\t-h\n" \ - "\t--help\n" \ - "\t\tPrint this usage information\n" - "\n" \ - "Without any options all tasks are listed\n" - ); -} - -int main(int argc, char *argv[]) -{ - bool toggle_tasks = true; - bool toggle_threads = false; - bool toggle_all = false; - bool toggle_load = false; - bool toggle_cpus = false; - - task_id_t task_id = 0; - - int i; - for (i = 1; i < argc; i++) { - int off; - - /* Usage */ - if ((off = arg_parse_short_long(argv[i], "-h", "--help")) != -1) { - usage(); - return 0; - } - - /* All threads */ - if ((off = arg_parse_short_long(argv[i], "-a", "--all")) != -1) { - toggle_tasks = false; - toggle_threads = true; - toggle_all = true; - continue; - } - - /* Load */ - if ((off = arg_parse_short_long(argv[i], "-l", "--load")) != -1) { - toggle_tasks = false; - toggle_load = true; - continue; - } - - /* CPUs */ - if ((off = arg_parse_short_long(argv[i], "-c", "--cpus")) != -1) { - toggle_tasks = false; - toggle_cpus = true; - continue; - } - - /* Threads */ - if ((off = arg_parse_short_long(argv[i], "-t", "--task=")) != -1) { - // TODO: Support for 64b range - int tmp; - int ret = arg_parse_int(argc, argv, &i, &tmp, off); - if (ret != EOK) { - printf("%s: Malformed task_id '%s'\n", NAME, argv[i]); - return -1; - } - - task_id = tmp; - - toggle_tasks = false; - toggle_threads = true; - continue; - } - } - - if (toggle_tasks) - list_tasks(); - - if (toggle_threads) - list_threads(task_id, toggle_all); - - if (toggle_load) - print_load(); - - if (toggle_cpus) - list_cpus(); - - return 0; -} - -/** @} - */ Index: uspace/app/top/screen.c =================================================================== --- uspace/app/top/screen.c (revision ea6a824f790b7d7257ea2c78d21cb8409ba556e9) +++ uspace/app/top/screen.c (revision 2b9646335943ad9872daddeaffee9b749d2830c1) @@ -274,5 +274,5 @@ { screen_style_inverted(); - printf("[taskid] [threads] [resident] [%%resi] [virtual] [%%virt]" + printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]" " [%%user] [%%kern] [name"); screen_newline(); @@ -303,5 +303,5 @@ order_suffix(task->virtmem, &virtmem, &virtmem_suffix); - printf("%-8" PRIu64 " %9zu %9" PRIu64 "%c ", + printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ", task->task_id, task->threads, resmem, resmem_suffix); print_percent(perc->resmem, 2);