Changeset 15d0046 in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/srv/taskmon/taskmon.c (modified) (5 diffs)

uspace/srv/taskmon/taskmon.c

@@ -40 +40 @@
 #include <sys/typefmt.h>
 #include <task.h>
-#include <event.h>
 #include <ipc/corecfg.h>
 #include <loc.h>
@@ -53 +52 @@
 static void corecfg_client_conn(ipc_callid_t , ipc_call_t *, void *);
 
-static void fault_event(ipc_callid_t callid, ipc_call_t *call)
+static void fault_event(ipc_callid_t callid, ipc_call_t *call, void *arg)
 {
         const char *fname;
@@ -83 +82 @@
 
                 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,
+                rc = task_spawnl(NULL, 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);
+                rc = task_spawnl(NULL, NULL, fname, fname, "-t", s_taskid, NULL);
         }
 
@@ -143 +142 @@
         write_core_files = false;
 #endif
-        if (event_subscribe(EVENT_FAULT, 0) != EOK) {
+        if (async_event_subscribe(EVENT_FAULT, fault_event, NULL) != EOK) {
                 printf("%s: Error registering fault notifications.\n", NAME);
                 return -1;
@@ -165 +164 @@
         }
         
-        async_set_interrupt_received(fault_event);
         task_retval(0);
         async_manager();