Changeset fea0ce6 in mainline for uspace

Timestamp:

2010-01-23T20:20:54Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e095644

Parents:

9d3133d (diff), bc310a05 (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 task dump infrastructure.

Location:

uspace

Files:

• Makefile (modified) (2 diffs)
• app/init/init.c (modified) (3 diffs)
• app/taskdump/Makefile (added)
• app/taskdump/taskdump.c (added)
• lib/libc/generic/udebug.c (modified) (1 diff)
• lib/libc/include/udebug.h (modified) (1 diff)
• srv/taskmon/Makefile (added)
• srv/taskmon/taskmon.c (added)

uspace/Makefile

@@ -40 +40 @@
         app/mkfat \
         app/redir \
+        app/taskdump \
         app/tester \
         app/tetris \
@@ -47 +48 @@
         srv/loader \
         srv/ns \
+        srv/taskmon \
         srv/vfs \
         srv/bd/ata_bd \

uspace/app/init/init.c

@@ -233 +233 @@
 }
 
+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 +269 @@
                 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 +282 @@
                 return -2;
         }
+
+        mount_scratch();
         
         spawn("/srv/fhc");

uspace/lib/libc/generic/udebug.c

@@ -69 +69 @@
 }
 
+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)
 {

uspace/lib/libc/include/udebug.h

@@ -47 +47 @@
 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);