Skip to content

Commit 0680231

Browse files
committed
Remove TdiVirtualPortManager since its unused
Signed-off-by: Sabeel Ansari <sabeel.ansari@intel.com>
1 parent 7f03c57 commit 0680231

File tree

6 files changed

+9
-111
lines changed

6 files changed

+9
-111
lines changed

stratum/hal/lib/tdi/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build file for //stratum/hal/lib/tdi
22
#
3-
# Copyright 2022-2025 Intel Corporation
3+
# Copyright 2022-2024 Intel Corporation
44
# SPDX-License-Identifier: Apache 2.0
55
#
66

@@ -48,8 +48,6 @@ add_library(stratum_tdi_common_o OBJECT
4848
tdi_sde_wrapper.h
4949
tdi_table_manager.cc
5050
tdi_table_manager.h
51-
tdi_virtual_port_manager.cc
52-
tdi_virtual_port_manager.h
5351
utils.cc
5452
utils.h
5553
)

stratum/hal/lib/tdi/es2k/es2k_chassis_manager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "stratum/hal/lib/common/writer_interface.h"
2020
#include "stratum/hal/lib/tdi/tdi_global_vars.h"
2121
#include "stratum/hal/lib/tdi/tdi_port_manager.h"
22-
#include "stratum/hal/lib/tdi/tdi_virtual_port_manager.h"
2322
#include "stratum/lib/channel/channel.h"
2423

2524
namespace stratum {

stratum/hal/lib/tdi/es2k/es2k_virtual_port_manager.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ namespace tdi {
4444

4545
Es2kVirtualPortManager* Es2kVirtualPortManager::singleton_ = nullptr;
4646

47+
ABSL_CONST_INIT absl::Mutex Es2kVirtualPortManager::init_lock_(absl::kConstInit);
48+
4749
Es2kVirtualPortManager* Es2kVirtualPortManager::CreateSingleton() {
4850
absl::WriterMutexLock l(&init_lock_);
4951
if (!singleton_) {

stratum/hal/lib/tdi/es2k/es2k_virtual_port_manager.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "absl/synchronization/mutex.h"
1414
#include "stratum/hal/lib/tdi/tdi_fixed_function_manager.h"
1515
#include "stratum/hal/lib/tdi/tdi_sde_interface.h"
16-
#include "stratum/hal/lib/tdi/tdi_virtual_port_manager.h"
1716

1817
// Suppress clang errors
1918
#undef LOCKS_EXCLUDED
@@ -23,7 +22,7 @@ namespace stratum {
2322
namespace hal {
2423
namespace tdi {
2524

26-
class Es2kVirtualPortManager : public TdiVirtualPortManager {
25+
class Es2kVirtualPortManager {
2726
public:
2827
Es2kVirtualPortManager() {}
2928
virtual ~Es2kVirtualPortManager() {}
@@ -47,6 +46,11 @@ class Es2kVirtualPortManager : public TdiVirtualPortManager {
4746
static Es2kVirtualPortManager* GetSingleton() LOCKS_EXCLUDED(init_lock_);
4847

4948
protected:
49+
// RW mutex lock for protecting the singleton instance initialization and
50+
// reading it back from other threads. Unlike other singleton classes, we
51+
// use RW lock as we need the pointer to class to be returned.
52+
static absl::Mutex init_lock_;
53+
5054
// The singleton instance.
5155
static Es2kVirtualPortManager* singleton_ GUARDED_BY(init_lock_);
5256

stratum/hal/lib/tdi/tdi_virtual_port_manager.cc

Lines changed: 0 additions & 38 deletions
This file was deleted.

stratum/hal/lib/tdi/tdi_virtual_port_manager.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)