Changeset 8565a42 in mainline for kernel/generic/include/proc

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/generic/include/proc

Files:

• task.h (modified) (6 diffs)
• thread.h (modified) (15 diffs)

kernel/generic/include/proc/task.h

@@ -73 +73 @@
         /** Task's linkage for the tasks_tree AVL tree. */
         avltree_node_t tasks_tree_node;
-        
+
         /** Task lock.
          *
@@ -80 +80 @@
          */
         IRQ_SPINLOCK_DECLARE(lock);
-        
+
         char name[TASK_NAME_BUFLEN];
         /** List of threads contained in this task. */
@@ -90 +90 @@
         /** Task security container. */
         container_id_t container;
-        
+
         /** Number of references (i.e. threads). */
         atomic_t refcount;
         /** Number of threads that haven't exited yet. */
         atomic_t lifecount;
-        
+
         /** Task permissions. */
         perm_t perms;
@@ -101 +101 @@
         /** Capabilities */
         cap_info_t *cap_info;
-        
+
         /* IPC stuff */
 
@@ -120 +120 @@
         /** IPC statistics */
         stats_ipc_t ipc_info;
-        
+
 #ifdef CONFIG_UDEBUG
         /** Debugging stuff. */
         udebug_task_t udebug;
-        
+
         /** Kernel answerbox. */
         kbox_t kb;
 #endif /* CONFIG_UDEBUG */
-        
+
         /** Architecture specific task data. */
         task_arch_t arch;
-        
+
         struct futex_cache {
                 /** CHT mapping virtual addresses of futex variables to futex objects.*/
@@ -141 +141 @@
                 work_t destroy_work;
         } *futexes;
-        
+
         /** Accumulated accounting. */
         uint64_t ucycles;

kernel/generic/include/proc/thread.h

@@ -75 +75 @@
         link_t wq_link;  /**< Wait queue link. */
         link_t th_link;  /**< Links to threads within containing task. */
-        
+
         /** Threads linkage to the threads_tree. */
         avltree_node_t threads_tree_node;
-        
+
         /** Lock protecting thread structure.
          *
@@ -84 +84 @@
          */
         IRQ_SPINLOCK_DECLARE(lock);
-        
+
         char name[THREAD_NAME_BUFLEN];
-        
+
         /** Function implementing the thread. */
         void (*thread_code)(void *);
         /** Argument passed to thread_code() function. */
         void *thread_arg;
-        
+
         /**
          * From here, the stored context is restored
@@ -97 +97 @@
          */
         context_t saved_context;
-        
+
         /**
          * From here, the stored timeout context
@@ -103 +103 @@
          */
         context_t sleep_timeout_context;
-        
+
         /**
          * From here, the stored interruption context
@@ -109 +109 @@
          */
         context_t sleep_interruption_context;
-        
+
         /** If true, the thread can be interrupted from sleep. */
         bool sleep_interruptible;
@@ -118 +118 @@
         /** Flag signalling sleep timeout in progress. */
         volatile bool timeout_pending;
-        
+
         /**
          * True if this thread is executing copy_from_uspace().
@@ -124 +124 @@
          */
         bool in_copy_from_uspace;
-        
+
         /**
          * True if this thread is executing copy_to_uspace().
@@ -130 +130 @@
          */
         bool in_copy_to_uspace;
-        
+
         /**
          * If true, the thread will not go to sleep at all and will call
@@ -136 +136 @@
          */
         bool interrupted;
-        
+
         /** If true, thread_join_timeout() cannot be used on this thread. */
         bool detached;
@@ -143 +143 @@
         /** Link used in the joiner_head list. */
         link_t joiner_link;
-        
+
         fpu_context_t *saved_fpu_context;
         bool fpu_context_exists;
-        
+
         /*
          * Defined only if thread doesn't run.
@@ -153 +153 @@
          */
         bool fpu_context_engaged;
-        
+
         /* The thread will not be migrated if nomigrate is non-zero. */
         unsigned int nomigrate;
-        
+
         /** Thread state. */
         state_t state;
-        
+
         /** Thread CPU. */
         cpu_t *cpu;
@@ -170 +170 @@
         /** Thread is executed in user space. */
         bool uspace;
-        
+
         /** Ticks before preemption. */
         uint64_t ticks;
-        
+
         /** Thread accounting. */
         uint64_t ucycles;
@@ -181 +181 @@
         /** Thread doesn't affect accumulated accounting. */
         bool uncounted;
-        
+
         /** Thread's priority. Implemented as index to CPU->rq */
         int priority;
@@ -195 +195 @@
         /** True if the worker will block in order to become idle. Use workq->lock. */
         bool workq_idling;
-        
+
         /** RCU thread related data. Protected by its own locks. */
         rcu_thread_data_t rcu;
-        
+
         /** Architecture-specific data. */
         thread_arch_t arch;
-        
+
         /** Thread's kernel stack. */
         uint8_t *kstack;
-        
+
 #ifdef CONFIG_UDEBUG
         /**
@@ -211 +211 @@
          */
         bool btrace;
-        
+
         /** Debugging stuff */
         udebug_thread_t udebug;