[core] move locator Get<Type> definitions to instance.hpp (#10711)

This commit moves the locator `GetProvider::Get<Type>()` and its
related `Timer` and `Tasklet` methods to `instance.hpp`. With this
change we can remove `locator_getters.hpp` header fully thus
simplifying the code.

src/core/BUILD.gn

@@ -420,7 +420,6 @@ openthread_core_files = [
   "common/iterator_utils.hpp",
   "common/linked_list.hpp",
   "common/locator.hpp",
-  "common/locator_getters.hpp",
   "common/log.cpp",
   "common/log.hpp",
   "common/logging.hpp",

src/core/api/backbone_router_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/backbone_router.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/backbone_router_ftd_api.cpp

@@ -39,7 +39,7 @@
 #include <openthread/backbone_router_ftd.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/ble_secure_api.cpp

@@ -40,7 +40,7 @@
 
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "meshcop/tcat_agent.hpp"
 #include "radio/ble_secure.hpp"
 

src/core/api/border_agent_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/border_agent.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/channel_manager_api.cpp

@@ -39,7 +39,7 @@
 #include <openthread/channel_manager.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "utils/channel_manager.hpp"
 
 using namespace ot;

src/core/api/channel_monitor_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/channel_monitor.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/child_supervision_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/child_supervision.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/coap_api.cpp

@@ -39,7 +39,7 @@
 
 #include "coap/coap_message.hpp"
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/coap_secure_api.cpp

@@ -41,7 +41,7 @@
 #include "coap/coap_message.hpp"
 #include "coap/coap_secure.hpp"
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/commissioner_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/commissioner.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/crypto_api.cpp

@@ -39,10 +39,10 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "crypto/aes_ccm.hpp"
 #include "crypto/ecdsa.hpp"
 #include "crypto/hmac_sha256.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 using namespace ot::Crypto;

src/core/api/dataset_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/dataset.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "meshcop/dataset_manager.hpp"
 #include "meshcop/meshcop.hpp"
 

src/core/api/dataset_ftd_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/dataset_ftd.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/dataset_updater_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/dataset_updater.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "meshcop/dataset_updater.hpp"
 
 using namespace ot;

src/core/api/diags_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/diag.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/history_tracker_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/history_tracker.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "utils/history_tracker.hpp"
 
 using namespace ot;

src/core/api/icmp6_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/icmp6.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/instance_api.cpp

@@ -37,8 +37,8 @@
 #include <openthread/platform/misc.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
 #include "common/new.hpp"
+#include "instance/instance.hpp"
 #include "radio/radio.hpp"
 
 #if !defined(OPENTHREAD_BUILD_DATETIME)

src/core/api/ip6_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/ip6.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "net/ip4_types.hpp"
 #include "net/ip6_headers.hpp"
 #include "thread/network_data_leader.hpp"

src/core/api/jam_detection_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/jam_detection.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/joiner_api.cpp

@@ -39,7 +39,7 @@
 
 #include "common/as_core_type.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/link_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/link.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "mac/mac.hpp"
 #include "radio/radio.hpp"
 

src/core/api/link_metrics_api.cpp

@@ -37,7 +37,7 @@
 #include <openthread/link_metrics.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/link_raw_api.cpp

@@ -43,8 +43,8 @@
 
 #include "common/as_core_type.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/random.hpp"
+#include "instance/instance.hpp"
 #include "mac/mac_frame.hpp"
 
 using namespace ot;

src/core/api/logging_api.cpp

@@ -35,7 +35,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"

src/core/api/mesh_diag_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/mesh_diag.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "utils/mesh_diag.hpp"
 
 using namespace ot;

src/core/api/message_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/message.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/multi_radio_api.cpp

@@ -39,7 +39,7 @@
 
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "thread/radio_selector.hpp"
 
 using namespace ot;

src/core/api/netdata_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/netdata.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/netdata_publisher_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/netdata_publisher.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/netdiag_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/netdiag.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/network_time_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/network_time.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/ping_sender_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/ping_sender.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/radio_stats_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/radio_stats.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/server_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/server.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/sntp_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/sntp.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/srp_client_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/srp_client.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/srp_client_buffers_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/srp_client_buffers.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/srp_server_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/srp_server.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/tasklet_api.cpp

@@ -37,7 +37,7 @@
 
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/tcp_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/tcp.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/tcp_ext_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/tcp_ext.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 #include "net/tcp6_ext.hpp"
 
 #if OPENTHREAD_CONFIG_TLS_ENABLE

src/core/api/thread_api.cpp

@@ -39,8 +39,8 @@
 
 #include "common/as_core_type.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/uptime.hpp"
+#include "instance/instance.hpp"
 #include "thread/version.hpp"
 
 using namespace ot;

src/core/api/thread_ftd_api.cpp

@@ -38,7 +38,7 @@
 #include <openthread/thread_ftd.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/udp_api.cpp

@@ -36,7 +36,7 @@
 #include <openthread/udp.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/backbone_router/backbone_tmf.cpp

@@ -35,8 +35,8 @@
 
 #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 namespace BackboneRouter {

src/core/backbone_router/bbr_leader.cpp

@@ -35,7 +35,6 @@
 
 #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
 
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 namespace ot {

src/core/backbone_router/bbr_local.cpp

@@ -36,7 +36,6 @@
 #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"

src/core/backbone_router/bbr_manager.cpp

@@ -37,7 +37,6 @@
 
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "common/numeric_limits.hpp"

src/core/backbone_router/multicast_listeners_table.cpp

@@ -37,7 +37,6 @@
 
 #include "common/array.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"

src/core/backbone_router/ndproxy_table.cpp

@@ -36,9 +36,9 @@
 #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_DUA_NDPROXYING_ENABLE
 
 #include "common/array.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 

src/core/border_router/infra_if.cpp

@@ -37,7 +37,6 @@
 
 #include "border_router/routing_manager.hpp"
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
 #include "common/logging.hpp"
 #include "instance/instance.hpp"
 #include "net/icmp6.hpp"

src/core/border_router/routing_manager.cpp

@@ -44,7 +44,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "common/numeric_limits.hpp"

src/core/coap/coap.cpp

@@ -32,7 +32,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "common/string.hpp"

src/core/coap/coap_secure.cpp

@@ -30,7 +30,6 @@
 
 #if OPENTHREAD_CONFIG_SECURE_TRANSPORT_ENABLE
 
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/new.hpp"
 #include "instance/instance.hpp"

src/core/common/locator_getters.hpp

@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2017-2019, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @file
- *   This file includes definitions locator getter methods.
- *
- */
-
-#ifndef LOCATOR_GETTERS_HPP_
-#define LOCATOR_GETTERS_HPP_
-
-#include "openthread-core-config.h"
-
-#include "common/locator.hpp"
-#include "common/tasklet.hpp"
-#include "instance/instance.hpp"
-
-namespace ot {
-
-template <typename InstanceGetProvider>
-template <typename Type>
-inline Type &GetProvider<InstanceGetProvider>::Get(void) const
-{
-    return static_cast<const InstanceGetProvider *>(this)->GetInstance().template Get<Type>();
-}
-
-template <typename Owner, void (Owner::*HandleTaskletPtr)(void)>
-void TaskletIn<Owner, HandleTaskletPtr>::HandleTasklet(Tasklet &aTasklet)
-{
-    (aTasklet.Get<Owner>().*HandleTaskletPtr)();
-}
-
-template <typename Owner, void (Owner::*HandleTimertPtr)(void)>
-void TimerMilliIn<Owner, HandleTimertPtr>::HandleTimer(Timer &aTimer)
-{
-    (aTimer.Get<Owner>().*HandleTimertPtr)();
-}
-
-#if OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE
-template <typename Owner, void (Owner::*HandleTimertPtr)(void)>
-void TimerMicroIn<Owner, HandleTimertPtr>::HandleTimer(Timer &aTimer)
-{
-    (aTimer.Get<Owner>().*HandleTimertPtr)();
-}
-#endif
-
-} // namespace ot
-
-#endif // LOCATOR_GETTERS_HPP_

src/core/common/message.cpp

@@ -37,7 +37,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/heap.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "common/numeric_limits.hpp"

src/core/common/notifier.cpp

@@ -37,8 +37,8 @@
 #include "common/array.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 

src/core/common/settings.cpp

@@ -36,7 +36,6 @@
 #include "common/array.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/num_utils.hpp"
 #include "instance/instance.hpp"
 #include "meshcop/dataset.hpp"

src/core/common/tasklet.cpp

@@ -34,7 +34,7 @@
 #include "tasklet.hpp"
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 

src/core/common/tasklet.hpp

@@ -171,7 +171,7 @@ public:
     }
 
 private:
-    static void HandleTasklet(Tasklet &aTasklet); // Implemented in `locator_getters.hpp`
+    static void HandleTasklet(Tasklet &aTasklet); // Implemented in `instance.hpp`
 };
 
 /**

src/core/common/time_ticker.cpp

@@ -35,7 +35,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"
 #include "thread/mle_router.hpp"

src/core/common/timer.cpp

@@ -36,7 +36,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 namespace ot {

src/core/common/timer.hpp

@@ -353,7 +353,7 @@ public:
     }
 
 private:
-    static void HandleTimer(Timer &aTimer); // Implemented in `locator_getters.hpp`
+    static void HandleTimer(Timer &aTimer); // Implemented in `instance.hpp`
 };
 
 /**
@@ -514,7 +514,7 @@ public:
     }
 
 private:
-    static void HandleTimer(Timer &aTimer); // Implemented in `locator_getters.hpp`
+    static void HandleTimer(Timer &aTimer); // Implemented in `instance.hpp`
 };
 
 #endif // OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE

src/core/common/uptime.cpp

@@ -37,7 +37,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 namespace ot {

src/core/diags/factory_diags.cpp

@@ -45,7 +45,6 @@
 
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"
 #include "radio/radio.hpp"

src/core/instance/instance.hpp

@@ -47,6 +47,7 @@
 #include "common/array.hpp"
 #include "common/as_core_type.hpp"
 #include "common/error.hpp"
+#include "common/locator.hpp"
 #include "common/log.hpp"
 #include "common/message.hpp"
 #include "common/non_copyable.hpp"
@@ -1109,6 +1110,35 @@ template <> inline FactoryDiags::Diags &Instance::Get(void) { return mDiags; }
 template <> inline Utils::PowerCalibration &Instance::Get(void) { return mPowerCalibration; }
 #endif
 
+//---------------------------------------------------------------------------------------------------------------------
+
+template <typename InstanceGetProvider>
+template <typename Type>
+inline Type &GetProvider<InstanceGetProvider>::Get(void) const
+{
+    return static_cast<const InstanceGetProvider *>(this)->GetInstance().template Get<Type>();
+}
+
+template <typename Owner, void (Owner::*HandleTaskletPtr)(void)>
+void TaskletIn<Owner, HandleTaskletPtr>::HandleTasklet(Tasklet &aTasklet)
+{
+    (aTasklet.Get<Owner>().*HandleTaskletPtr)();
+}
+
+template <typename Owner, void (Owner::*HandleTimertPtr)(void)>
+void TimerMilliIn<Owner, HandleTimertPtr>::HandleTimer(Timer &aTimer)
+{
+    (aTimer.Get<Owner>().*HandleTimertPtr)();
+}
+
+#if OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE
+template <typename Owner, void (Owner::*HandleTimertPtr)(void)>
+void TimerMicroIn<Owner, HandleTimertPtr>::HandleTimer(Timer &aTimer)
+{
+    (aTimer.Get<Owner>().*HandleTimertPtr)();
+}
+#endif
+
 /**
  * @}
  *

src/core/mac/data_poll_handler.cpp

@@ -36,7 +36,6 @@
 #if OPENTHREAD_FTD
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 

src/core/mac/data_poll_sender.cpp

@@ -34,7 +34,6 @@
 #include "data_poll_sender.hpp"
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/message.hpp"
 #include "common/num_utils.hpp"

src/core/mac/link_raw.cpp

@@ -40,7 +40,6 @@
 #include <openthread/platform/diag.h>
 
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"

src/core/mac/mac.cpp

@@ -40,7 +40,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/random.hpp"
 #include "common/string.hpp"
 #include "crypto/aes_ccm.hpp"

src/core/mac/mac_links.cpp

@@ -34,7 +34,6 @@
 #include "mac_links.hpp"
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 namespace ot {

src/core/mac/sub_mac.cpp

@@ -39,7 +39,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "common/random.hpp"

src/core/mac/sub_mac_callbacks.cpp

@@ -34,7 +34,6 @@
 #include "sub_mac.hpp"
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 #if OPENTHREAD_FTD || OPENTHREAD_MTD

src/core/mac/sub_mac_csl_receiver.cpp

@@ -36,7 +36,6 @@
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 

src/core/meshcop/announce_begin_client.cpp

@@ -38,7 +38,6 @@
 #include "coap/coap_message.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "meshcop/meshcop.hpp"

src/core/meshcop/border_agent.cpp

@@ -38,7 +38,6 @@
 #include "coap/coap_message.hpp"
 #include "common/as_core_type.hpp"
 #include "common/heap.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/owned_ptr.hpp"
 #include "common/settings.hpp"

src/core/meshcop/commissioner.cpp

@@ -41,7 +41,6 @@
 #include "common/array.hpp"
 #include "common/as_core_type.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"
 #include "meshcop/joiner.hpp"

src/core/meshcop/dataset.cpp

@@ -38,7 +38,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "mac/mac_types.hpp"

src/core/meshcop/dataset_manager.cpp

@@ -37,7 +37,6 @@
 #include <stdio.h>
 
 #include "common/as_core_type.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/notifier.hpp"
 #include "instance/instance.hpp"

src/core/meshcop/dataset_manager_ftd.cpp

@@ -44,7 +44,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "common/timer.hpp"

src/core/meshcop/dataset_updater.cpp

@@ -37,7 +37,6 @@
 #if (OPENTHREAD_CONFIG_DATASET_UPDATER_ENABLE || OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE) && OPENTHREAD_FTD
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"

src/core/meshcop/energy_scan_client.cpp

@@ -40,7 +40,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "instance/instance.hpp"

src/core/meshcop/extended_panid.cpp

@@ -34,8 +34,8 @@
 
 #include "extended_panid.hpp"
 
-#include "common/locator_getters.hpp"
 #include "common/notifier.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 namespace MeshCoP {

src/core/meshcop/joiner.cpp

@@ -42,7 +42,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"

src/core/meshcop/joiner_router.cpp

@@ -40,7 +40,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "meshcop/meshcop.hpp"

src/core/meshcop/meshcop.cpp

@@ -38,9 +38,9 @@
 #include "common/clearable.hpp"
 #include "common/crc16.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/string.hpp"
 #include "crypto/sha256.hpp"
+#include "instance/instance.hpp"
 #include "mac/mac_types.hpp"
 #include "thread/thread_netif.hpp"
 

src/core/meshcop/meshcop_leader.cpp

@@ -40,7 +40,6 @@
 #include "coap/coap_message.hpp"
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/random.hpp"
 #include "instance/instance.hpp"

src/core/meshcop/network_name.cpp

@@ -34,8 +34,8 @@
 
 #include "network_name.hpp"
 
-#include "common/locator_getters.hpp"
 #include "common/notifier.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 namespace MeshCoP {

src/core/meshcop/panid_query_client.cpp

@@ -39,7 +39,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "meshcop/meshcop.hpp"

src/core/meshcop/secure_transport.cpp

@@ -45,7 +45,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/timer.hpp"
 #include "crypto/mbedtls.hpp"

src/core/meshcop/tcat_agent.cpp

@@ -41,7 +41,6 @@
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"
 #include "radio/radio.hpp"

src/core/net/dhcp6_client.cpp

@@ -38,7 +38,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "mac/mac.hpp"

src/core/net/dhcp6_server.cpp

@@ -39,7 +39,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/encoding.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "thread/mle.hpp"

src/core/net/dns_client.cpp

@@ -34,7 +34,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "instance/instance.hpp"
 #include "net/udp6.hpp"

src/core/net/dns_dso.cpp

@@ -34,7 +34,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/num_utils.hpp"
 #include "common/random.hpp"

src/core/net/dnssd.cpp

@@ -36,7 +36,6 @@
 #if OPENTHREAD_CONFIG_PLATFORM_DNSSD_ENABLE || OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE
 
 #include "common/code_utils.hpp"
-#include "common/locator_getters.hpp"
 #include "instance/instance.hpp"
 
 namespace ot {

src/core/net/dnssd_server.cpp

@@ -41,7 +41,6 @@
 #include "common/as_core_type.hpp"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/string.hpp"
 #include "instance/instance.hpp"

src/core/net/icmp6.cpp

@@ -35,7 +35,6 @@
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
-#include "common/locator_getters.hpp"
 #include "common/log.hpp"
 #include "common/message.hpp"
 #include "instance/instance.hpp"