diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-02-10 10:54:47 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-02-17 15:56:54 -0300 |
| commit | f281a955e9fa154296e7ff7620005114808c58d9 (patch) | |
| tree | dab5a8d65cff74b5aa99f4b3c55b08dba5e86f5b /nscd/nscd_helper.c | |
| parent | a6ccce23afc2a09a17ac2a86a2b726b58df609df (diff) | |
| download | glibc-f281a955e9fa154296e7ff7620005114808c58d9.tar.gz glibc-f281a955e9fa154296e7ff7620005114808c58d9.tar.xz glibc-f281a955e9fa154296e7ff7620005114808c58d9.zip | |
nscd: Remove _STRING_ARCH_unaligned usage
It only adds a small overhead for unaligned inputs (which should not be common) and unify the code. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Diffstat (limited to 'nscd/nscd_helper.c')
| -rw-r--r-- | nscd/nscd_helper.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index fdd555ea66..6a498b363c 100644 --- a/nscd/nscd_helper.c +++ b/nscd/nscd_helper.c @@ -465,7 +465,6 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen, struct hashentry *here = (struct hashentry *) (mapped->data + work); ref_t here_key, here_packet; -#if !_STRING_ARCH_unaligned /* Although during garbage collection when moving struct hashentry records around we first copy from old to new location and then adjust pointer from previous hashentry to it, there is no barrier @@ -474,7 +473,6 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen, application. */ if ((uintptr_t) here & (__alignof__ (*here) - 1)) return NULL; -#endif if (type == here->type && keylen == here->len @@ -487,10 +485,8 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen, struct datahead *dh = (struct datahead *) (mapped->data + here_packet); -#if !_STRING_ARCH_unaligned if ((uintptr_t) dh & (__alignof__ (*dh) - 1)) return NULL; -#endif /* See whether we must ignore the entry or whether something is wrong because garbage collection is in progress. */ @@ -511,11 +507,9 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen, struct hashentry *trailelem; trailelem = (struct hashentry *) (mapped->data + trail); -#if !_STRING_ARCH_unaligned /* We have to redo the checks. Maybe the data changed. */ if ((uintptr_t) trailelem & (__alignof__ (*trailelem) - 1)) return NULL; -#endif if (trail + MINIMUM_HASHENTRY_SIZE > datasize) return NULL; |