Skip to content

Commit 1f1a1d4

Browse files
erendnerendn
committed
odb: Update debug prints
Signed-off-by: Eren Dogan <erdogan@ucsc.edu>
1 parent 26e7847 commit 1f1a1d4

4 files changed

Lines changed: 79 additions & 46 deletions

File tree

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

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,11 @@ void _dbBTerm::connectModNet(_dbModNet* mod_net, _dbBlock* block)
680680
utl::ODB,
681681
"DB_ECO",
682682
1,
683-
"ECO: connect dbBTerm {} at id {}",
683+
"ECO: connect dbBTerm {} at id {} to dbModNet {} at id {}",
684684
_name,
685-
getId());
685+
getId(),
686+
mod_net->_name,
687+
mod_net->getId());
686688
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
687689
block->_journal->pushParam(dbBTermObj);
688690
block->_journal->pushParam(bterm->getId());
@@ -713,9 +715,11 @@ void _dbBTerm::connectNet(_dbNet* net, _dbBlock* block)
713715
utl::ODB,
714716
"DB_ECO",
715717
1,
716-
"ECO: connect dbBTerm {} at id {}",
718+
"ECO: connect dbBTerm {} at id {} to dbNet {} at id {}",
717719
_name,
718-
getId());
720+
getId(),
721+
net->_name,
722+
net->getId());
719723
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
720724
block->_journal->pushParam(dbBTermObj);
721725
block->_journal->pushParam(bterm->getId());
@@ -800,9 +804,11 @@ void _dbBTerm::disconnectNet(_dbBTerm* bterm, _dbBlock* block)
800804
utl::ODB,
801805
"DB_ECO",
802806
1,
803-
"ECO: disconnect dbBTerm {} at id {}",
807+
"ECO: disconnect dbBTerm {} at id {} from dbNet {} at id {}",
804808
_name,
805-
getId());
809+
getId(),
810+
net->_name,
811+
net->getId());
806812
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
807813
block->_journal->pushParam(dbBTermObj);
808814
block->_journal->pushParam(bterm->getId());
@@ -849,13 +855,16 @@ void _dbBTerm::disconnectModNet(_dbBTerm* bterm, _dbBlock* block)
849855
_dbModNet* mod_net = block->_modnet_tbl->getPtr(bterm->_mnet);
850856

851857
if (block->_journal) {
852-
debugPrint(block->getImpl()->getLogger(),
853-
utl::ODB,
854-
"DB_ECO",
855-
1,
856-
"ECO: disconnect dbBTerm {} at id {}",
857-
_name,
858-
getId());
858+
debugPrint(
859+
block->getImpl()->getLogger(),
860+
utl::ODB,
861+
"DB_ECO",
862+
1,
863+
"ECO: disconnect dbBTerm {} at id {} from dbModNet {} at id {}",
864+
_name,
865+
getId(),
866+
mod_net->_name,
867+
mod_net->getId());
859868
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
860869
block->_journal->pushParam(dbBTermObj);
861870
block->_journal->pushParam(bterm->getId());

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

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,11 @@ void dbITerm::connect(dbNet* net_)
349349
utl::ODB,
350350
"DB_ECO",
351351
1,
352-
"ECO: connect dbITerm {} at id {}",
352+
"ECO: connect dbITerm {} at id {} to dbNet {} at id {}",
353353
getName(),
354-
getId());
354+
getId(),
355+
net->_name,
356+
net->getId());
355357
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
356358
block->_journal->pushParam(dbITermObj);
357359
block->_journal->pushParam(getId());
@@ -424,9 +426,11 @@ void dbITerm::connect(dbModNet* mod_net)
424426
utl::ODB,
425427
"DB_ECO",
426428
1,
427-
"ECO: connect dbITerm {} at id {}",
429+
"ECO: connect dbITerm {} at id {} to dbModNet {} at id {}",
428430
getName(),
429-
getId());
431+
getId(),
432+
_mod_net->_name,
433+
_mod_net->getId());
430434
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
431435
block->_journal->pushParam(dbITermObj);
432436
block->_journal->pushParam(getId());
@@ -486,9 +490,14 @@ void dbITerm::disconnect()
486490
utl::ODB,
487491
"DB_ECO",
488492
1,
489-
"ECO: disconnect dbITerm {} at id {}",
493+
"ECO: disconnect dbITerm {} at id {} from dbNet {} at id {} and "
494+
"dbModNet {} at id {}",
490495
getName(),
491-
getId());
496+
getId(),
497+
net->_name,
498+
net->getId(),
499+
mod_net->_name,
500+
mod_net->getId());
492501
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
493502
block->_journal->pushParam(dbITermObj);
494503
block->_journal->pushParam(getId());
@@ -586,9 +595,11 @@ void dbITerm::disconnectDbNet()
586595
utl::ODB,
587596
"DB_ECO",
588597
1,
589-
"ECO: disconnect dbITerm {} at id {}",
598+
"ECO: disconnect dbITerm {} at id {} from dbNet {} at id {}",
590599
getName(),
591-
getId());
600+
getId(),
601+
net->_name,
602+
net->getId());
592603
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
593604
block->_journal->pushParam(dbITermObj);
594605
block->_journal->pushParam(getId());
@@ -635,13 +646,16 @@ void dbITerm::disconnectDbModNet()
635646
_dbModNet* mod_net = block->_modnet_tbl->getPtr(iterm->_mnet);
636647

637648
if (block->_journal) {
638-
debugPrint(iterm->getImpl()->getLogger(),
639-
utl::ODB,
640-
"DB_ECO",
641-
1,
642-
"ECO: disconnect dbITerm {} at id {}",
643-
getName(),
644-
getId());
649+
debugPrint(
650+
iterm->getImpl()->getLogger(),
651+
utl::ODB,
652+
"DB_ECO",
653+
1,
654+
"ECO: disconnect dbITerm {} at id {} from dbModNet {} at id {}",
655+
getName(),
656+
getId(),
657+
mod_net->_name,
658+
mod_net->getId());
645659
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
646660
block->_journal->pushParam(dbITermObj);
647661
block->_journal->pushParam(getId());

‎src/odb/src/db/dbModBTerm.cpp‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,11 @@ void dbModBTerm::connect(dbModNet* net)
353353
utl::ODB,
354354
"DB_ECO",
355355
1,
356-
"ECO: connect dbModBTerm {} at id {}",
356+
"ECO: connect dbModBTerm {} at id {} to dbNet {} at id {}",
357357
getName(),
358-
getId());
358+
getId(),
359+
net->getName(),
360+
net->getId());
359361
_block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
360362
_block->_journal->pushParam(dbModBTermObj);
361363
_block->_journal->pushParam(getId());
@@ -382,13 +384,16 @@ void dbModBTerm::disconnect()
382384
_dbModNet* mod_net = block->_modnet_tbl->getPtr(_modbterm->_modnet);
383385

384386
if (block->_journal) {
385-
debugPrint(block->getImpl()->getLogger(),
386-
utl::ODB,
387-
"DB_ECO",
388-
1,
389-
"ECO: disconnect dbModBTerm {} at id {}",
390-
getName(),
391-
getId());
387+
debugPrint(
388+
block->getImpl()->getLogger(),
389+
utl::ODB,
390+
"DB_ECO",
391+
1,
392+
"ECO: disconnect dbModBTerm {} at id {} from dbModNet {} at id {}",
393+
getName(),
394+
getId(),
395+
mod_net->_name,
396+
mod_net->getId());
392397
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
393398
block->_journal->pushParam(dbModBTermObj);
394399
block->_journal->pushParam(_modbterm->getId());

‎src/odb/src/db/dbModITerm.cpp‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,11 @@ void dbModITerm::connect(dbModNet* net)
305305
utl::ODB,
306306
"DB_ECO",
307307
1,
308-
"ECO: connect dbModITerm {} at id {}",
308+
"ECO: connect dbModITerm {} at id {} to dbModNet {} at id {}",
309309
getName(),
310-
getId());
310+
getId(),
311+
_modnet->_name,
312+
_modnet->getId());
311313
_block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
312314
_block->_journal->pushParam(dbModITermObj);
313315
_block->_journal->pushParam(getId());
@@ -332,13 +334,16 @@ void dbModITerm::disconnect()
332334
_dbModNet* _modnet = _block->_modnet_tbl->getPtr(_moditerm->_mod_net);
333335

334336
if (_block->_journal) {
335-
debugPrint(_block->getImpl()->getLogger(),
336-
utl::ODB,
337-
"DB_ECO",
338-
1,
339-
"ECO: disconnect dbModITerm {} at id {}",
340-
getName(),
341-
getId());
337+
debugPrint(
338+
_block->getImpl()->getLogger(),
339+
utl::ODB,
340+
"DB_ECO",
341+
1,
342+
"ECO: disconnect dbModITerm {} at id {} from dbModNet {} at id {}",
343+
getName(),
344+
getId(),
345+
_modnet->_name,
346+
_modnet->getId());
342347
_block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
343348
_block->_journal->pushParam(dbModITermObj);
344349
_block->_journal->pushParam(_moditerm->getId());

0 commit comments

Comments
 (0)