From b32027e72cd811ec6ab497fc0bb5f58572f4615d Mon Sep 17 00:00:00 2001 From: Nick Richardson Date: Thu, 20 Oct 2022 11:09:49 -0700 Subject: [PATCH] Remove error prone secretAvailable USDT Summary: Temporarily removes usdt probe that causes error with OSS ld. This works on our lld linker. https://github.com/facebookincubator/fizz/issues/84 Reviewed By: mingtaoy Differential Revision: D40523842 fbshipit-source-id: 8b914caa53350e3560c6990dd47d0876319cf274 --- third-party/fizz/src/fizz/client/AsyncFizzClient-inl.h | 2 ++ third-party/fizz/src/fizz/server/AsyncFizzServer-inl.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/third-party/fizz/src/fizz/client/AsyncFizzClient-inl.h b/third-party/fizz/src/fizz/client/AsyncFizzClient-inl.h index ca9b0ae7f1563..d1dc6d803fc83 100644 --- a/third-party/fizz/src/fizz/client/AsyncFizzClient-inl.h +++ b/third-party/fizz/src/fizz/client/AsyncFizzClient-inl.h @@ -609,6 +609,7 @@ template void AsyncFizzClientT::ActionMoveVisitor::operator()( SecretAvailable& secret) { client_.secretAvailable(secret.secret); +#if 0 FOLLY_SDT( fizz, fizz_secret_available, @@ -616,6 +617,7 @@ void AsyncFizzClientT::ActionMoveVisitor::operator()( secret.secret.secret.data(), secret.secret.type, client_.getClientRandom()->data()); +#endif } template diff --git a/third-party/fizz/src/fizz/server/AsyncFizzServer-inl.h b/third-party/fizz/src/fizz/server/AsyncFizzServer-inl.h index 16e9d589698a2..d3f3d13b1a518 100644 --- a/third-party/fizz/src/fizz/server/AsyncFizzServer-inl.h +++ b/third-party/fizz/src/fizz/server/AsyncFizzServer-inl.h @@ -343,6 +343,7 @@ void AsyncFizzServerT::ActionMoveVisitor::operator()( template void AsyncFizzServerT::ActionMoveVisitor::operator()( SecretAvailable& secret) { +#if 0 FOLLY_SDT( fizz, fizz_secret_available, @@ -351,6 +352,7 @@ void AsyncFizzServerT::ActionMoveVisitor::operator()( KeyLogWriter::secretToNSSLabel(secret.secret.type) .value_or(std::numeric_limits::max()), server_.getClientRandom()->data()); +#endif server_.secretAvailable(secret.secret); }