Skip to content

proxy-client: fix TSan data race in clientDestroy #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanofsky wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −8
Open

proxy-client: fix TSan data race in clientDestroy #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bb3e6
proxy-client: fix TSan data race in clientDestroy
ryanofsky Jun 3, 2026
039e5ac
mpgen: iwyu changes required by previous commit
ryanofsky Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions include/mp/proxy-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,11 +644,7 @@ struct CapRequestTraits<::capnp::Request<_Params, _Results>>
template <typename Client>
void clientDestroy(Client& client)
{
if (client.m_context.connection) {
MP_LOG(*client.m_context.loop, Log::Debug) << "IPC client destroy " << CxxTypeName(client);
} else {
KJ_LOG(INFO, "IPC interrupted client destroy", CxxTypeName(client));
}
MP_LOG(*client.m_context.loop, Log::Debug) << "IPC client destroy " << CxxTypeName(client);
}

template <typename Server>
Expand Down
8 changes: 5 additions & 3 deletions src/mp/gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <mp/util.h>

#include <algorithm>
#include <capnp/schema.capnp.h> // IWYU pragma: keep
#include <capnp/schema.h>
#include <capnp/schema-parser.h>
#include <cerrno>
Expand Down Expand Up @@ -329,12 +330,15 @@ static void Generate(kj::StringPtr src_prefix,
cpp_client << "#include <" << include_path << ".h>\n";
cpp_client << "#include <" << include_path << ".proxy.h>\n";
cpp_client << "#include <" << include_path << ".proxy-types.h>\n";
cpp_client << "#include <capnp/capability.h>\n";
cpp_client << "#include <capnp/generated-header-support.h>\n";
cpp_client << "#include <cstring>\n";
cpp_client << "#include <vector>\n";
cpp_client << "#include <functional>\n";
cpp_client << "#include <kj/common.h>\n";
cpp_client << "#include <map>\n";
cpp_client << "#include <mp/proxy.h>\n";
cpp_client << "#include <mp/util.h>\n";
cpp_client << "#include <vector>\n";
cpp_client << "#include <" << PROXY_TYPES << ">\n";
cpp_client << "// IWYU pragma: end_keep\n\n";
cpp_client << "namespace mp {\n";
Expand All @@ -346,8 +350,6 @@ static void Generate(kj::StringPtr src_prefix,
cpp_types << "#include <" << include_path << ".h> // IWYU pragma: keep\n";
cpp_types << "#include <" << include_path << ".proxy.h>\n";
cpp_types << "#include <" << include_path << ".proxy-types.h> // IWYU pragma: keep\n";
cpp_types << "#include <kj/common.h>\n";
cpp_types << "#include <mp/util.h>\n";
cpp_types << "#include <" << PROXY_TYPES << ">\n\n";
cpp_types << "namespace mp {\n";

Expand Down
Loading