From 1215a1a98656253b38b8c67a6a9a4464026cbbfa Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 18 Jan 2016 17:52:51 -0500 Subject: [PATCH] helgrind: annotate false-positive race conditions Signed-off-by: Jason Dillaman --- src/librados/IoCtxImpl.cc | 3 +++ src/msg/simple/Pipe.cc | 1 + 2 files changed, 4 insertions(+) diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index 3e6821240c873..b159be63d4eaa 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -20,6 +20,7 @@ #include "librados/PoolAsyncCompletionImpl.h" #include "librados/RadosClient.h" #include "include/assert.h" +#include "common/valgrind.h" #define dout_subsys ceph_subsys_rados #undef dout_prefix @@ -1159,6 +1160,8 @@ int librados::IoCtxImpl::getxattrs(const object_t& oid, void librados::IoCtxImpl::set_sync_op_version(version_t ver) { + ANNOTATE_BENIGN_RACE_SIZED(&last_objver, sizeof(last_objver), + "IoCtxImpl last_objver"); last_objver = ver; } diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index d91e6bb9e83b3..aa6e8fb76e7d5 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -84,6 +84,7 @@ Pipe::Pipe(SimpleMessenger *r, int st, PipeConnection *con) send_keepalive_ack(false), connect_seq(0), peer_global_seq(0), out_seq(0), in_seq(0), in_seq_acked(0) { + ANNOTATE_BENIGN_RACE_SIZED(&sd, sizeof(sd), "Pipe socket"); ANNOTATE_BENIGN_RACE_SIZED(&state, sizeof(state), "Pipe state"); ANNOTATE_BENIGN_RACE_SIZED(&recv_len, sizeof(recv_len), "Pipe recv_len"); ANNOTATE_BENIGN_RACE_SIZED(&recv_ofs, sizeof(recv_ofs), "Pipe recv_ofs"); -- 2.39.5