Skip to content

Commit 7ebc63d

Browse files
committed
Don't pollute global namespace with using declaration.
First cleanup of possibly many: remove ``` using Logger = utl::Logger ``` In header file, it was polluting the entire grt namespace. Using declarations should never be in header files that affect some global scope. Signed-off-by: Henner Zeller <[email protected]>
1 parent 72c585d commit 7ebc63d

38 files changed

+88
-70
lines changed

src/drt/src/AbstractGraphicsFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AbstractGraphicsFactory
2121
virtual void reset(frDebugSettings* settings,
2222
frDesign* design,
2323
odb::dbDatabase* db,
24-
Logger* logger,
24+
utl::Logger* logger,
2525
RouterConfiguration* router_cfg)
2626
= 0;
2727
virtual bool guiActive() = 0;

src/drt/src/GraphicsFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GraphicsFactory::~GraphicsFactory() = default;
1818
void GraphicsFactory::reset(frDebugSettings* settings,
1919
frDesign* design,
2020
odb::dbDatabase* db,
21-
Logger* logger,
21+
utl::Logger* logger,
2222
RouterConfiguration* router_cfg)
2323
{
2424
settings_ = settings;

src/drt/src/GraphicsFactory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GraphicsFactory : public AbstractGraphicsFactory
2323
void reset(frDebugSettings* settings,
2424
frDesign* design,
2525
odb::dbDatabase* db,
26-
Logger* logger,
26+
utl::Logger* logger,
2727
RouterConfiguration* router_cfg) override;
2828
bool guiActive() override;
2929
std::unique_ptr<AbstractDRGraphics> makeUniqueDRGraphics() override;
@@ -34,7 +34,7 @@ class GraphicsFactory : public AbstractGraphicsFactory
3434
frDebugSettings* settings_;
3535
frDesign* design_;
3636
odb::dbDatabase* db_;
37-
Logger* logger_;
37+
utl::Logger* logger_;
3838
RouterConfiguration* router_cfg_;
3939
};
4040

src/drt/src/TritonRoute.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ void TritonRoute::applyUpdates(
537537

538538
void TritonRoute::init(
539539
odb::dbDatabase* db,
540-
Logger* logger,
540+
utl::Logger* logger,
541541
utl::CallBackHandler* callback_handler,
542542
dst::Distributed* dist,
543543
stt::SteinerTreeBuilder* stt_builder,

src/drt/src/db/infra/frTime.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
#include <ostream>
1111

1212
#include "boost/io/ios_state.hpp"
13+
#include "utl/Logger.h"
1314
#include "utl/mem_stats.h"
1415

1516
namespace drt {
1617

17-
void frTime::print(Logger* logger)
18+
void frTime::print(utl::Logger* logger)
1819
{
1920
auto t1 = std::chrono::high_resolution_clock::now();
2021
auto time_span = std::chrono::duration_cast<std::chrono::seconds>(t1 - t0_);

src/drt/src/db/infra/frTime.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
#include <iostream>
99

1010
#include "frBaseTypes.h"
11+
#include "utl/Logger.h"
1112

1213
namespace drt {
1314
class frTime
1415
{
1516
public:
1617
frTime() : t0_(std::chrono::high_resolution_clock::now()), t_(clock()) {}
1718
std::chrono::high_resolution_clock::time_point getT0() const { return t0_; }
18-
void print(Logger* logger);
19+
void print(utl::Logger* logger);
1920
bool isExceed(double in)
2021
{
2122
auto t1 = std::chrono::high_resolution_clock::now();

src/drt/src/db/tech/frTechObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class frTechObject
252252
}
253253
}
254254

255-
void printDefaultVias(Logger* logger, RouterConfiguration* router_cfg)
255+
void printDefaultVias(utl::Logger* logger, RouterConfiguration* router_cfg)
256256
{
257257
logger->info(DRT, 167, "List of default vias:");
258258
for (auto& layer : layers_) {

src/drt/src/dr/FlexDR.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void serializeViaData(const FlexDRViaData& viaData, std::string& serializedStr)
101101

102102
FlexDR::FlexDR(TritonRoute* router,
103103
frDesign* designIn,
104-
Logger* loggerIn,
104+
utl::Logger* loggerIn,
105105
odb::dbDatabase* dbIn,
106106
RouterConfiguration* router_cfg)
107107
: router_(router),
@@ -603,7 +603,9 @@ std::unique_ptr<FlexDRWorker> FlexDR::createWorker(const int x_offset,
603603
}
604604

605605
namespace {
606-
void printIteration(Logger* logger, const int iter, const bool stubborn_flow)
606+
void printIteration(utl::Logger* logger,
607+
const int iter,
608+
const bool stubborn_flow)
607609
{
608610
std::string suffix;
609611
if (iter == 1 || (iter > 20 && iter % 10 == 1)) {
@@ -623,7 +625,7 @@ void printIteration(Logger* logger, const int iter, const bool stubborn_flow)
623625
stubborn_flow ? "stubborn tiles" : "optimization");
624626
}
625627

626-
void printIterationProgress(Logger* logger,
628+
void printIterationProgress(utl::Logger* logger,
627629
FlexDR::IterationProgress& iter_prog,
628630
const int num_markers,
629631
const int max_perc = 90)

src/drt/src/dr/FlexDR.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class FlexDR
101101
// constructors
102102
FlexDR(TritonRoute* router,
103103
frDesign* designIn,
104-
Logger* loggerIn,
104+
utl::Logger* loggerIn,
105105
odb::dbDatabase* dbIn,
106106
RouterConfiguration* router_cfg);
107107
~FlexDR();
@@ -119,7 +119,7 @@ class FlexDR
119119
void setDebug(std::unique_ptr<AbstractDRGraphics> dr_graphics);
120120

121121
// For post-deserialization update
122-
void setLogger(Logger* logger) { logger_ = logger; }
122+
void setLogger(utl::Logger* logger) { logger_ = logger; }
123123
void setDB(odb::dbDatabase* db) { db_ = db; }
124124
AbstractDRGraphics* getGraphics() { return graphics_.get(); }
125125
// distributed
@@ -147,7 +147,7 @@ class FlexDR
147147
IterationsControl control_;
148148
TritonRoute* router_;
149149
frDesign* design_;
150-
Logger* logger_;
150+
utl::Logger* logger_;
151151
odb::dbDatabase* db_;
152152
RouterConfiguration* router_cfg_;
153153
std::vector<std::vector<
@@ -273,7 +273,7 @@ class FlexDRWorker
273273
// constructors
274274
FlexDRWorker(FlexDRViaData* via_data,
275275
frDesign* design,
276-
Logger* logger,
276+
utl::Logger* logger,
277277
RouterConfiguration* router_cfg)
278278
: design_(design),
279279
logger_(logger),
@@ -429,8 +429,8 @@ class FlexDRWorker
429429
std::string reloadedMain();
430430
bool end(frDesign* design);
431431

432-
Logger* getLogger() { return logger_; }
433-
void setLogger(Logger* logger)
432+
utl::Logger* getLogger() { return logger_; }
433+
void setLogger(utl::Logger* logger)
434434
{
435435
logger_ = logger;
436436
gridGraph_.setLogger(logger);
@@ -493,7 +493,7 @@ class FlexDRWorker
493493
}
494494
};
495495
frDesign* design_{nullptr};
496-
Logger* logger_{nullptr};
496+
utl::Logger* logger_{nullptr};
497497
RouterConfiguration* router_cfg_{nullptr};
498498
AbstractDRGraphics* graphics_{nullptr}; // owned by FlexDR
499499
frDebugSettings* debugSettings_{nullptr};

src/drt/src/dr/FlexDR_conn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,7 @@ void FlexDRConnectivityChecker::check(int iter)
13631363

13641364
FlexDRConnectivityChecker::FlexDRConnectivityChecker(
13651365
drt::TritonRoute* router,
1366-
Logger* logger,
1366+
utl::Logger* logger,
13671367
RouterConfiguration* router_cfg,
13681368
AbstractDRGraphics* graphics,
13691369
bool save_updates)

0 commit comments

Comments
 (0)