Changeset a35b458 in mainline for kernel/generic/include/proc


Ignore:
Timestamp:
2018-03-02T20:10:49Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f1380b7
Parents:
3061bc1
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)
Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:
kernel/generic/include/proc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/proc/task.h

    r3061bc1 ra35b458  
    7373        /** Task's linkage for the tasks_tree AVL tree. */
    7474        avltree_node_t tasks_tree_node;
    75        
     75
    7676        /** Task lock.
    7777         *
    … …  
    8080         */
    8181        IRQ_SPINLOCK_DECLARE(lock);
    82        
     82
    8383        char name[TASK_NAME_BUFLEN];
    8484        /** List of threads contained in this task. */
    … …  
    9090        /** Task security container. */
    9191        container_id_t container;
    92        
     92
    9393        /** Number of references (i.e. threads). */
    9494        atomic_t refcount;
    9595        /** Number of threads that haven't exited yet. */
    9696        atomic_t lifecount;
    97        
     97
    9898        /** Task permissions. */
    9999        perm_t perms;
    … …  
    101101        /** Capabilities */
    102102        cap_info_t *cap_info;
    103        
     103
    104104        /* IPC stuff */
    105105
    … …  
    120120        /** IPC statistics */
    121121        stats_ipc_t ipc_info;
    122        
     122
    123123#ifdef CONFIG_UDEBUG
    124124        /** Debugging stuff. */
    125125        udebug_task_t udebug;
    126        
     126
    127127        /** Kernel answerbox. */
    128128        kbox_t kb;
    129129#endif /* CONFIG_UDEBUG */
    130        
     130
    131131        /** Architecture specific task data. */
    132132        task_arch_t arch;
    133        
     133
    134134        struct futex_cache {
    135135                /** CHT mapping virtual addresses of futex variables to futex objects.*/
    … …  
    141141                work_t destroy_work;
    142142        } *futexes;
    143        
     143
    144144        /** Accumulated accounting. */
    145145        uint64_t ucycles;

  • kernel/generic/include/proc/thread.h

    r3061bc1 ra35b458  
    7575        link_t wq_link;  /**< Wait queue link. */
    7676        link_t th_link;  /**< Links to threads within containing task. */
    77        
     77
    7878        /** Threads linkage to the threads_tree. */
    7979        avltree_node_t threads_tree_node;
    80        
     80
    8181        /** Lock protecting thread structure.
    8282         *
    … …  
    8484         */
    8585        IRQ_SPINLOCK_DECLARE(lock);
    86        
     86
    8787        char name[THREAD_NAME_BUFLEN];
    88        
     88
    8989        /** Function implementing the thread. */
    9090        void (*thread_code)(void *);
    9191        /** Argument passed to thread_code() function. */
    9292        void *thread_arg;
    93        
     93
    9494        /**
    9595         * From here, the stored context is restored
    … …  
    9797         */
    9898        context_t saved_context;
    99        
     99
    100100        /**
    101101         * From here, the stored timeout context
    … …  
    103103         */
    104104        context_t sleep_timeout_context;
    105        
     105
    106106        /**
    107107         * From here, the stored interruption context
    … …  
    109109         */
    110110        context_t sleep_interruption_context;
    111        
     111
    112112        /** If true, the thread can be interrupted from sleep. */
    113113        bool sleep_interruptible;
    … …  
    118118        /** Flag signalling sleep timeout in progress. */
    119119        volatile bool timeout_pending;
    120        
     120
    121121        /**
    122122         * True if this thread is executing copy_from_uspace().
    … …  
    124124         */
    125125        bool in_copy_from_uspace;
    126        
     126
    127127        /**
    128128         * True if this thread is executing copy_to_uspace().
    … …  
    130130         */
    131131        bool in_copy_to_uspace;
    132        
     132
    133133        /**
    134134         * If true, the thread will not go to sleep at all and will call
    … …  
    136136         */
    137137        bool interrupted;
    138        
     138
    139139        /** If true, thread_join_timeout() cannot be used on this thread. */
    140140        bool detached;
    … …  
    143143        /** Link used in the joiner_head list. */
    144144        link_t joiner_link;
    145        
     145
    146146        fpu_context_t *saved_fpu_context;
    147147        bool fpu_context_exists;
    148        
     148
    149149        /*
    150150         * Defined only if thread doesn't run.
    … …  
    153153         */
    154154        bool fpu_context_engaged;
    155        
     155
    156156        /* The thread will not be migrated if nomigrate is non-zero. */
    157157        unsigned int nomigrate;
    158        
     158
    159159        /** Thread state. */
    160160        state_t state;
    161        
     161
    162162        /** Thread CPU. */
    163163        cpu_t *cpu;
    … …  
    170170        /** Thread is executed in user space. */
    171171        bool uspace;
    172        
     172
    173173        /** Ticks before preemption. */
    174174        uint64_t ticks;
    175        
     175
    176176        /** Thread accounting. */
    177177        uint64_t ucycles;
    … …  
    181181        /** Thread doesn't affect accumulated accounting. */
    182182        bool uncounted;
    183        
     183
    184184        /** Thread's priority. Implemented as index to CPU->rq */
    185185        int priority;
    … …  
    195195        /** True if the worker will block in order to become idle. Use workq->lock. */
    196196        bool workq_idling;
    197        
     197
    198198        /** RCU thread related data. Protected by its own locks. */
    199199        rcu_thread_data_t rcu;
    200        
     200
    201201        /** Architecture-specific data. */
    202202        thread_arch_t arch;
    203        
     203
    204204        /** Thread's kernel stack. */
    205205        uint8_t *kstack;
    206        
     206
    207207#ifdef CONFIG_UDEBUG
    208208        /**
    … …  
    211211         */
    212212        bool btrace;
    213        
     213
    214214        /** Debugging stuff */
    215215        udebug_thread_t udebug;
Note: See TracChangeset for help on using the changeset viewer.