Skip to content

Commit 59d91f2

Browse files
jhkim-piijhkim-pii
committed
Moved DB_ECO debug log location before block->journal_check
Signed-off-by: Jaehyun Kim <[email protected]>
1 parent 7e7afae commit 59d91f2

File tree

13 files changed

+574
-673
lines changed

13 files changed

+574
-673
lines changed

‎src/odb/include/odb/dbObject.h‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,20 @@ class dbObject
170170

171171
static const char* getTypeName(dbObjectType type);
172172
static dbObjectType getType(const char* name, utl::Logger* logger);
173-
// These are not intended for client use as the returned class is
174-
// not exported. They are for internal db convenience.
173+
174+
///
175+
/// These are not intended for client use as the returned class is
176+
/// not exported. They are for internal db convenience.
177+
///
175178
_dbObject* getImpl();
176179
const _dbObject* getImpl() const;
177180

181+
///
182+
/// Returns object name for debugging
183+
/// e.g., "dbITerm(123@0x555551234b, "u0/buf/A")"
184+
///
185+
std::string getDebugName() const;
186+
178187
protected:
179188
dbObject() = default;
180189
~dbObject() = default;

‎src/odb/src/db/dbBTerm.cpp‎

Lines changed: 30 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ void dbBTerm::setSigType(dbSigType type)
271271
utl::ODB,
272272
"DB_ECO",
273273
2,
274-
"ECO: setSigType {}",
274+
"ECO: {} setSigType {}",
275+
bterm->getDebugName(),
275276
type.getValue());
276277

277278
if (block->journal_) {
@@ -302,7 +303,8 @@ void dbBTerm::setIoType(dbIoType type)
302303
utl::ODB,
303304
"DB_ECO",
304305
2,
305-
"ECO: setIoType {}",
306+
"ECO: {} setIoType {}",
307+
bterm->getDebugName(),
306308
type.getValue());
307309

308310
if (block->journal_) {
@@ -616,16 +618,6 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
616618
net->name_);
617619
}
618620

619-
debugPrint(block->getImpl()->getLogger(),
620-
utl::ODB,
621-
"DB_ECO",
622-
1,
623-
"ECO: create dbBTerm '{}' on dbNet({}, {:p}) '{}'",
624-
name,
625-
net->getId(),
626-
static_cast<void*>(net),
627-
name);
628-
629621
if (block->journal_) {
630622
block->journal_->beginAction(dbJournal::kCreateObject);
631623
block->journal_->pushParam(dbBTermObj);
@@ -638,6 +630,14 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
638630
bterm->name_ = safe_strdup(name);
639631
block->bterm_hash_.insert(bterm);
640632

633+
debugPrint(block->getImpl()->getLogger(),
634+
utl::ODB,
635+
"DB_ECO",
636+
1,
637+
"ECO: create {} on {}",
638+
bterm->getDebugName(),
639+
net->getDebugName());
640+
641641
// If there is a parentInst then we need to update the dbMaster's
642642
// mterms, the parent dbInst's iterms, and the dbHier to match
643643
dbBlock* block_public = (dbBlock*) block;
@@ -686,13 +686,9 @@ void _dbBTerm::connectModNet(_dbModNet* mod_net, _dbBlock* block)
686686
utl::ODB,
687687
"DB_ECO",
688688
1,
689-
"ECO: connect dbBTerm({} {:p}) '{}' to dbModNet({} {:p}) '{}'",
690-
bterm->getId(),
691-
static_cast<void*>(bterm),
692-
bterm->name_,
693-
mod_net->getId(),
694-
static_cast<void*>(mod_net),
695-
((dbModNet*) mod_net)->getHierarchicalName());
689+
"ECO: connect {} to {}",
690+
bterm->getDebugName(),
691+
mod_net->getDebugName());
696692

697693
if (block->journal_) {
698694
block->journal_->beginAction(dbJournal::kConnectObject);
@@ -724,13 +720,9 @@ void _dbBTerm::connectNet(_dbNet* net, _dbBlock* block)
724720
utl::ODB,
725721
"DB_ECO",
726722
1,
727-
"ECO: connect dbBTerm({} {:p}) '{}' to dbNet({} {:p}) '{}'",
728-
bterm->getId(),
729-
static_cast<void*>(bterm),
730-
bterm->name_,
731-
net->getId(),
732-
static_cast<void*>(net),
733-
((dbNet*) net)->getName());
723+
"ECO: connect {} to {}",
724+
bterm->getDebugName(),
725+
net->getDebugName());
734726

735727
if (block->journal_) {
736728
block->journal_->beginAction(dbJournal::kConnectObject);
@@ -793,10 +785,8 @@ void dbBTerm::destroy(dbBTerm* bterm_)
793785
utl::ODB,
794786
"DB_ECO",
795787
1,
796-
"ECO: delete dbBTerm({}, {:p}) '{}'",
797-
bterm->getId(),
798-
static_cast<void*>(bterm),
799-
bterm->name_);
788+
"ECO: delete {}",
789+
bterm->getDebugName());
800790

801791
if (block->journal_) {
802792
block->journal_->beginAction(dbJournal::kDeleteObject);
@@ -819,13 +809,9 @@ void _dbBTerm::disconnectNet(_dbBTerm* bterm, _dbBlock* block)
819809
utl::ODB,
820810
"DB_ECO",
821811
1,
822-
"ECO: disconnect dbBTerm({} {:p}) '{}' from dbNet({} {:p}) '{}'",
823-
bterm->getId(),
824-
static_cast<void*>(bterm),
825-
bterm->name_,
826-
net->getId(),
827-
static_cast<void*>(net),
828-
net->name_);
812+
"ECO: disconnect {} from {}",
813+
bterm->getDebugName(),
814+
net->getDebugName());
829815

830816
// Journal
831817
if (block->journal_) {
@@ -874,18 +860,13 @@ void _dbBTerm::disconnectModNet(_dbBTerm* bterm, _dbBlock* block)
874860
if (bterm->mnet_) {
875861
_dbModNet* mod_net = block->modnet_tbl_->getPtr(bterm->mnet_);
876862

877-
debugPrint(
878-
block->getImpl()->getLogger(),
879-
utl::ODB,
880-
"DB_ECO",
881-
1,
882-
"ECO: disconnect dbBTerm({} {:p}) '{}' from dbModNet({} {:p}) '{}'",
883-
bterm->getId(),
884-
static_cast<void*>(bterm),
885-
bterm->name_,
886-
mod_net->getId(),
887-
static_cast<void*>(mod_net),
888-
((dbModNet*) mod_net)->getHierarchicalName());
863+
debugPrint(block->getImpl()->getLogger(),
864+
utl::ODB,
865+
"DB_ECO",
866+
1,
867+
"ECO: disconnect {} from {}",
868+
bterm->getDebugName(),
869+
mod_net->getDebugName());
889870

890871
if (block->journal_) {
891872
block->journal_->beginAction(dbJournal::kDisconnectObject);

‎src/odb/src/db/dbITerm.cpp‎

Lines changed: 43 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -347,18 +347,15 @@ void dbITerm::connect(dbNet* net_)
347347
callback->inDbITermPreConnect(this, net_);
348348
}
349349

350+
debugPrint(getImpl()->getLogger(),
351+
utl::ODB,
352+
"DB_ECO",
353+
1,
354+
"ECO: connect {} to {}",
355+
iterm->getDebugName(),
356+
net->getDebugName());
357+
350358
if (block->journal_) {
351-
debugPrint(getImpl()->getLogger(),
352-
utl::ODB,
353-
"DB_ECO",
354-
1,
355-
"ECO: connect dbITerm({}, {:p}) '{}' to dbNet({}, {:p}) '{}'",
356-
getId(),
357-
static_cast<void*>(this),
358-
getName(),
359-
net->getId(),
360-
static_cast<void*>(net),
361-
net_->getName());
362359
block->journal_->beginAction(dbJournal::kConnectObject);
363360
block->journal_->pushParam(dbITermObj);
364361
block->journal_->pushParam(getId());
@@ -426,18 +423,15 @@ void dbITerm::connect(dbModNet* mod_net)
426423
inst->name_);
427424
}
428425

426+
debugPrint(iterm->getImpl()->getLogger(),
427+
utl::ODB,
428+
"DB_ECO",
429+
1,
430+
"ECO: connect {} to {}",
431+
iterm->getDebugName(),
432+
mod_net->getDebugName());
433+
429434
if (block->journal_) {
430-
debugPrint(iterm->getImpl()->getLogger(),
431-
utl::ODB,
432-
"DB_ECO",
433-
1,
434-
"ECO: connect dbITerm({} {:p}) '{}' to dbModNet({} {:p}) '{}'",
435-
getId(),
436-
static_cast<void*>(this),
437-
getName(),
438-
_mod_net->getId(),
439-
static_cast<void*>(_mod_net),
440-
((dbModNet*) _mod_net)->getHierarchicalName());
441435
block->journal_->beginAction(dbJournal::kConnectObject);
442436
block->journal_->pushParam(dbITermObj);
443437
block->journal_->pushParam(getId());
@@ -493,22 +487,17 @@ void dbITerm::disconnect()
493487
net->name_);
494488
}
495489

490+
debugPrint(getImpl()->getLogger(),
491+
utl::ODB,
492+
"DB_ECO",
493+
1,
494+
"disconnect {} from {} "
495+
"and {}",
496+
iterm->getDebugName(),
497+
(net) ? net->getDebugName() : "dbNet(NULL)",
498+
(mod_net) ? mod_net->getDebugName() : "dbModNet(NULL)");
499+
496500
if (block->journal_) {
497-
debugPrint(getImpl()->getLogger(),
498-
utl::ODB,
499-
"DB_ECO",
500-
1,
501-
"disconnect dbITerm({}, {:p}) '{}' from dbNet({}, {:p}) '{}' "
502-
"corresponding to dbModNet({}, {:p}) '{}'",
503-
getId(),
504-
static_cast<void*>(this),
505-
getName(),
506-
(net) ? net->getId() : 0,
507-
static_cast<void*>(net),
508-
(net) ? net->name_ : "NULL",
509-
(mod_net_impl) ? mod_net_impl->getId() : 0,
510-
static_cast<void*>(mod_net),
511-
(mod_net) ? mod_net->getHierarchicalName() : "NULL");
512501
block->journal_->beginAction(dbJournal::kDisconnectObject);
513502
block->journal_->pushParam(dbITermObj);
514503
block->journal_->pushParam(getId());
@@ -601,18 +590,16 @@ void dbITerm::disconnectDbNet()
601590
for (auto callback : block->callbacks_) {
602591
callback->inDbITermPreDisconnect(this);
603592
}
593+
594+
debugPrint(iterm->getImpl()->getLogger(),
595+
utl::ODB,
596+
"DB_ECO",
597+
1,
598+
"ECO: disconnect {} from {}",
599+
iterm->getDebugName(),
600+
net->getDebugName());
601+
604602
if (block->journal_) {
605-
debugPrint(iterm->getImpl()->getLogger(),
606-
utl::ODB,
607-
"DB_ECO",
608-
1,
609-
"ECO: disconnect dbITerm({} {:p}) '{}' from dbNet({} {:p}) '{}'",
610-
getId(),
611-
static_cast<void*>(this),
612-
getName(),
613-
net->getId(),
614-
static_cast<void*>(net),
615-
((dbNet*) net)->getName());
616603
block->journal_->beginAction(dbJournal::kDisconnectObject);
617604
block->journal_->pushParam(dbITermObj);
618605
block->journal_->pushParam(getId());
@@ -658,16 +645,15 @@ void dbITerm::disconnectDbModNet()
658645
if (iterm->mnet_ != 0) {
659646
_dbModNet* mod_net = block->modnet_tbl_->getPtr(iterm->mnet_);
660647

648+
debugPrint(iterm->getImpl()->getLogger(),
649+
utl::ODB,
650+
"DB_ECO",
651+
1,
652+
"ECO: disconnect {} from {}",
653+
iterm->getDebugName(),
654+
mod_net->getDebugName());
655+
661656
if (block->journal_) {
662-
debugPrint(iterm->getImpl()->getLogger(),
663-
utl::ODB,
664-
"DB_ECO",
665-
1,
666-
"ECO: disconnect dbIterm({}) '{}' from dbModNet({}) '{}'",
667-
getId(),
668-
getName(),
669-
iterm->mnet_,
670-
mod_net->name_);
671657
block->journal_->beginAction(dbJournal::kDisconnectObject);
672658
block->journal_->pushParam(dbITermObj);
673659
block->journal_->pushParam(getId());

0 commit comments

Comments
 (0)