Changeset 92c1680 in mainline

Timestamp:

2013-09-09T21:13:57Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2e2c18a1

Parents:

ee7f78a

Message:

Run-time core dump enable/disable.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/corecfg/Makefile (added)
• uspace/app/corecfg/corecfg.c (added)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/corecfg.c (added)
• uspace/lib/c/include/corecfg.h (added)
• uspace/lib/c/include/ipc/corecfg.h (added)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/srv/taskmon/taskmon.c (modified) (5 diffs)

boot/Makefile.common

@@ -165 +165 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/devctl/devctl \
         $(USPACE_PATH)/app/dltest/dltest \

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
         app/dnscfg \

uspace/lib/c/Makefile

@@ -65 +65 @@
         generic/cfg.c \
         generic/clipboard.c \
+        generic/corecfg.c \
         generic/devman.c \
         generic/device/hw_res.c \

uspace/lib/c/include/ipc/services.h

@@ -53 +53 @@
 } services_t;
 
+#define SERVICE_NAME_CORECFG    "corecfg"
 #define SERVICE_NAME_DNSR       "net/dnsr"
 #define SERVICE_NAME_INET       "net/inet"

uspace/srv/taskmon/taskmon.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <task.h>
 #include <event.h>
+#include <ipc/corecfg.h>
+#include <loc.h>
 #include <macros.h>
 #include <errno.h>
@@ -47 +49 @@
 #define NAME  "taskmon"
 
+static bool write_core_files;
+
+static void corecfg_client_conn(ipc_callid_t , ipc_call_t *, void *);
+
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
         const char *fname;
         char *s_taskid;
+        char *dump_fname;
         int rc;
 
@@ -69 +76 @@
         fname = "/app/taskdump";
 
-#ifdef CONFIG_WRITE_CORE_FILES
-        char *dump_fname;
+        if (write_core_files) {
+                if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) {
+                        printf("Memory allocation failed.\n");
+                        return;
+                }
 
-        if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) {
-                printf("Memory allocation failed.\n");
-                return;
+                printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid);
+                rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
+                    NULL);
+        } else {
+                printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
+                rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
         }
 
-        printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid);
-        rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
-            NULL);
-#else
-        printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
-        rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
-#endif
         if (rc != EOK) {
                 printf("%s: Error spawning %s (%s).\n", NAME, fname,
                     str_error(rc));
+        }
+}
+
+static void corecfg_get_enable_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        async_answer_1(iid, EOK, write_core_files);
+}
+
+static void corecfg_set_enable_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        write_core_files = IPC_GET_ARG1(*icall);
+        async_answer_0(iid, EOK);
+}
+
+static void corecfg_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        /* Accept the connection */
+        async_answer_0(iid, EOK);
+
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                sysarg_t method = IPC_GET_IMETHOD(call);
+
+                if (!method) {
+                        /* The other side has hung up */
+                        async_answer_0(callid, EOK);
+                        return;
+                }
+
+                switch (method) {
+                case CORECFG_GET_ENABLE:
+                        corecfg_get_enable_srv(callid, &call);
+                        break;
+                case CORECFG_SET_ENABLE:
+                        corecfg_set_enable_srv(callid, &call);
+                        break;
+                }
         }
 }
@@ -94 +138 @@
         printf("%s: Task Monitoring Service\n", NAME);
         
+#ifdef CONFIG_WRITE_CORE_FILES
+        write_core_files = true;
+#else
+        write_core_files = false;
+#endif
         if (event_subscribe(EVENT_FAULT, 0) != EOK) {
                 printf("%s: Error registering fault notifications.\n", NAME);
+                return -1;
+        }
+        
+        async_set_client_connection(corecfg_client_conn);
+        
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Failed registering server (%d).\n",
+                    NAME, rc);
+                return -1;
+        }
+        
+        service_id_t sid;
+        rc = loc_service_register(SERVICE_NAME_CORECFG, &sid);
+        if (rc != EOK) {
+                printf("%s: Failed registering service (%d).\n",
+                    NAME, rc);
                 return -1;
         }