Changeset 8565a42 in mainline for kernel/generic/src/synch/futex.c

Timestamp:

2018-03-02T20:34:50Z (7 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.

File:

• kernel/generic/src/synch/futex.c (modified) (21 diffs)

kernel/generic/src/synch/futex.c

@@ -157 +157 @@
 {
         task->futexes = malloc(sizeof(struct futex_cache), 0);
-        
+
         cht_create(&task->futexes->ht, 0, 0, 0, true, &task_futex_ht_ops);
-        
+
         list_initialize(&task->futexes->list);
         spinlock_initialize(&task->futexes->list_lock, "futex-list-lock");
@@ -183 +183 @@
         struct futex_cache *cache =
                 member_to_inst(work, struct futex_cache, destroy_work);
-        
+
         /*
          * Destroy the cache before manually freeing items of the cache in case
@@ -189 +189 @@
          */
         cht_destroy_unsafe(&cache->ht);
-        
+
         /* Manually free futex_ptr cache items. */
         list_foreach_safe(cache->list, cur_link, next_link) {
@@ -197 +197 @@
                 free(fut_ptr);
         }
-        
+
         free(cache);
 }
@@ -205 +205 @@
 {
         struct futex_cache *futexes = TASK->futexes;
-        
+
         /* All threads of this task have terminated. This is the last thread. */
         spinlock_lock(&futexes->list_lock);
-        
+
         list_foreach_safe(futexes->list, cur_link, next_link) {
                 futex_ptr_t *fut_ptr = member_to_inst(cur_link, futex_ptr_t, all_link);
@@ -222 +222 @@
                 futex_release_ref_locked(fut_ptr->futex);
         }
-        
+
         spinlock_unlock(&futexes->list_lock);
 }
@@ -252 +252 @@
         assert(spinlock_locked(&futex_ht_lock));
         assert(0 < futex->refcount);
-        
+
         --futex->refcount;
-        
+
         if (0 == futex->refcount) {
                 hash_table_remove(&futex_ht, &futex->paddr);
@@ -272 +272 @@
 {
         futex_t *futex = find_cached_futex(uaddr);
-        
+
         if (futex)
                 return futex;
@@ -303 +303 @@
                     (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
         }
-        
+
         spinlock_unlock(&futex_ht_lock);
         page_table_unlock(AS, false);
-        
+
         return success;
 }
@@ -314 +314 @@
 {
         cht_read_lock();
-        
+
         futex_t *futex;
         cht_link_t *futex_ptr_link = cht_find_lazy(&TASK->futexes->ht, &uaddr);
@@ -321 +321 @@
                 futex_ptr_t *futex_ptr
                         = member_to_inst(futex_ptr_link, futex_ptr_t, cht_link);
-                
+
                 futex = futex_ptr->futex;
         } else {
                 futex = NULL;
         }
-        
+
         cht_read_unlock();
-        
+
         return futex;
 }
@@ -340 +340 @@
 {
         futex_t *futex = malloc(sizeof(futex_t), 0);
-        
+
         /*
          * Find the futex object in the global futex table (or insert it
@@ -346 +346 @@
          */
         spinlock_lock(&futex_ht_lock);
-        
+
         ht_link_t *fut_link = hash_table_find(&futex_ht, &phys_addr);
-        
+
         if (fut_link) {
                 free(futex);
@@ -357 +357 @@
                 hash_table_insert(&futex_ht, &futex->ht_link);
         }
-        
+
         spinlock_unlock(&futex_ht_lock);
-        
+
         /*
          * Cache the link to the futex object for this task.
@@ -365 +365 @@
         futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t), 0);
         cht_link_t *dup_link;
-        
+
         fut_ptr->futex = futex;
         fut_ptr->uaddr = uaddr;
-        
+
         cht_read_lock();
-        
+
         /* Cache the mapping from the virtual address to the futex for this task. */
         if (cht_insert_unique(&TASK->futexes->ht, &fut_ptr->cht_link, &dup_link)) {
@@ -380 +380 @@
                 free(fut_ptr);
                 futex_release_ref_locked(futex);
-                
+
                 futex_ptr_t *dup = member_to_inst(dup_link, futex_ptr_t, cht_link);
                 futex = dup->futex;
@@ -386 +386 @@
 
         cht_read_unlock();
-        
+
         return futex;
 }
@@ -401 +401 @@
 {
         futex_t *futex = get_futex(uaddr);
-        
+
         if (!futex)
                 return (sys_errno_t) ENOENT;
@@ -428 +428 @@
 {
         futex_t *futex = get_futex(uaddr);
-        
+
         if (futex) {
                 waitq_wakeup(&futex->wq, WAKEUP_FIRST);
@@ -492 +492 @@
         const futex_ptr_t *fut_ptr1 = member_to_inst(item1, futex_ptr_t, cht_link);
         const futex_ptr_t *fut_ptr2 = member_to_inst(item2, futex_ptr_t, cht_link);
-        
+
         return fut_ptr1->uaddr == fut_ptr2->uaddr;
 }
@@ -500 +500 @@
         const futex_ptr_t *fut_ptr = member_to_inst(item, futex_ptr_t, cht_link);
         uintptr_t uaddr = *(uintptr_t*)key;
-        
+
         return fut_ptr->uaddr == uaddr;
 }