shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

toolcontext: check runtime valgrind

Browse Source 
When reseting stream buffer - check for being run within valgrind
and only in this case skip this code.
Define VALGRIND_POOL was incorrectly used for this logic.
This commit is contained in:
Zdenek Kabelac 2024-04-25 21:20:36 +02:00
parent 4c5eb2e713
commit c6a37ddca4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/commands/toolcontext.c
View File

@ -45,6 +45,10 @@
#include <systemd/sd-id128.h> #include <systemd/sd-id128.h>
#endif #endif
#ifdef HAVE_VALGRIND
#include <valgrind.h>
#endif
#ifdef __linux__ #ifdef __linux__
# include <malloc.h> # include <malloc.h>
#endif #endif
@ -1708,9 +1712,11 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
/* FIXME Make this configurable? */ /* FIXME Make this configurable? */
reset_lvm_errno(1); reset_lvm_errno(1);
#ifndef VALGRIND_POOL
/* Set in/out stream buffering before glibc */ /* Set in/out stream buffering before glibc */
if (set_buffering if (set_buffering
#ifdef HAVE_VALGRIND
&& !RUNNING_ON_VALGRIND /* Skipping within valgrind execution. */
#endif
#ifdef SYS_gettid #ifdef SYS_gettid
/* For threaded programs no changes of streams */ /* For threaded programs no changes of streams */
/* On linux gettid() is implemented only via syscall */ /* On linux gettid() is implemented only via syscall */
@ -1752,7 +1758,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
} else if (!set_buffering) } else if (!set_buffering)
/* Without buffering, must not use stdin/stdout */ /* Without buffering, must not use stdin/stdout */
init_silent(1); init_silent(1);
#endif
/* /*
* Environment variable LVM_SYSTEM_DIR overrides this below. * Environment variable LVM_SYSTEM_DIR overrides this below.
*/ */
@ -2087,7 +2093,10 @@ void destroy_toolcontext(struct cmd_context *cmd)
dm_hash_destroy(cmd->cft_def_hash); dm_hash_destroy(cmd->cft_def_hash);
dm_device_list_destroy(&cmd->cache_dm_devs); dm_device_list_destroy(&cmd->cache_dm_devs);
#ifndef VALGRIND_POOL
#ifdef HAVE_VALGRIND
if (!RUNNING_ON_VALGRIND) /* Skipping within valgrind execution. */
#endif
if (cmd->linebuffer) { if (cmd->linebuffer) {
int flags; int flags;
/* Reset stream buffering to defaults */ /* Reset stream buffering to defaults */
@ -2111,7 +2120,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
free(cmd->linebuffer); free(cmd->linebuffer);
} }
#endif
destroy_config_context(cmd); destroy_config_context(cmd);
lvmpolld_disconnect(); lvmpolld_disconnect();