Changeset 6f4495f5 in mainline for kernel/generic/src/synch/futex.c


Ignore:
Timestamp:
2007-01-27T17:32:13Z (18 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1ba41c5
Parents:
51baa8a
Message:

Indentaion and formatting changes even Martin will like :-)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/synch/futex.c

    r51baa8a r6f4495f5  
    103103 *
    104104 * @param uaddr Userspace address of the futex counter.
    105  * @param usec If non-zero, number of microseconds this thread is willing to sleep.
     105 * @param usec If non-zero, number of microseconds this thread is willing to
     106 *     sleep.
    106107 * @param flags Select mode of operation.
    107108 *
    108  * @return One of ESYNCH_TIMEOUT, ESYNCH_OK_ATOMIC and ESYNCH_OK_BLOCKED. See synch.h.
    109  *        If there is no physical mapping for uaddr ENOENT is returned.
     109 * @return One of ESYNCH_TIMEOUT, ESYNCH_OK_ATOMIC and ESYNCH_OK_BLOCKED. See
     110 *     synch.h. If there is no physical mapping for uaddr ENOENT is returned.
    110111 */
    111112unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags)
     
    135136        futex = futex_find(paddr);
    136137       
    137         return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
     138        return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags |
     139            SYNCH_FLAGS_INTERRUPTIBLE);
    138140}
    139141
     
    243245                                 */
    244246                                futex->refcount++;
    245                                 btree_insert(&TASK->futexes, paddr, futex, leaf);
     247                                btree_insert(&TASK->futexes, paddr, futex,
     248                                    leaf);
    246249                        }
    247250                        mutex_unlock(&TASK->futexes_lock);
     
    272275/** Compute hash index into futex hash table.
    273276 *
    274  * @param key Address where the key (i.e. physical address of futex counter) is stored.
     277 * @param key Address where the key (i.e. physical address of futex counter) is
     278 *     stored.
    275279 *
    276280 * @return Index into futex hash table.
     
    283287/** Compare futex hash table item with a key.
    284288 *
    285  * @param key Address where the key (i.e. physical address of futex counter) is stored.
     289 * @param key Address where the key (i.e. physical address of futex counter) is
     290 *     stored.
    286291 *
    287292 * @return True if the item matches the key. False otherwise.
     
    317322        mutex_lock(&TASK->futexes_lock);
    318323
    319         for (cur = TASK->futexes.leaf_head.next; cur != &TASK->futexes.leaf_head; cur = cur->next) {
     324        for (cur = TASK->futexes.leaf_head.next;
     325            cur != &TASK->futexes.leaf_head; cur = cur->next) {
    320326                btree_node_t *node;
    321327                int i;
Note: See TracChangeset for help on using the changeset viewer.