From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, commit-hurd@gnu.org
Subject: [hurd, commited 1/7] hurd: Rename LLL_INITIALIZER to LLL_LOCK_INITIALIZER
Date: Wed, 16 Dec 2020 01:59:38 +0100 [thread overview]
Message-ID: <20201216005944.3091900-2-samuel.thibault@ens-lyon.org> (raw)
In-Reply-To: <20201216005944.3091900-1-samuel.thibault@ens-lyon.org>
To get coherent with other ports.
---
hurd/setauth.c | 2 +-
mach/lock-intern.h | 2 +-
mach/lowlevellock.h | 2 +-
mach/mutex-init.c | 2 +-
sysdeps/mach/libc-lock.h | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hurd/setauth.c b/hurd/setauth.c
index 5493db5e5d..b1037172ba 100644
--- a/hurd/setauth.c
+++ b/hurd/setauth.c
@@ -24,7 +24,7 @@
/* Things in the library which want to be run when the auth port changes. */
DEFINE_HOOK (_hurd_reauth_hook, (auth_t new_auth));
-static unsigned int reauth_lock = LLL_INITIALIZER;
+static unsigned int reauth_lock = LLL_LOCK_INITIALIZER;
/* Set the auth port to NEW, and reauthenticate
everything used by the library. */
diff --git a/mach/lock-intern.h b/mach/lock-intern.h
index a68674cef4..62faf98039 100644
--- a/mach/lock-intern.h
+++ b/mach/lock-intern.h
@@ -31,7 +31,7 @@
typedef unsigned int __spin_lock_t;
/* Static initializer for spinlocks. */
-#define __SPIN_LOCK_INITIALIZER LLL_INITIALIZER
+#define __SPIN_LOCK_INITIALIZER LLL_LOCK_INITIALIZER
/* Initialize LOCK. */
diff --git a/mach/lowlevellock.h b/mach/lowlevellock.h
index 6d92adca1c..cf67ccd589 100644
--- a/mach/lowlevellock.h
+++ b/mach/lowlevellock.h
@@ -32,7 +32,7 @@
#endif
/* Static initializer for low-level locks. */
-#define LLL_INITIALIZER 0
+#define LLL_LOCK_INITIALIZER 0
/* Wait on address PTR, without blocking if its contents
* are different from VAL. */
diff --git a/mach/mutex-init.c b/mach/mutex-init.c
index acacec2fb0..fc898f66d4 100644
--- a/mach/mutex-init.c
+++ b/mach/mutex-init.c
@@ -22,6 +22,6 @@
void
__mutex_init (void *lock)
{
- *(int *)lock = LLL_INITIALIZER;
+ *(int *)lock = LLL_LOCK_INITIALIZER;
}
libc_hidden_def (__mutex_init)
diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h
index e04dcc445d..3993a57b26 100644
--- a/sysdeps/mach/libc-lock.h
+++ b/sysdeps/mach/libc-lock.h
@@ -57,13 +57,13 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
CLASS __libc_lock_t NAME;
/* Define an initialized lock variable NAME with storage class CLASS. */
-#define _LIBC_LOCK_INITIALIZER LLL_INITIALIZER
+#define _LIBC_LOCK_INITIALIZER LLL_LOCK_INITIALIZER
#define __libc_lock_define_initialized(CLASS,NAME) \
- CLASS __libc_lock_t NAME = LLL_INITIALIZER;
+ CLASS __libc_lock_t NAME = LLL_LOCK_INITIALIZER;
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#define __libc_lock_init(NAME) (NAME) = LLL_INITIALIZER
+#define __libc_lock_init(NAME) (NAME) = LLL_LOCK_INITIALIZER
/* Finalize the named lock variable, which must be locked. It cannot be
used again until __libc_lock_init is called again on it. This must be
@@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#define __libc_lock_define_recursive(CLASS,NAME) \
CLASS __libc_lock_recursive_t NAME;
-#define _LIBC_LOCK_RECURSIVE_INITIALIZER { LLL_INITIALIZER, 0, 0 }
+#define _LIBC_LOCK_RECURSIVE_INITIALIZER { LLL_LOCK_INITIALIZER, 0, 0 }
#define __libc_lock_define_initialized_recursive(CLASS,NAME) \
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
--
2.29.2
next prev parent reply other threads:[~2020-12-16 0:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 0:59 [hurd,commited 0/7] hurd: add pshared semaphore support Samuel Thibault
2020-12-16 0:59 ` Samuel Thibault [this message]
2020-12-16 0:59 ` [hurd, commited 2/7] hurd: make lll_* take a variable instead of a ptr Samuel Thibault
2020-12-16 0:59 ` [hurd,commited 3/7] hurd: Add __lll_abstimed_wait_intr Samuel Thibault
2020-12-16 0:59 ` [hurd,commited 4/7] htl: Add futex-internal.h Samuel Thibault
2020-12-16 0:59 ` [hurd,commited 5/7] hurd: Add __libc_open and __libc_close Samuel Thibault
2020-12-16 0:59 ` [hurd,commited 6/7] hurd: Add LLL_PRIVATE and LLL_SHARED Samuel Thibault
2020-12-16 0:59 ` [hurd,commited 7/7] htl: Add pshared semaphore support Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216005944.3091900-2-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=commit-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).