Merge branch 'master' into cts_balance_latencies

Author: arthurjolo

src/README.md

@@ -215,10 +215,10 @@ write_cdl
 
 ### Examples
 ```
-write_cdl -master {netlist1.cdl netlist2.cdl ...} -include_fillers netlist.cdl
+write_cdl -masters {netlist1.cdl netlist2.cdl ...} -include_fillers netlist.cdl
 
 # To write a database file with gzip compression.
-write_cdl -master {netlist1.cdl netlist2.cdl ...} -include_fillers netlist.cdl.gz
+write_cdl -masters {netlist1.cdl netlist2.cdl ...} -include_fillers netlist.cdl.gz
 ```
 
 ### Global Connections

src/odb/src/swig/common/swig_common.cpp

@@ -28,8 +28,8 @@ using namespace boost::polygon::operators;
 
 odb::dbLib* read_lef(odb::dbDatabase* db, const char* path)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
-  odb::lefin lefParser(db, logger, false);
+  utl::Logger logger(nullptr);
+  odb::lefin lefParser(db, &logger, false);
   const char* libname = basename(const_cast<char*>(path));
   if (!db->getTech()) {
     return lefParser.createTechAndLib(libname, libname, path);
@@ -39,14 +39,14 @@ odb::dbLib* read_lef(odb::dbDatabase* db, const char* path)
 
 odb::dbChip* read_def(odb::dbTech* tech, std::string path)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
+  utl::Logger logger(nullptr);
   std::vector<odb::dbLib*> libs;
   for (auto* lib : tech->getDb()->getLibs()) {
     if (lib->getTech() == tech) {
       libs.push_back(lib);
     }
   }
-  odb::defin defParser(tech->getDb(), logger);
+  odb::defin defParser(tech->getDb(), &logger);
   auto db = tech->getDb();
   odb::dbChip* chip = nullptr;
   if (db->getChip() == nullptr) {
@@ -62,40 +62,40 @@ int write_def(odb::dbBlock* block,
               const char* path,
               odb::DefOut::Version version)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
-  odb::DefOut writer(logger);
+  utl::Logger logger(nullptr);
+  odb::DefOut writer(&logger);
   writer.setVersion(version);
   return writer.writeBlock(block, path);
 }
 
 int write_lef(odb::dbLib* lib, const char* path)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
+  utl::Logger logger(nullptr);
   std::ofstream os;
   os.exceptions(std::ofstream::badbit | std::ofstream::failbit);
   os.open(path);
-  odb::lefout writer(logger, os);
+  odb::lefout writer(&logger, os);
   writer.writeTechAndLib(lib);
   return true;
 }
 
 int write_tech_lef(odb::dbTech* tech, const char* path)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
+  utl::Logger logger(nullptr);
   std::ofstream os;
   os.exceptions(std::ofstream::badbit | std::ofstream::failbit);
   os.open(path);
-  odb::lefout writer(logger, os);
+  odb::lefout writer(&logger, os);
   writer.writeTech(tech);
   return true;
 }
 int write_macro_lef(odb::dbLib* lib, const char* path)
 {
-  utl::Logger* logger = new utl::Logger(nullptr);
+  utl::Logger logger(nullptr);
   std::ofstream os;
   os.exceptions(std::ofstream::badbit | std::ofstream::failbit);
   os.open(path);
-  odb::lefout writer(logger, os);
+  odb::lefout writer(&logger, os);
   writer.writeLib(lib);
   return true;
 }

src/rcx/src/extmain.cpp

@@ -64,6 +64,9 @@ int extMain::getExtCornerIndex(dbBlock* block, const char* cornerName)
 
 void extMain::adjustRC(double resFactor, double ccFactor, double gndcFactor)
 {
+  if (!_block) {
+    logger_->error(RCX, 4, "Design not loaded.");
+  }
   double res_factor = resFactor / _resFactor;
   _resFactor = resFactor;
   _resModify = resFactor == 1.0 ? false : true;