[src/trunk]: src/sys/kern Rename futex_get -> futex_lookup_create. Remove fu...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/784248bd996c
branches:  trunk
changeset: 971564:784248bd996c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Apr 28 00:54:24 2020 +0000

description:
Rename futex_get -> futex_lookup_create.  Remove futex_put.

Just use futex_rele instead of futex_put.  There may once have been a
method to the madness this alias in an early draft but there is no
longer.

No functional change; all names are private to sys_futex.c.

diffstat:

 sys/kern/sys_futex.c |  44 ++++++++++++++++----------------------------
 1 files changed, 16 insertions(+), 28 deletions(-)

diffs (144 lines):

diff -r 3cfb7ce2ac2b -r 784248bd996c sys/kern/sys_futex.c
--- a/sys/kern/sys_futex.c      Tue Apr 28 00:19:23 2020 +0000
+++ b/sys/kern/sys_futex.c      Tue Apr 28 00:54:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_futex.c,v 1.4 2020/04/27 23:54:43 riastradh Exp $  */
+/*     $NetBSD: sys_futex.c,v 1.5 2020/04/28 00:54:24 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.4 2020/04/27 23:54:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.5 2020/04/28 00:54:24 riastradh Exp $");
 
 /*
  * Futexes
@@ -588,7 +588,7 @@
  *     Return ENFILE if reference count too high.
  *
  *     Internal lookup routine shared by futex_lookup() and
- *     futex_get().
+ *     futex_lookup_create().
  */
 static int
 futex_lookup_by_key(union futex_key *fk, bool shared, struct futex **fp)
@@ -660,7 +660,7 @@
  *     process's VM space.  On success, return the futex in f and
  *     increment its reference count.
  *
- *     Caller must call futex_put when done.
+ *     Caller must call futex_rele when done.
  */
 static int
 futex_lookup(int *uaddr, bool shared, struct futex **fp)
@@ -701,16 +701,16 @@
 }
 
 /*
- * futex_get(uaddr, shared, &f)
+ * futex_lookup_create(uaddr, shared, &f)
  *
  *     Find or create a futex at the userland pointer uaddr in the
  *     current process's VM space.  On success, return the futex in f
  *     and increment its reference count.
  *
- *     Caller must call futex_put when done.
+ *     Caller must call futex_rele when done.
  */
 static int
-futex_get(int *uaddr, bool shared, struct futex **fp)
+futex_lookup_create(int *uaddr, bool shared, struct futex **fp)
 {
        union futex_key fk;
        struct vmspace *vm = curproc->p_vmspace;
@@ -774,18 +774,6 @@
 }
 
 /*
- * futex_put(f)
- *
- *     Release a futex acquired with futex_get or futex_lookup.
- */
-static void
-futex_put(struct futex *f)
-{
-
-       futex_rele(f);
-}
-
-/*
  * futex_wait_init(fw, bitset)
  *
  *     Initialize a record for a thread to wait on a futex matching
@@ -1221,7 +1209,7 @@
        }
 
        /* Get the futex, creating it if necessary.  */
-       error = futex_get(uaddr, shared, &f);
+       error = futex_lookup_create(uaddr, shared, &f);
        if (error)
                return error;
        KASSERT(f);
@@ -1264,7 +1252,7 @@
        *retval = 0;
 
 out:   if (f != NULL)
-               futex_put(f);
+               futex_rele(f);
        futex_wait_fini(fw);
        return error;
 }
@@ -1305,7 +1293,7 @@
        futex_queue_unlock(f);
 
        /* Release the futex.  */
-       futex_put(f);
+       futex_rele(f);
 
 out:
        /* Return the number of waiters woken.  */
@@ -1347,7 +1335,7 @@
         * We may need to create the destination futex because it's
         * entirely possible it does not currently have any waiters.
         */
-       error = futex_get(uaddr2, shared, &f2);
+       error = futex_lookup_create(uaddr2, shared, &f2);
        if (error)
                goto out;
 
@@ -1370,9 +1358,9 @@
 
        /* Release the futexes if we got them.  */
        if (f2)
-               futex_put(f2);
+               futex_rele(f2);
        if (f)
-               futex_put(f);
+               futex_rele(f);
        return error;
 }
 
@@ -1568,9 +1556,9 @@
 
        /* Release the futexes, if we got them. */
        if (f2)
-               futex_put(f2);
+               futex_rele(f2);
        if (f)
-               futex_put(f);
+               futex_rele(f);
        return error;
 }
 
@@ -1849,7 +1837,7 @@
 
        /* Unlock the queue and release the futex.  */
 out:   futex_queue_unlock(f);
-       futex_put(f);
+       futex_rele(f);
 }
 
 /*