Revert Add location info in registry (debug mode only)
PiperOrigin-RevId: 544842663
This commit is contained in:
parent
422556c4a3
commit
7ba21e9a9a
|
@ -88,8 +88,7 @@ struct NodeRegistrationStatic {
|
|||
static mediapipe::RegistrationToken Make() {
|
||||
return mediapipe::CalculatorBaseRegistry::Register(
|
||||
T::kCalculatorName,
|
||||
absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<T>>,
|
||||
__FILE__, __LINE__);
|
||||
absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<T>>);
|
||||
}
|
||||
|
||||
using RequireStatics = ForceStaticInstantiation<®istration>;
|
||||
|
@ -105,8 +104,8 @@ struct SubgraphRegistrationImpl {
|
|||
static NoDestructor<mediapipe::RegistrationToken> registration;
|
||||
|
||||
static mediapipe::RegistrationToken Make() {
|
||||
return mediapipe::SubgraphRegistry::Register(
|
||||
T::kCalculatorName, absl::make_unique<T>, __FILE__, __LINE__);
|
||||
return mediapipe::SubgraphRegistry::Register(T::kCalculatorName,
|
||||
absl::make_unique<T>);
|
||||
}
|
||||
|
||||
using RequireStatics = ForceStaticInstantiation<®istration>;
|
||||
|
@ -224,13 +223,12 @@ class SubgraphImpl : public Subgraph, public Intf {
|
|||
|
||||
// This macro is used to register a calculator that does not use automatic
|
||||
// registration. Deprecated.
|
||||
#define MEDIAPIPE_NODE_IMPLEMENTATION(Impl) \
|
||||
static mediapipe::NoDestructor<mediapipe::RegistrationToken> \
|
||||
REGISTRY_STATIC_VAR(calculator_registration, \
|
||||
__LINE__)(mediapipe::CalculatorBaseRegistry::Register( \
|
||||
Impl::kCalculatorName, \
|
||||
absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<Impl>>, \
|
||||
__FILE__, __LINE__))
|
||||
#define MEDIAPIPE_NODE_IMPLEMENTATION(Impl) \
|
||||
static mediapipe::NoDestructor<mediapipe::RegistrationToken> \
|
||||
REGISTRY_STATIC_VAR(calculator_registration, \
|
||||
__LINE__)(mediapipe::CalculatorBaseRegistry::Register( \
|
||||
Impl::kCalculatorName, \
|
||||
absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<Impl>>))
|
||||
|
||||
// This macro is used to register a non-split-contract calculator. Deprecated.
|
||||
#define MEDIAPIPE_REGISTER_NODE(name) REGISTER_CALCULATOR(name)
|
||||
|
@ -241,7 +239,7 @@ class SubgraphImpl : public Subgraph, public Intf {
|
|||
static mediapipe::NoDestructor<mediapipe::RegistrationToken> \
|
||||
REGISTRY_STATIC_VAR(subgraph_registration, \
|
||||
__LINE__)(mediapipe::SubgraphRegistry::Register( \
|
||||
Impl::kCalculatorName, absl::make_unique<Impl>, __FILE__, __LINE__))
|
||||
Impl::kCalculatorName, absl::make_unique<Impl>))
|
||||
|
||||
} // namespace api2
|
||||
} // namespace mediapipe
|
||||
|
|
|
@ -183,8 +183,7 @@ TEST(CalculatorTest, CreateByNameWhitelisted) {
|
|||
CalculatorBaseRegistry::Register(
|
||||
"::mediapipe::test_ns::whitelisted_ns::DeadCalculator",
|
||||
absl::make_unique<internal::CalculatorBaseFactoryFor<
|
||||
mediapipe::test_ns::whitelisted_ns::DeadCalculator>>,
|
||||
__FILE__, __LINE__);
|
||||
mediapipe::test_ns::whitelisted_ns::DeadCalculator>>);
|
||||
|
||||
// A whitelisted calculator can be found in its own namespace.
|
||||
MP_EXPECT_OK(CalculatorBaseRegistry::CreateByNameInNamespace( //
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#define MEDIAPIPE_DEPS_REGISTRATION_H_
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <tuple>
|
||||
|
@ -162,8 +161,7 @@ class FunctionRegistry {
|
|||
FunctionRegistry(const FunctionRegistry&) = delete;
|
||||
FunctionRegistry& operator=(const FunctionRegistry&) = delete;
|
||||
|
||||
RegistrationToken Register(absl::string_view name, Function func,
|
||||
std::string filename, uint64_t line)
|
||||
RegistrationToken Register(absl::string_view name, Function func)
|
||||
ABSL_LOCKS_EXCLUDED(lock_) {
|
||||
std::string normalized_name = GetNormalizedName(name);
|
||||
absl::WriterMutexLock lock(&lock_);
|
||||
|
@ -173,21 +171,10 @@ class FunctionRegistry {
|
|||
}
|
||||
if (functions_.insert(std::make_pair(normalized_name, std::move(func)))
|
||||
.second) {
|
||||
#ifndef NDEBUG
|
||||
locations_.emplace(normalized_name,
|
||||
std::make_pair(std::move(filename), line));
|
||||
#endif
|
||||
return RegistrationToken(
|
||||
[this, normalized_name]() { Unregister(normalized_name); });
|
||||
}
|
||||
#ifndef NDEBUG
|
||||
LOG(FATAL) << "Function with name " << name << " already registered."
|
||||
<< " First registration at "
|
||||
<< locations_.at(normalized_name).first << ":"
|
||||
<< locations_.at(normalized_name).second;
|
||||
#else
|
||||
LOG(FATAL) << "Function with name " << name << " already registered.";
|
||||
#endif
|
||||
return RegistrationToken([]() {});
|
||||
}
|
||||
|
||||
|
@ -316,11 +303,6 @@ class FunctionRegistry {
|
|||
private:
|
||||
mutable absl::Mutex lock_;
|
||||
absl::flat_hash_map<std::string, Function> functions_ ABSL_GUARDED_BY(lock_);
|
||||
#ifndef NDEBUG
|
||||
// Stores filename and line number for useful debug log.
|
||||
absl::flat_hash_map<std::string, std::pair<std::string, uint32_t>> locations_
|
||||
ABSL_GUARDED_BY(lock_);
|
||||
#endif
|
||||
|
||||
// For names included in NamespaceAllowlist, strips the namespace.
|
||||
std::string GetAdjustedName(absl::string_view name) {
|
||||
|
@ -351,10 +333,8 @@ class GlobalFactoryRegistry {
|
|||
|
||||
public:
|
||||
static RegistrationToken Register(absl::string_view name,
|
||||
typename Functions::Function func,
|
||||
std::string filename, uint64_t line) {
|
||||
return functions()->Register(name, std::move(func), std::move(filename),
|
||||
line);
|
||||
typename Functions::Function func) {
|
||||
return functions()->Register(name, std::move(func));
|
||||
}
|
||||
|
||||
// Invokes the specified factory function and returns the result.
|
||||
|
@ -414,12 +394,12 @@ class GlobalFactoryRegistry {
|
|||
#define MEDIAPIPE_REGISTER_FACTORY_FUNCTION(RegistryType, name, ...) \
|
||||
static auto* REGISTRY_STATIC_VAR(registration_##name, __LINE__) = \
|
||||
new mediapipe::RegistrationToken( \
|
||||
RegistryType::Register(#name, __VA_ARGS__, __FILE__, __LINE__))
|
||||
RegistryType::Register(#name, __VA_ARGS__))
|
||||
|
||||
#define REGISTER_FACTORY_FUNCTION_QUALIFIED(RegistryType, var_name, name, ...) \
|
||||
static auto* REGISTRY_STATIC_VAR(var_name, __LINE__) = \
|
||||
new mediapipe::RegistrationToken( \
|
||||
RegistryType::Register(#name, __VA_ARGS__, __FILE__, __LINE__))
|
||||
RegistryType::Register(#name, __VA_ARGS__))
|
||||
|
||||
} // namespace mediapipe
|
||||
|
||||
|
|
|
@ -466,8 +466,7 @@ struct MessageRegistrationImpl {
|
|||
template <typename T>
|
||||
NoDestructor<mediapipe::RegistrationToken>
|
||||
MessageRegistrationImpl<T>::registration(MessageHolderRegistry::Register(
|
||||
T{}.GetTypeName(), MessageRegistrationImpl<T>::CreateMessageHolder,
|
||||
__FILE__, __LINE__));
|
||||
T{}.GetTypeName(), MessageRegistrationImpl<T>::CreateMessageHolder));
|
||||
|
||||
// For non-Message payloads, this does nothing.
|
||||
template <typename T, typename Enable = void>
|
||||
|
|
|
@ -64,13 +64,13 @@ GraphRegistry::GraphRegistry(
|
|||
void GraphRegistry::Register(
|
||||
const std::string& type_name,
|
||||
std::function<std::unique_ptr<Subgraph>()> factory) {
|
||||
local_factories_.Register(type_name, factory, __FILE__, __LINE__);
|
||||
local_factories_.Register(type_name, factory);
|
||||
}
|
||||
|
||||
// TODO: Remove this convenience function.
|
||||
void GraphRegistry::Register(const std::string& type_name,
|
||||
const CalculatorGraphConfig& config) {
|
||||
Register(type_name, [config] {
|
||||
local_factories_.Register(type_name, [config] {
|
||||
auto result = absl::make_unique<ProtoSubgraph>(config);
|
||||
return std::unique_ptr<Subgraph>(result.release());
|
||||
});
|
||||
|
@ -79,7 +79,7 @@ void GraphRegistry::Register(const std::string& type_name,
|
|||
// TODO: Remove this convenience function.
|
||||
void GraphRegistry::Register(const std::string& type_name,
|
||||
const CalculatorGraphTemplate& templ) {
|
||||
Register(type_name, [templ] {
|
||||
local_factories_.Register(type_name, [templ] {
|
||||
auto result = absl::make_unique<TemplateSubgraph>(templ);
|
||||
return std::unique_ptr<Subgraph>(result.release());
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue
Block a user