mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
Merge pull request #26528 from keszybz/valgrind-simplification
Drop the -Dvalgrind configuration option
This commit is contained in:
commit
58fbf167d7
12
README
12
README
|
@ -403,12 +403,12 @@ WARNINGS and TAINT FLAGS:
|
|||
See org.freedesktop.systemd1(5) for more information.
|
||||
|
||||
VALGRIND:
|
||||
To run systemd under valgrind, compile with meson option
|
||||
-Dvalgrind=true and have valgrind development headers installed
|
||||
(i.e. valgrind-devel or equivalent). Otherwise, false positives will be
|
||||
triggered by code which violates some rules but is actually safe. Note
|
||||
that valgrind generates nice output only on exit(), hence on shutdown
|
||||
we don't execve() systemd-shutdown.
|
||||
To run systemd under valgrind, compile systemd with the valgrind
|
||||
development headers available (i.e. valgrind-devel or equivalent).
|
||||
Otherwise, false positives will be triggered by code which violates
|
||||
some rules but is actually safe. Note that valgrind generates nice
|
||||
output only on exit(), hence on shutdown we don't execve()
|
||||
systemd-shutdown.
|
||||
|
||||
STABLE BRANCHES AND BACKPORTS:
|
||||
Stable branches with backported patches are available in the
|
||||
|
|
|
@ -1020,8 +1020,6 @@ endforeach
|
|||
conf.set10('ENABLE_DEBUG_HASHMAP', enable_debug_hashmap)
|
||||
conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache)
|
||||
conf.set10('ENABLE_DEBUG_SIPHASH', enable_debug_siphash)
|
||||
|
||||
conf.set10('VALGRIND', get_option('valgrind'))
|
||||
conf.set10('LOG_TRACE', get_option('log-trace'))
|
||||
|
||||
default_user_path = get_option('user-path')
|
||||
|
@ -4609,7 +4607,6 @@ foreach tuple : [
|
|||
['debug hashmap'],
|
||||
['debug mmap cache'],
|
||||
['debug siphash'],
|
||||
['valgrind', conf.get('VALGRIND') == 1],
|
||||
['trace logging', conf.get('LOG_TRACE') == 1],
|
||||
['install tests', install_tests],
|
||||
['link-udev-shared', get_option('link-udev-shared')],
|
||||
|
|
|
@ -79,8 +79,6 @@ option('bump-proc-sys-fs-file-max', type : 'boolean',
|
|||
description : 'bump /proc/sys/fs/file-max to LONG_MAX')
|
||||
option('bump-proc-sys-fs-nr-open', type : 'boolean',
|
||||
description : 'bump /proc/sys/fs/nr_open to INT_MAX')
|
||||
option('valgrind', type : 'boolean', value : false,
|
||||
description : 'do extra operations to avoid valgrind warnings')
|
||||
option('log-trace', type : 'boolean', value : false,
|
||||
description : 'enable low level debug logging')
|
||||
option('user-path', type : 'string',
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
# include <valgrind/valgrind.h>
|
||||
#endif
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "fileio.h"
|
||||
|
@ -295,9 +298,10 @@ void hashmap_trim_pools(void) {
|
|||
mempool_trim(&ordered_hashmap_pool);
|
||||
}
|
||||
|
||||
#if VALGRIND
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
_destructor_ static void cleanup_pools(void) {
|
||||
/* Be nice to valgrind */
|
||||
if (RUNNING_ON_VALGRIND)
|
||||
hashmap_trim_pools();
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -9,6 +9,9 @@
|
|||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <unistd.h>
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
# include <valgrind/valgrind.h>
|
||||
#endif
|
||||
|
||||
#include "sd-dhcp-client.h"
|
||||
#include "sd-event.h"
|
||||
|
@ -546,10 +549,11 @@ int main(int argc, char *argv[]) {
|
|||
test_discover_message(e);
|
||||
test_addr_acq(e);
|
||||
|
||||
#if VALGRIND
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
/* Make sure the async_close thread has finished.
|
||||
* valgrind would report some of the phread_* structures
|
||||
* as not cleaned up properly. */
|
||||
if (RUNNING_ON_VALGRIND)
|
||||
sleep(1);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -77,9 +77,9 @@ int journal_fd_nonblock(bool nonblock) {
|
|||
return fd_nonblock(r, nonblock);
|
||||
}
|
||||
|
||||
#if VALGRIND
|
||||
void close_journal_fd(void) {
|
||||
/* Be nice to valgrind. This is not atomic. This must be used only in tests. */
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
/* Be nice to valgrind. This is not atomic, so it is useful mainly for debugging. */
|
||||
|
||||
if (!RUNNING_ON_VALGRIND)
|
||||
return;
|
||||
|
@ -92,8 +92,8 @@ void close_journal_fd(void) {
|
|||
|
||||
safe_close(fd_plus_one - 1);
|
||||
fd_plus_one = 0;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
_public_ int sd_journal_print(int priority, const char *format, ...) {
|
||||
int r;
|
||||
|
|
|
@ -4,9 +4,4 @@
|
|||
#include <stdbool.h>
|
||||
|
||||
int journal_fd_nonblock(bool nonblock);
|
||||
|
||||
#if VALGRIND
|
||||
void close_journal_fd(void);
|
||||
#else
|
||||
static inline void close_journal_fd(void) {}
|
||||
#endif
|
||||
|
|
|
@ -4,6 +4,12 @@
|
|||
|
||||
#include "lookup3.h"
|
||||
|
||||
#if HAVE_VALGRIND_VALGRIND_H
|
||||
# include <valgrind/valgrind.h>
|
||||
#else
|
||||
# define RUNNING_ON_VALGRIND 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
-------------------------------------------------------------------------------
|
||||
lookup3.c, by Bob Jenkins, May 2006, Public Domain.
|
||||
|
@ -320,8 +326,11 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
|
|||
* still catch it and complain. The masking trick does make the hash
|
||||
* noticeably faster for short strings (like English words).
|
||||
*/
|
||||
#if !VALGRIND && !HAS_FEATURE_ADDRESS_SANITIZER && !HAS_FEATURE_MEMORY_SANITIZER
|
||||
#define VALGRIND_LIKE (_unlikely_(HAS_FEATURE_ADDRESS_SANITIZER || \
|
||||
HAS_FEATURE_MEMORY_SANITIZER || \
|
||||
RUNNING_ON_VALGRIND))
|
||||
|
||||
if (!VALGRIND_LIKE) {
|
||||
switch(length)
|
||||
{
|
||||
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
|
||||
|
@ -338,9 +347,7 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
|
|||
case 1 : a+=k[0]&0xff; break;
|
||||
case 0 : return c; /* zero length strings require no mixing */
|
||||
}
|
||||
|
||||
#else /* make valgrind happy */
|
||||
{
|
||||
} else {
|
||||
const uint8_t *k8 = (const uint8_t *) k;
|
||||
|
||||
switch(length)
|
||||
|
@ -361,8 +368,6 @@ uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* !valgrind */
|
||||
|
||||
} else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
|
||||
const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
|
||||
const uint8_t *k8;
|
||||
|
@ -505,8 +510,7 @@ void jenkins_hashlittle2(
|
|||
* still catch it and complain. The masking trick does make the hash
|
||||
* noticeably faster for short strings (like English words).
|
||||
*/
|
||||
#if !VALGRIND && !HAS_FEATURE_ADDRESS_SANITIZER && !HAS_FEATURE_MEMORY_SANITIZER
|
||||
|
||||
if (!VALGRIND_LIKE) {
|
||||
switch(length)
|
||||
{
|
||||
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
|
||||
|
@ -523,11 +527,9 @@ void jenkins_hashlittle2(
|
|||
case 1 : a+=k[0]&0xff; break;
|
||||
case 0 : *pc=c; *pb=b; return; /* zero length strings require no mixing */
|
||||
}
|
||||
|
||||
#else /* make valgrind happy */
|
||||
|
||||
{
|
||||
} else {
|
||||
const uint8_t *k8 = (const uint8_t *)k;
|
||||
|
||||
switch(length)
|
||||
{
|
||||
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
|
||||
|
@ -546,8 +548,6 @@ void jenkins_hashlittle2(
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* !valgrind */
|
||||
|
||||
} else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
|
||||
const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
|
||||
const uint8_t *k8;
|
||||
|
@ -681,8 +681,8 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
|
|||
* still catch it and complain. The masking trick does make the hash
|
||||
* noticeably faster for short strings (like English words).
|
||||
*/
|
||||
#if !VALGRIND && !HAS_FEATURE_ADDRESS_SANITIZER && !HAS_FEATURE_MEMORY_SANITIZER
|
||||
|
||||
if (!VALGRIND_LIKE) {
|
||||
switch(length)
|
||||
{
|
||||
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
|
||||
|
@ -699,11 +699,9 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
|
|||
case 1 : a+=k[0]&0xff000000; break;
|
||||
case 0 : return c; /* zero length strings require no mixing */
|
||||
}
|
||||
|
||||
#else /* make valgrind happy */
|
||||
|
||||
{
|
||||
} else {
|
||||
const uint8_t *k8 = (const uint8_t *)k;
|
||||
|
||||
switch(length) /* all the case statements fall through */
|
||||
{
|
||||
case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
|
||||
|
@ -722,8 +720,6 @@ uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* !VALGRIND */
|
||||
|
||||
} else { /* need to read the key one byte at a time */
|
||||
const uint8_t *k = (const uint8_t *)key;
|
||||
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
#include "strv.h"
|
||||
#include "tests.h"
|
||||
|
||||
const bool mempool_use_allowed = VALGRIND;
|
||||
|
||||
TEST(set_steal_first) {
|
||||
_cleanup_set_free_ Set *m = NULL;
|
||||
int seen[3] = {};
|
||||
|
@ -37,10 +35,9 @@ static void item_seen(Item *item) {
|
|||
TEST(set_free_with_destructor) {
|
||||
Set *m;
|
||||
struct Item items[4] = {};
|
||||
unsigned i;
|
||||
|
||||
assert_se(m = set_new(NULL));
|
||||
for (i = 0; i < ELEMENTSOF(items) - 1; i++)
|
||||
for (size_t i = 0; i < ELEMENTSOF(items) - 1; i++)
|
||||
assert_se(set_put(m, items + i) == 1);
|
||||
|
||||
m = set_free_with_destructor(m, item_seen);
|
||||
|
@ -55,10 +52,9 @@ DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(item_hash_ops, void, trivial_hash_
|
|||
TEST(set_free_with_hash_ops) {
|
||||
Set *m;
|
||||
struct Item items[4] = {};
|
||||
unsigned i;
|
||||
|
||||
assert_se(m = set_new(&item_hash_ops));
|
||||
for (i = 0; i < ELEMENTSOF(items) - 1; i++)
|
||||
for (size_t i = 0; i < ELEMENTSOF(items) - 1; i++)
|
||||
assert_se(set_put(m, items + i) == 1);
|
||||
|
||||
m = set_free(m);
|
||||
|
|
|
@ -6,6 +6,5 @@
|
|||
# (at your option) any later version.
|
||||
|
||||
# See tmpfiles.d(5), systemd-user-sessions.service(8) and pam_nologin(8).
|
||||
# This file has special suffix so it is not run by mistake.
|
||||
|
||||
F! /run/nologin 0644 - - - "System is booting up. Unprivileged users are not permitted to log in yet. Please come back later. For technical details, see pam_nologin(8)."
|
||||
|
|
Loading…
Reference in a new issue