Merge pull request #8243 from hzeller/feature-20250905-no-globel-pollute

Don't pollute global namespace with using declaration.

Author: maliberty

src/drt/src/AbstractGraphicsFactory.h

@@ -21,7 +21,7 @@ class AbstractGraphicsFactory
   virtual void reset(frDebugSettings* settings,
                      frDesign* design,
                      odb::dbDatabase* db,
-                     Logger* logger,
+                     utl::Logger* logger,
                      RouterConfiguration* router_cfg)
       = 0;
   virtual bool guiActive() = 0;

src/drt/src/GraphicsFactory.cpp

@@ -18,7 +18,7 @@ GraphicsFactory::~GraphicsFactory() = default;
 void GraphicsFactory::reset(frDebugSettings* settings,
                             frDesign* design,
                             odb::dbDatabase* db,
-                            Logger* logger,
+                            utl::Logger* logger,
                             RouterConfiguration* router_cfg)
 {
   settings_ = settings;

src/drt/src/GraphicsFactory.h

@@ -23,7 +23,7 @@ class GraphicsFactory : public AbstractGraphicsFactory
   void reset(frDebugSettings* settings,
              frDesign* design,
              odb::dbDatabase* db,
-             Logger* logger,
+             utl::Logger* logger,
              RouterConfiguration* router_cfg) override;
   bool guiActive() override;
   std::unique_ptr<AbstractDRGraphics> makeUniqueDRGraphics() override;
@@ -34,7 +34,7 @@ class GraphicsFactory : public AbstractGraphicsFactory
   frDebugSettings* settings_;
   frDesign* design_;
   odb::dbDatabase* db_;
-  Logger* logger_;
+  utl::Logger* logger_;
   RouterConfiguration* router_cfg_;
 };
 

src/drt/src/TritonRoute.cpp

@@ -537,7 +537,7 @@ void TritonRoute::applyUpdates(
 
 void TritonRoute::init(
     odb::dbDatabase* db,
-    Logger* logger,
+    utl::Logger* logger,
     utl::CallBackHandler* callback_handler,
     dst::Distributed* dist,
     stt::SteinerTreeBuilder* stt_builder,

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

@@ -10,11 +10,12 @@
 #include <ostream>
 
 #include "boost/io/ios_state.hpp"
+#include "utl/Logger.h"
 #include "utl/mem_stats.h"
 
 namespace drt {
 
-void frTime::print(Logger* logger)
+void frTime::print(utl::Logger* logger)
 {
   auto t1 = std::chrono::high_resolution_clock::now();
   auto time_span = std::chrono::duration_cast<std::chrono::seconds>(t1 - t0_);

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

@@ -8,14 +8,15 @@
 #include <iostream>
 
 #include "frBaseTypes.h"
+#include "utl/Logger.h"
 
 namespace drt {
 class frTime
 {
  public:
   frTime() : t0_(std::chrono::high_resolution_clock::now()), t_(clock()) {}
   std::chrono::high_resolution_clock::time_point getT0() const { return t0_; }
-  void print(Logger* logger);
+  void print(utl::Logger* logger);
   bool isExceed(double in)
   {
     auto t1 = std::chrono::high_resolution_clock::now();

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

@@ -252,7 +252,7 @@ class frTechObject
     }
   }
 
-  void printDefaultVias(Logger* logger, RouterConfiguration* router_cfg)
+  void printDefaultVias(utl::Logger* logger, RouterConfiguration* router_cfg)
   {
     logger->info(DRT, 167, "List of default vias:");
     for (auto& layer : layers_) {

src/drt/src/dr/FlexDR.cpp

@@ -101,7 +101,7 @@ void serializeViaData(const FlexDRViaData& viaData, std::string& serializedStr)
 
 FlexDR::FlexDR(TritonRoute* router,
                frDesign* designIn,
-               Logger* loggerIn,
+               utl::Logger* loggerIn,
                odb::dbDatabase* dbIn,
                RouterConfiguration* router_cfg)
     : router_(router),
@@ -603,7 +603,9 @@ std::unique_ptr<FlexDRWorker> FlexDR::createWorker(const int x_offset,
 }
 
 namespace {
-void printIteration(Logger* logger, const int iter, const bool stubborn_flow)
+void printIteration(utl::Logger* logger,
+                    const int iter,
+                    const bool stubborn_flow)
 {
   std::string suffix;
   if (iter == 1 || (iter > 20 && iter % 10 == 1)) {
@@ -623,7 +625,7 @@ void printIteration(Logger* logger, const int iter, const bool stubborn_flow)
                stubborn_flow ? "stubborn tiles" : "optimization");
 }
 
-void printIterationProgress(Logger* logger,
+void printIterationProgress(utl::Logger* logger,
                             FlexDR::IterationProgress& iter_prog,
                             const int num_markers,
                             const int max_perc = 90)

src/drt/src/dr/FlexDR.h

@@ -101,7 +101,7 @@ class FlexDR
   // constructors
   FlexDR(TritonRoute* router,
          frDesign* designIn,
-         Logger* loggerIn,
+         utl::Logger* loggerIn,
          odb::dbDatabase* dbIn,
          RouterConfiguration* router_cfg);
   ~FlexDR();
@@ -119,7 +119,7 @@ class FlexDR
   void setDebug(std::unique_ptr<AbstractDRGraphics> dr_graphics);
 
   // For post-deserialization update
-  void setLogger(Logger* logger) { logger_ = logger; }
+  void setLogger(utl::Logger* logger) { logger_ = logger; }
   void setDB(odb::dbDatabase* db) { db_ = db; }
   AbstractDRGraphics* getGraphics() { return graphics_.get(); }
   // distributed
@@ -147,7 +147,7 @@ class FlexDR
   IterationsControl control_;
   TritonRoute* router_;
   frDesign* design_;
-  Logger* logger_;
+  utl::Logger* logger_;
   odb::dbDatabase* db_;
   RouterConfiguration* router_cfg_;
   std::vector<std::vector<
@@ -273,7 +273,7 @@ class FlexDRWorker
   // constructors
   FlexDRWorker(FlexDRViaData* via_data,
                frDesign* design,
-               Logger* logger,
+               utl::Logger* logger,
                RouterConfiguration* router_cfg)
       : design_(design),
         logger_(logger),
@@ -429,8 +429,8 @@ class FlexDRWorker
   std::string reloadedMain();
   bool end(frDesign* design);
 
-  Logger* getLogger() { return logger_; }
-  void setLogger(Logger* logger)
+  utl::Logger* getLogger() { return logger_; }
+  void setLogger(utl::Logger* logger)
   {
     logger_ = logger;
     gridGraph_.setLogger(logger);
@@ -493,7 +493,7 @@ class FlexDRWorker
     }
   };
   frDesign* design_{nullptr};
-  Logger* logger_{nullptr};
+  utl::Logger* logger_{nullptr};
   RouterConfiguration* router_cfg_{nullptr};
   AbstractDRGraphics* graphics_{nullptr};  // owned by FlexDR
   frDebugSettings* debugSettings_{nullptr};

src/drt/src/dr/FlexDR_conn.cpp

@@ -1363,7 +1363,7 @@ void FlexDRConnectivityChecker::check(int iter)
 
 FlexDRConnectivityChecker::FlexDRConnectivityChecker(
     drt::TritonRoute* router,
-    Logger* logger,
+    utl::Logger* logger,
     RouterConfiguration* router_cfg,
     AbstractDRGraphics* graphics,
     bool save_updates)