Changeset 336db295 in mainline


Ignore:
Timestamp:
2010-01-23T14:25:32Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a074b4f
Parents:
9d3133d
Message:

Fix THREAD_READ, add AREAS_READ Udebug method. Add task dump utility.

Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r9d3133d r336db295  
    6565        $(USPACEDIR)/app/mkfat/mkfat \
    6666        $(USPACEDIR)/app/redir/redir \
     67        $(USPACEDIR)/app/taskdump/taskdump \
    6768        $(USPACEDIR)/app/tester/tester \
    6869        $(USPACEDIR)/app/tetris/tetris \

  • kernel/generic/include/mm/as.h

    r9d3133d r336db295  
    3636#define KERN_AS_H_
    3737
     38#ifdef KERNEL
     39#include <arch/types.h>
     40#else
     41#include <sys/types.h>
     42#endif
     43
    3844/** Address space area flags. */
    3945#define AS_AREA_READ            1
    … …  
    4147#define AS_AREA_EXEC            4
    4248#define AS_AREA_CACHEABLE       8
     49
     50/** Address space area info exported to userspace. */
     51typedef struct {
     52        /** Starting address */
     53        uintptr_t start_addr;
     54
     55        /** Area size */
     56        size_t size;
     57
     58        /** Area flags */
     59        int flags;
     60} as_area_info_t;
    4361
    4462#ifdef KERNEL
    … …  
    268286
    269287/* Introspection functions. */
     288extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize);
    270289extern void as_print(as_t *as);
    271290

  • kernel/generic/include/udebug/udebug.h

    r9d3133d r336db295  
    9696 */
    9797UDEBUG_M_THREAD_READ,
     98
     99/** Read the list of the debugged task's address space areas.
     100 *
     101 * - ARG2 - destination address in the caller's address space
     102 * - ARG3 - size of receiving buffer in bytes
     103 *
     104 * The kernel fills the buffer with a series of as_area_info_t structures.
     105 * Upon answer, the kernel will set:
     106 *
     107 * - ARG2 - number of bytes that were actually copied
     108 * - ARG3 - number of bytes of the complete data
     109 *
     110 */
     111UDEBUG_M_AREAS_READ,
    98112
    99113/** Read the debugged tasks's memory.

  • kernel/generic/include/udebug/udebug_ops.h

    r9d3133d r336db295  
    4545int udebug_stop(thread_t *t, call_t *call);
    4646
    47 int udebug_thread_read(void **buffer, size_t buf_size, size_t *n);
     47int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
     48    size_t *needed);
    4849int udebug_args_read(thread_t *t, void **buffer);
    4950

  • kernel/generic/src/mm/as.c

    r9d3133d r336db295  
    19201920}
    19211921
     1922/** Get list of adress space areas.
     1923 *
     1924 * @param as            Address space.
     1925 * @param obuf          Place to save pointer to returned buffer.
     1926 * @param osize         Place to save size of returned buffer.
     1927 */
     1928void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
     1929{
     1930        ipl_t ipl;
     1931        size_t area_cnt, area_idx, i;
     1932        link_t *cur;
     1933
     1934        as_area_info_t *info;
     1935        size_t isize;
     1936
     1937        ipl = interrupts_disable();
     1938        mutex_lock(&as->lock);
     1939
     1940        /* First pass, count number of areas. */
     1941
     1942        area_cnt = 0;
     1943
     1944        for (cur = as->as_area_btree.leaf_head.next;
     1945            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
     1946                btree_node_t *node;
     1947
     1948                node = list_get_instance(cur, btree_node_t, leaf_link);
     1949                area_cnt += node->keys;
     1950        }
     1951
     1952        isize = area_cnt * sizeof(as_area_info_t);
     1953        info = malloc(isize, 0);
     1954
     1955        /* Second pass, record data. */
     1956
     1957        area_idx = 0;
     1958
     1959        for (cur = as->as_area_btree.leaf_head.next;
     1960            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
     1961                btree_node_t *node;
     1962
     1963                node = list_get_instance(cur, btree_node_t, leaf_link);
     1964
     1965                for (i = 0; i < node->keys; i++) {
     1966                        as_area_t *area = node->value[i];
     1967
     1968                        ASSERT(area_idx < area_cnt);
     1969                        mutex_lock(&area->lock);
     1970
     1971                        info[area_idx].start_addr = area->base;
     1972                        info[area_idx].size = FRAMES2SIZE(area->pages);
     1973                        info[area_idx].flags = area->flags;
     1974                        ++area_idx;
     1975
     1976                        mutex_unlock(&area->lock);
     1977                }
     1978        }
     1979
     1980        mutex_unlock(&as->lock);
     1981        interrupts_restore(ipl);
     1982
     1983        *obuf = info;
     1984        *osize = isize;
     1985}
     1986
     1987
    19221988/** Print out information about address space.
    19231989 *

  • kernel/generic/src/udebug/udebug_ipc.c

    r9d3133d r336db295  
    4141#include <proc/task.h>
    4242#include <proc/thread.h>
     43#include <mm/as.h>
    4344#include <arch.h>
    4445#include <errno.h>
    … …  
    165166static void udebug_receive_thread_read(call_t *call)
    166167{
     168        uintptr_t uspace_addr;
     169        size_t buf_size;
     170        void *buffer;
     171        size_t copied, needed;
     172        int rc;
     173
     174        uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
     175        buf_size = IPC_GET_ARG3(call->data);    /* Dest. buffer size */
     176
     177        /*
     178         * Read thread list. Variable n will be filled with actual number
     179         * of threads times thread-id size.
     180         */
     181        rc = udebug_thread_read(&buffer, buf_size, &copied, &needed);
     182        if (rc < 0) {
     183                IPC_SET_RETVAL(call->data, rc);
     184                ipc_answer(&TASK->kb.box, call);
     185                return;
     186        }
     187
     188        /*
     189         * Make use of call->buffer to transfer data to caller's userspace
     190         */
     191
     192        IPC_SET_RETVAL(call->data, 0);
     193        /* ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
     194           same code in process_answer() can be used
     195           (no way to distinguish method in answer) */
     196        IPC_SET_ARG1(call->data, uspace_addr);
     197        IPC_SET_ARG2(call->data, copied);
     198        IPC_SET_ARG3(call->data, needed);
     199        call->buffer = buffer;
     200
     201        ipc_answer(&TASK->kb.box, call);
     202}
     203
     204/** Process an AREAS_READ call.
     205 *
     206 * Returns a list of address space areas in the current task, as an array
     207 * of as_area_info_t structures.
     208 *
     209 * @param call  The call structure.
     210 */
     211static void udebug_receive_areas_read(call_t *call)
     212{
    167213        unative_t uspace_addr;
    168214        unative_t to_copy;
    169         unsigned total_bytes;
    170         unsigned buf_size;
    171         void *buffer;
    172         size_t n;
    173         int rc;
     215        size_t data_size;
     216        size_t buf_size;
     217        void *data;
    174218
    175219        uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
    … …  
    177221
    178222        /*
    179          * Read thread list. Variable n will be filled with actual number
    180          * of threads times thread-id size.
    181          */
    182         rc = udebug_thread_read(&buffer, buf_size, &n);
    183         if (rc < 0) {
    184                 IPC_SET_RETVAL(call->data, rc);
    185                 ipc_answer(&TASK->kb.box, call);
    186                 return;
    187         }
    188 
    189         total_bytes = n;
    190 
    191         /* Copy MAX(buf_size, total_bytes) bytes */
    192 
    193         if (buf_size > total_bytes)
    194                 to_copy = total_bytes;
     223         * Read area list.
     224         */
     225        as_get_area_info(AS, (as_area_info_t **) &data, &data_size);
     226
     227        /* Copy MAX(buf_size, data_size) bytes */
     228
     229        if (buf_size > data_size)
     230                to_copy = data_size;
    195231        else
    196232                to_copy = buf_size;
    … …  
    207243        IPC_SET_ARG2(call->data, to_copy);
    208244
    209         IPC_SET_ARG3(call->data, total_bytes);
    210         call->buffer = buffer;
    211 
    212         ipc_answer(&TASK->kb.box, call);
    213 }
     245        IPC_SET_ARG3(call->data, data_size);
     246        call->buffer = data;
     247
     248        ipc_answer(&TASK->kb.box, call);
     249}
     250
    214251
    215252/** Process an ARGS_READ call.
    … …  
    331368                udebug_receive_thread_read(call);
    332369                break;
     370        case UDEBUG_M_AREAS_READ:
     371                udebug_receive_areas_read(call);
     372                break;
    333373        case UDEBUG_M_ARGS_READ:
    334374                udebug_receive_args_read(call);

  • kernel/generic/src/udebug/udebug_ops.c

    r9d3133d r336db295  
    355355 *
    356356 * If the sequence is longer than @a buf_size bytes, only as much hashes
    357  * as can fit are copied. The number of thread hashes copied is stored
    358  * in @a n.
     357 * as can fit are copied. The number of bytes copied is stored in @a stored.
     358 * The total number of thread bytes that could have been saved had there been
     359 * enough space is stored in @a needed.
    359360 *
    360361 * The rationale for having @a buf_size is that this function is only
    … …  
    364365 * @param buffer        The buffer for storing thread hashes.
    365366 * @param buf_size      Buffer size in bytes.
    366  * @param n             The actual number of hashes copied will be stored here.
    367  */
    368 int udebug_thread_read(void **buffer, size_t buf_size, size_t *n)
     367 * @param stored        The actual number of bytes copied will be stored here.
     368 * @param needed        Total number of hashes that could have been saved.
     369 */
     370int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
     371    size_t *needed)
    369372{
    370373        thread_t *t;
    371374        link_t *cur;
    372375        unative_t tid;
    373         unsigned copied_ids;
     376        size_t copied_ids;
     377        size_t extra_ids;
    374378        ipl_t ipl;
    375379        unative_t *id_buffer;
    … …  
    380384
    381385        /* Allocate a buffer to hold thread IDs */
    382         id_buffer = malloc(buf_size, 0);
     386        id_buffer = malloc(buf_size + 1, 0);
    383387
    384388        mutex_lock(&TASK->udebug.lock);
    … …  
    396400        max_ids = buf_size / sizeof(unative_t);
    397401        copied_ids = 0;
     402        extra_ids = 0;
    398403
    399404        /* FIXME: make sure the thread isn't past debug shutdown... */
    400405        for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
    401                 /* Do not write past end of buffer */
    402                 if (copied_ids >= max_ids) break;
    403 
    404406                t = list_get_instance(cur, thread_t, th_link);
    405407
    … …  
    409411
    410412                /* Not interested in kernel threads. */
    411                 if ((flags & THREAD_FLAG_USPACE) != 0) {
     413                if ((flags & THREAD_FLAG_USPACE) == 0)
     414                        continue;
     415
     416                if (copied_ids < max_ids) {
    412417                        /* Using thread struct pointer as identification hash */
    413418                        tid = (unative_t) t;
    414419                        id_buffer[copied_ids++] = tid;
     420                } else {
     421                        extra_ids++;
    415422                }
    416423        }
    … …  
    422429
    423430        *buffer = id_buffer;
    424         *n = copied_ids * sizeof(unative_t);
     431        *stored = copied_ids * sizeof(unative_t);
     432        *needed = (copied_ids + extra_ids) * sizeof(unative_t);
    425433
    426434        return 0;

  • uspace/Makefile

    r9d3133d r336db295  
    4040        app/mkfat \
    4141        app/redir \
     42        app/taskdump \
    4243        app/tester \
    4344        app/tetris \

  • uspace/lib/libc/generic/udebug.c

    r9d3133d r336db295  
    6969}
    7070
     71int udebug_areas_read(int phoneid, void *buffer, size_t n,
     72        size_t *copied, size_t *needed)
     73{
     74        ipcarg_t a_copied, a_needed;
     75        int rc;
     76
     77        rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ,
     78                (sysarg_t)buffer, n, NULL, &a_copied, &a_needed);
     79
     80        *copied = (size_t)a_copied;
     81        *needed = (size_t)a_needed;
     82
     83        return rc;
     84}
     85
     86
    7187int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n)
    7288{

  • uspace/lib/libc/include/udebug.h

    r9d3133d r336db295  
    4747int udebug_thread_read(int phoneid, void *buffer, size_t n,
    4848        size_t *copied, size_t *needed);
     49int udebug_areas_read(int phoneid, void *buffer, size_t n,
     50        size_t *copied, size_t *needed);
    4951int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n);
    5052int udebug_args_read(int phoneid, thash_t tid, sysarg_t *buffer);
Note: See TracChangeset for help on using the changeset viewer.