Changeset efdfebc in mainline for kernel/generic/include/proc/task.h

Timestamp:

2012-11-06T21:03:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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:

• kernel/generic/include/proc/task.h (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -91 +91 @@
         
         /* IPC stuff */
-        answerbox_t answerbox;  /**< Communication endpoint */
+
+        /** Receiving communication endpoint */
+        answerbox_t answerbox;
+
+        /** Sending communication endpoints */
         phone_t phones[IPC_MAX_PHONES];
-        stats_ipc_t ipc_info;   /**< IPC statistics */
-        list_t sync_boxes;      /**< List of synchronous answerboxes. */
+
+        /** Spinlock protecting the active_calls list. */
+        SPINLOCK_DECLARE(active_calls_lock);
+
+        /**
+         * List of all calls sent by this task that have not yet been
+         * answered.
+         */
+        list_t active_calls;
+
         event_t events[EVENT_TASK_END - EVENT_END];
+
+        /** IPC statistics */
+        stats_ipc_t ipc_info;
         
 #ifdef CONFIG_UDEBUG