Changeset 908bb96 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2012-11-22T21:42:36Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e32720ff

Parents:

1dbc43f

Message:

Postpone printing the message about killing a task due to a failed late
reservation request until it is clear the task is going to be kiiled.

File:

• kernel/generic/src/mm/as.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -1363 +1363 @@
 int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
 {
+        int rc = AS_PF_FAULT;
+
         if (!THREAD)
                 goto page_fault;
@@ -1423 +1425 @@
          * Resort to the backend page fault handler.
          */
-        if (area->backend->page_fault(area, page, access) != AS_PF_OK) {
+        rc = area->backend->page_fault(area, page, access);
+        if (rc != AS_PF_OK) {
                 page_table_unlock(AS, false);
                 mutex_unlock(&area->lock);
@@ -1444 +1447 @@
                 istate_set_retaddr(istate,
                     (uintptr_t) &memcpy_to_uspace_failover_address);
+        } else if (rc == AS_PF_SILENT) {
+                printf("Killing task %" PRIu64 " due to a "
+                    "failed late reservation request.\n", TASK->taskid);
+                task_kill_self(true);
         } else {
                 fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);