Changeset aec2ad4 in mainline for uspace/app

Timestamp:

2011-02-04T11:48:33Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

103a3626

Parents:

ba5ab09 (diff), 3597dab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development

Location:

uspace/app

Files:

• stats/stats.c (modified) (3 diffs)
• tasks/Makefile (deleted)
• tasks/tasks.c (deleted)
• top/screen.c (modified) (2 diffs)
• usbinfo/dump.c (modified) (2 diffs)
• usbinfo/info.c (modified) (7 diffs)
• usbinfo/main.c (modified) (6 diffs)
• usbinfo/usbinfo.h (modified) (2 diffs)

uspace/app/stats/stats.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Stanislav Kozina
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -36 +37 @@
 
 #include <stdio.h>
+#include <task.h>
+#include <thread.h>
 #include <stats.h>
-#include <sys/time.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <malloc.h>
 #include <inttypes.h>
-#include <malloc.h>
-
-#define NAME  "sysstat"
+#include <bool.h>
+#include <str.h>
+#include <arg_parse.h>
+
+#define NAME  "stats"
 
 #define DAY     86400
@@ -47 +54 @@
 #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;
 }

uspace/app/top/screen.c

@@ -274 +274 @@
 {
         screen_style_inverted();
-        printf("[taskid] [threads] [resident] [%%resi] [virtual] [%%virt]"
+        printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]"
             " [%%user] [%%kern] [name");
         screen_newline();
@@ -303 +303 @@
                 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);

uspace/app/usbinfo/dump.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup usbinfo
  * @{
  */
 /**
  * @file
- * @brief USB querying.
+ * USB querying.
  */
 
@@ -96 +96 @@
 void dump_usb_descriptor(uint8_t *descriptor, size_t size)
 {
+        printf("Device descriptor:\n");
         usb_dump_standard_descriptor(stdout, get_indent(0), "\n",
             descriptor, size);

uspace/app/usbinfo/info.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup usbinfo
  * @{
  */
 /**
  * @file
- * @brief
+ * Dumping of generic device properties.
  */
 #include <stdio.h>
@@ -38 +38 @@
 #include <errno.h>
 #include <usb/usbdrv.h>
+#include <usb/pipes.h>
+#include <usb/request.h>
 #include "usbinfo.h"
 
-int dump_device(int hc_phone, usb_address_t address)
+int dump_device(devman_handle_t hc_handle, usb_address_t address)
 {
+        int rc;
+        usb_device_connection_t wire;
+        usb_endpoint_pipe_t ctrl_pipe;
+        ctrl_pipe.hc_phone = -1;
+
+        int hc_phone = devman_device_connect(hc_handle, 0);
+        if (hc_phone < 0) {
+                fprintf(stderr,
+                    NAME ": failed to connect to host controller (%zu): %s.\n",
+                        (size_t) hc_handle, str_error(hc_phone));
+                return hc_phone;
+        }
+
         /*
          * Dump information about possible match ids.
@@ -47 +62 @@
         match_id_list_t match_id_list;
         init_match_ids(&match_id_list);
-        int rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
+        rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch match ids of the device: %s.\n",
                     str_error(rc));
-                return rc;
+                goto leave;
         }
         dump_match_ids(&match_id_list);
+
+        /*
+         * Initialize pipes.
+         */
+        rc = usb_device_connection_initialize(&wire, hc_handle, address);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to create connection to the device: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+        rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, &wire);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to create default control pipe: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+        rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to start session on control pipe: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
 
         /*
@@ -60 +100 @@
          */
         usb_standard_device_descriptor_t device_descriptor;
-        usb_dprintf(NAME, 1,
-            "usb_drv_req_get_device_descriptor(%d, %d, %p)\n",
-            hc_phone, (int) address, &device_descriptor);
-
-        rc = usb_drv_req_get_device_descriptor(hc_phone, address,
-            &device_descriptor);
+        rc = usb_request_get_device_descriptor(&ctrl_pipe, &device_descriptor);
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch standard device descriptor: %s.\n",
                     str_error(rc));
-                return rc;
+                goto leave;
         }
         dump_usb_descriptor((uint8_t *)&device_descriptor, sizeof(device_descriptor));
@@ -79 +114 @@
         usb_standard_configuration_descriptor_t config_descriptor;
         int config_index = 0;
-        usb_dprintf(NAME, 1,
-            "usb_drv_req_get_bare_configuration_descriptor(%d, %d, %d, %p)\n",
-            hc_phone, (int) address, config_index, &config_descriptor);
-
-        rc = usb_drv_req_get_bare_configuration_descriptor(hc_phone, address,
-            config_index, &config_descriptor );
+        rc = usb_request_get_bare_configuration_descriptor(&ctrl_pipe,
+            config_index, &config_descriptor);
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch standard configuration descriptor: %s.\n",
                     str_error(rc));
-                return rc;
+                goto leave;
         }
         //dump_standard_configuration_descriptor(config_index, &config_descriptor);
 
         void *full_config_descriptor = malloc(config_descriptor.total_length);
-        usb_dprintf(NAME, 1,
-            "usb_drv_req_get_full_configuration_descriptor(%d, %d, %d, %p, %zu)\n",
-            hc_phone, (int) address, config_index,
-            full_config_descriptor, config_descriptor.total_length);
-
-        rc = usb_drv_req_get_full_configuration_descriptor(hc_phone, address,
+        rc = usb_request_get_full_configuration_descriptor(&ctrl_pipe,
             config_index,
             full_config_descriptor, config_descriptor.total_length, NULL);
@@ -106 +132 @@
                     NAME ": failed to fetch full configuration descriptor: %s.\n",
                     str_error(rc));
-                return rc;
+                goto leave;
         }
 
@@ -112 +138 @@
             config_descriptor.total_length);
 
-        return EOK;
+        rc = EOK;
+leave:
+        /* Ignoring errors here. */
+        ipc_hangup(hc_phone);
+        usb_endpoint_pipe_end_session(&ctrl_pipe);
+
+        return rc;
 }
 

uspace/app/usbinfo/main.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup usbinfo
  * @{
  */
 /**
  * @file
- * @brief USB querying.
+ * USB querying.
  */
 
@@ -77 +77 @@
 }
 
-static int set_new_host_controller(int *phone, const char *path)
+static int get_host_controller_handle(const char *path,
+    devman_handle_t *hc_handle)
 {
         int rc;
-        int tmp_phone;
 
-        if (path[0] != '/') {
-                int hc_class_index = (int) strtol(path, NULL, 10);
-                char *dev_path;
-                rc = asprintf(&dev_path, "class/usbhc\\%d", hc_class_index);
-                if (rc < 0) {
-                        internal_error(rc);
-                        return rc;
-                }
-                devmap_handle_t handle;
-                rc = devmap_device_get_handle(dev_path, &handle, 0);
-                if (rc < 0) {
-                        fprintf(stderr,
-                            NAME ": failed getting handle of `devman://%s'.\n",
-                            dev_path);
-                        free(dev_path);
-                        return rc;
-                }
-                tmp_phone = devmap_device_connect(handle, 0);
-                if (tmp_phone < 0) {
-                        fprintf(stderr,
-                            NAME ": could not connect to `%s'.\n",
-                            dev_path);
-                        free(dev_path);
-                        return tmp_phone;
-                }
-                free(dev_path);
-        } else {
-                devman_handle_t handle;
-                rc = devman_device_get_handle(path, &handle, 0);
-                if (rc != EOK) {
-                        fprintf(stderr,
-                            NAME ": failed getting handle of `devmap::/%s'.\n",
-                            path);
-                        return rc;
-                }
-                tmp_phone = devman_device_connect(handle, 0);
-                if (tmp_phone < 0) {
-                        fprintf(stderr,
-                            NAME ": could not connect to `%s'.\n",
-                            path);
-                        return tmp_phone;
-                }
+        devman_handle_t handle;
+        rc = devman_device_get_handle(path, &handle, 0);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed getting handle of `devman::/%s'.\n",
+                    path);
+                return rc;
         }
-
-        *phone = tmp_phone;
+        *hc_handle = handle;
 
         return EOK;
 }
 
-static int connect_with_address(int hc_phone, const char *str_address)
+static int get_device_address(const char *str_address, usb_address_t *address)
 {
-        usb_address_t address = (usb_address_t) strtol(str_address, NULL, 0);
-        if ((address < 0) || (address >= USB11_ADDRESS_MAX)) {
+        usb_address_t addr = (usb_address_t) strtol(str_address, NULL, 0);
+        if ((addr < 0) || (addr >= USB11_ADDRESS_MAX)) {
                 fprintf(stderr, NAME ": USB address out of range.\n");
                 return ERANGE;
         }
 
-        if (hc_phone < 0) {
-                fprintf(stderr, NAME ": no active host controller.\n");
-                return ENOENT;
-        }
-
-        return dump_device(hc_phone, address);
+        *address = addr;
+        return EOK;
 }
 
@@ -150 +110 @@
 int main(int argc, char *argv[])
 {
-        int hc_phone = -1;
+        devman_handle_t hc_handle = (devman_handle_t) -1;
+        usb_address_t device_address = (usb_address_t) -1;
 
         if (argc <= 1) {
@@ -175 +136 @@
                         case 'a':
                         case ACTION_DEVICE_ADDRESS: {
-                                int rc = connect_with_address(hc_phone, optarg);
+                                int rc = get_device_address(optarg,
+                                    &device_address);
                                 if (rc != EOK) {
                                         return rc;
@@ -184 +146 @@
                         case 't':
                         case ACTION_HOST_CONTROLLER: {
-                                int rc = set_new_host_controller(&hc_phone,
-                                    optarg);
+                                int rc = get_host_controller_handle(optarg,
+                                   &hc_handle);
                                 if (rc != EOK) {
                                         return rc;
@@ -202 +164 @@
         } while (i != -1);
 
+        if ((hc_handle == (devman_handle_t) -1)
+            || (device_address == (usb_address_t) -1)) {
+                fprintf(stderr, NAME ": no target specified.\n");
+                return EINVAL;
+        }
+
+        dump_device(hc_handle, device_address);
+
         return 0;
 }

uspace/app/usbinfo/usbinfo.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup usbinfo
  * @{
  */
 /** @file
- * @brief Common header for usbinfo application.
+ * Common header for usbinfo application.
  */
 #ifndef USBINFO_USBINFO_H_
@@ -47 +47 @@
 void dump_match_ids(match_id_list_t *matches);
 void dump_usb_descriptor(uint8_t *, size_t);
-int dump_device(int, usb_address_t);
+int dump_device(devman_handle_t, usb_address_t);
 void dump_descriptor_tree(uint8_t *, size_t);