shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

bus: make the kdbus code valgrind clean

Browse Source
This commit is contained in:
Lennart Poettering 2013-04-12 02:19:26 +02:00
parent acb5a3cb20
commit 7211f918ba
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -693,6 +693,8 @@ AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
AC_SUBST(TELINIT)
AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h])
# ------------------------------------------------------------------------------
have_myhostname=no
AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))

11
src/libsystemd-bus/bus-kernel.c
View File

@ -19,6 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
#endif
#include <fcntl.h>
#include "util.h"
@ -32,8 +36,6 @@
(uint8_t*) (d) < (uint8_t*) (k) + (k)->size; \
(d) = (struct kdbus_msg_data*) ((uint8_t*) (d) + ALIGN8((d)->size)))
static int parse_unique_name(const char *s, uint64_t *id) {
int r;
@ -353,6 +355,11 @@ int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
k = bus->rbuffer = q;
k->size = sz;
/* Let's tell valgrind that there's really no need to
* initialize this fully. This should be removed again
* when valgrind learned the kdbus ioctls natively. */
VALGRIND_MAKE_MEM_DEFINED(k, sz);
r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, bus->rbuffer);
if (r >= 0)
break;