Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ uspace/Makefile (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -40,4 +40,5 @@ app/mkfat \ app/redir \ + app/taskdump \ app/tester \ app/tetris \ @@ -47,4 +48,5 @@ srv/loader \ srv/ns \ + srv/taskmon \ srv/vfs \ srv/bd/ata_bd \ Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ uspace/app/init/init.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -233,4 +233,18 @@ } +static void mount_scratch(void) +{ + int rc; + + printf("Trying to mount null/0 on /scratch... "); + fflush(stdout); + + rc = mount("tmpfs", "/scratch", "null/0", "", 0); + if (rc == EOK) + printf("OK\n"); + else + printf("Failed\n"); +} + static void mount_data(void) { @@ -255,6 +269,12 @@ return -1; } + + /* Make sure tmpfs is running. */ + if (str_cmp(STRING(RDFMT), "tmpfs") != 0) { + spawn("/srv/tmpfs"); + } spawn("/srv/devfs"); + spawn("/srv/taskmon"); if (!mount_devfs()) { @@ -262,4 +282,6 @@ return -2; } + + mount_scratch(); spawn("/srv/fhc"); Index: uspace/app/taskdump/Makefile =================================================================== --- uspace/app/taskdump/Makefile (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) +++ uspace/app/taskdump/Makefile (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Jiri Svoboda +# 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 = ../.. +LIBS = $(LIBC_PREFIX)/libc.a + +OUTPUT = taskdump + +SOURCES = \ + taskdump.c + +include ../Makefile.common Index: uspace/app/taskdump/taskdump.c =================================================================== --- uspace/app/taskdump/taskdump.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) +++ uspace/app/taskdump/taskdump.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -0,0 +1,353 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * 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 taskdump + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LINE_BYTES 16 + +#define DBUF_SIZE 4096 +static uint8_t data_buf[DBUF_SIZE]; + +static int phoneid; +static task_id_t task_id; +static bool dump_memory; + +static int connect_task(task_id_t task_id); +static int parse_args(int argc, char *argv[]); +static void print_syntax(); +static int threads_dump(void); +static int areas_dump(void); +static int area_dump(as_area_info_t *area); +static void hex_dump(uintptr_t addr, void *buffer, size_t size); + +int main(int argc, char *argv[]) +{ + int rc; + + /* + * FIXME: The stdio module cannot currently detect whether we are + * writing to a console or file. This workaround make file output + * faster. + */ + setvbuf(stdout, NULL, _IOFBF, 32768); + + printf("Task Dump Utility\n"); + dump_memory = false; + + if (parse_args(argc, argv) < 0) + return 1; + + rc = connect_task(task_id); + if (rc < 0) { + printf("Failed connecting to task %lld.\n", task_id); + return 1; + } + + printf("Dumping task %lld.\n\n", task_id); + + rc = threads_dump(); + if (rc < 0) + printf("Failed dumping threads.\n"); + + rc = areas_dump(); + if (rc < 0) + printf("Failed dumping address space areas.\n"); + + udebug_end(phoneid); + ipc_hangup(phoneid); + + return 0; +} + +static int connect_task(task_id_t task_id) +{ + int rc; + + rc = ipc_connect_kbox(task_id); + + if (rc == ENOTSUP) { + printf("You do not have userspace debugging support " + "compiled in the kernel.\n"); + printf("Compile kernel with 'Support for userspace debuggers' " + "(CONFIG_UDEBUG) enabled.\n"); + return rc; + } + + if (rc < 0) { + printf("Error connecting\n"); + printf("ipc_connect_task(%lld) -> %d ", task_id, rc); + return rc; + } + + phoneid = rc; + + rc = udebug_begin(phoneid); + if (rc < 0) { + printf("udebug_begin() -> %d\n", rc); + return rc; + } + + return 0; +} + +static int parse_args(int argc, char *argv[]) +{ + char *arg; + char *err_p; + + task_id = 0; + + --argc; ++argv; + + while (argc > 0) { + arg = *argv; + if (arg[0] == '-') { + if (arg[1] == 't' && arg[2] == '\0') { + /* Task ID */ + --argc; ++argv; + task_id = strtol(*argv, &err_p, 10); + if (*err_p) { + printf("Task ID syntax error\n"); + print_syntax(); + return -1; + } + } else if (arg[1] == 'm' && arg[2] == '\0') { + dump_memory = true; + } else { + printf("Uknown option '%s'\n", arg[0]); + print_syntax(); + return -1; + } + } else { + break; + } + + --argc; ++argv; + } + + if (task_id == 0) { + printf("Missing task ID argument\n"); + print_syntax(); + return -1; + } + + if (argc != 0) { + printf("Extra arguments\n"); + print_syntax(); + return -1; + } + + return 0; +} + +static void print_syntax() +{ + printf("Syntax: taskdump [-m] -t \n"); + printf("\t-m\tDump memory area contents.\n"); + printf("\t-t \tWhich task to dump.\n"); +} + +static int threads_dump(void) +{ + uintptr_t *thash_buf; + uintptr_t dummy_buf; + size_t buf_size, n_threads; + + size_t copied; + size_t needed; + size_t i; + int rc; + + /* TODO: See why NULL does not work. */ + rc = udebug_thread_read(phoneid, &dummy_buf, 0, &copied, &needed); + if (rc < 0) { + printf("udebug_thread_read() -> %d\n", rc); + return rc; + } + + if (needed == 0) { + printf("No threads.\n\n"); + return 0; + } + + buf_size = needed; + thash_buf = malloc(buf_size); + + rc = udebug_thread_read(phoneid, thash_buf, buf_size, &copied, &needed); + if (rc < 0) { + printf("udebug_thread_read() -> %d\n", rc); + return rc; + } + + assert(copied == buf_size); + assert(needed == buf_size); + + n_threads = copied / sizeof(uintptr_t); + + printf("Threads:\n"); + for (i = 0; i < n_threads; i++) { + printf(" [%d] hash: 0x%lx\n", 1+i, thash_buf[i]); + } + putchar('\n'); + + free(thash_buf); + + return 0; +} + +static int areas_dump(void) +{ + as_area_info_t *ainfo_buf; + as_area_info_t dummy_buf; + size_t buf_size, n_areas; + + size_t copied; + size_t needed; + size_t i; + int rc; + + rc = udebug_areas_read(phoneid, &dummy_buf, 0, &copied, &needed); + if (rc < 0) { + printf("udebug_areas_read() -> %d\n", rc); + return rc; + } + + buf_size = needed; + ainfo_buf = malloc(buf_size); + + rc = udebug_areas_read(phoneid, ainfo_buf, buf_size, &copied, &needed); + if (rc < 0) { + printf("udebug_areas_read() -> %d\n", rc); + return rc; + } + + assert(copied == buf_size); + assert(needed == buf_size); + + n_areas = copied / sizeof(as_area_info_t); + + printf("Address space areas:\n"); + for (i = 0; i < n_areas; i++) { + printf(" [%d] flags: %c%c%c%c base: 0x%lx size: 0x%lx\n", 1+i, + (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-', + (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-', + (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-', + (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-', + ainfo_buf[i].start_addr, ainfo_buf[i].size); + + if (dump_memory) { + putchar('\n'); + area_dump(&ainfo_buf[i]); + putchar('\n'); + } + } + + putchar('\n'); + + free(ainfo_buf); + + return 0; +} + +static int area_dump(as_area_info_t *area) +{ + size_t to_copy; + size_t total; + uintptr_t addr; + int rc; + + addr = area->start_addr; + total = 0; + + while (total < area->size) { + to_copy = min(area->size - total, DBUF_SIZE); + rc = udebug_mem_read(phoneid, data_buf, addr, to_copy); + if (rc < 0) { + printf("udebug_mem_read() failed.\n"); + return rc; + } + + hex_dump(addr, data_buf, to_copy); + + addr += to_copy; + total += to_copy; + } + + return EOK; +} + +static void hex_dump(uintptr_t addr, void *buffer, size_t size) +{ + uint8_t *data = (uint8_t *) buffer; + uint8_t b; + size_t pos, i; + + assert(addr % LINE_BYTES == 0); + assert(size % LINE_BYTES == 0); + + pos = 0; + + while (pos < size) { + printf("%08x:", addr + pos); + for (i = 0; i < LINE_BYTES; ++i) { + if (i % 4 == 0) putchar(' '); + printf(" %02x", data[pos + i]); + } + putchar('\t'); + + for (i = 0; i < LINE_BYTES; ++i) { + b = data[pos + i]; + if (b >= 32 && b < 127) { + putchar(b); + } else { + putchar(' '); + } + } + putchar('\n'); + pos += LINE_BYTES; + } +} + +/** @} + */ Index: uspace/lib/libc/generic/udebug.c =================================================================== --- uspace/lib/libc/generic/udebug.c (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ uspace/lib/libc/generic/udebug.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -69,4 +69,20 @@ } +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed) +{ + ipcarg_t a_copied, a_needed; + int rc; + + rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ, + (sysarg_t)buffer, n, NULL, &a_copied, &a_needed); + + *copied = (size_t)a_copied; + *needed = (size_t)a_needed; + + return rc; +} + + int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n) { Index: uspace/lib/libc/include/udebug.h =================================================================== --- uspace/lib/libc/include/udebug.h (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ uspace/lib/libc/include/udebug.h (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -47,4 +47,6 @@ int udebug_thread_read(int phoneid, void *buffer, size_t n, size_t *copied, size_t *needed); +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed); int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n); int udebug_args_read(int phoneid, thash_t tid, sysarg_t *buffer); Index: uspace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ (revision ) @@ -1,64 +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. -# - -## Setup toolchain -# - -include Makefile.common -include $(LIBC_PREFIX)/Makefile.toolchain - -## Sources -# - -SOURCES = \ - access.c \ - generic.c \ - names.c \ - i386-ports.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all - -all: $(LIBPCI) - --include $(DEPEND) - -$(LIBPCI): $(OBJECTS) - $(AR) rc $@ $(OBJECTS) - -%.o: %.c $(DEPEND) - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -ifeq ($(PRECHECK),y) - $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) -endif - -$(DEPEND): - makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null - -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libpci/Makefile.common =================================================================== --- uspace/lib/libpci/Makefile.common (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2005 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. -# - - -## Common names -# - -LIBC_PREFIX = ../../../../../lib/libc -DEPEND = Makefile.depend -DEPEND_PREV = $(DEPEND).prev -JOB = libpci.job -LIBPCI = libpci.a Index: uspace/srv/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision ae75e2e3eeabda7f649cf80e1f0e25cbb7a7386e) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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 kbd_port - * @ingroup kbd - * @{ - */ - -/** @file - * @brief i8042 port driver. - */ - -#ifndef KBD_PORT_i8042_H_ -#define KBD_PORT_i8042_H_ - -#include -#include - -struct i8042 { - ioport8_t data; - uint8_t pad[3]; - ioport8_t status; -} __attribute__ ((packed)); -typedef struct i8042 i8042_t; - -#endif - -/** - * @} - */ Index: uspace/srv/taskmon/Makefile =================================================================== --- uspace/srv/taskmon/Makefile (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) +++ uspace/srv/taskmon/Makefile (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Jiri Svoboda +# 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 = ../.. +LIBS = $(LIBC_PREFIX)/libc.a + +OUTPUT = taskmon + +SOURCES = \ + taskmon.c + +include ../Makefile.common Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) +++ uspace/srv/taskmon/taskmon.c (revision e095644fa3dee2172f750ac4b6c58a572cec9c46) @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * 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 taskmon + * @brief + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "taskmon" + +static void fault_event(ipc_callid_t callid, ipc_call_t *call) +{ + char *argv[11]; + char *fname; + char *dump_fname; + char *s_taskid; + char **s; + + task_id_t taskid; + uintptr_t thread; + + taskid = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call)); + thread = IPC_GET_ARG3(*call); + + if (asprintf(&s_taskid, "%lld", taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread); + + argv[0] = fname = "/app/redir"; + argv[1] = "-i"; + argv[2] = "/readme"; + argv[3] = "-o"; + argv[4] = dump_fname; + argv[5] = "--"; + +#ifdef CONFIG_VERBOSE_DUMPS + argv[6] = "/app/taskdump"; + argv[7] = "-m"; + argv[8] = "-t"; + argv[9] = s_taskid; + argv[10] = NULL; +#else + argv[6] = "/app/taskdump"; + argv[7] = "-t"; + argv[8] = s_taskid; + argv[9] = NULL; +#endif + printf(NAME ": Executing"); + s = argv; + while (*s != NULL) { + printf(" %s", *s); + ++s; + } + putchar('\n'); + + if (!task_spawn(fname, argv)) + printf(NAME ": Error spawning taskdump.\n", fname); +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": Task Monitoring Service\n"); + + if (event_subscribe(EVENT_FAULT, 0) != EOK) { + printf(NAME ": Error registering fault notifications.\n"); + return -1; + } + + async_set_interrupt_received(fault_event); + async_manager(); + + return 0; +} + +/** @} + */