Skip to content

Commit ad56431

Browse files
malibertymaliberty
authored
Merge pull request #8945 from The-OpenROAD-Project-staging/odb-enums
odb: change src/db/*.h enums to google naming style
2 parents 90b7e4a + 2337aae commit ad56431

39 files changed

+443
-444
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void dbBTerm::setSigType(dbSigType type)
276276
"ECO: setSigType {}",
277277
type.getValue());
278278
block->_journal->updateField(
279-
this, _dbBTerm::FLAGS, prev_flags, flagsToUInt(bterm));
279+
this, _dbBTerm::kFlags, prev_flags, flagsToUInt(bterm));
280280
}
281281

282282
for (auto callback : block->_callbacks) {
@@ -306,7 +306,7 @@ void dbBTerm::setIoType(dbIoType type)
306306
"ECO: setIoType {}",
307307
type.getValue());
308308
block->_journal->updateField(
309-
this, _dbBTerm::FLAGS, prev_flags, flagsToUInt(bterm));
309+
this, _dbBTerm::kFlags, prev_flags, flagsToUInt(bterm));
310310
}
311311

312312
for (auto callback : block->_callbacks) {
@@ -625,7 +625,7 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
625625
net->getId(),
626626
static_cast<void*>(net),
627627
name);
628-
block->_journal->beginAction(dbJournal::CREATE_OBJECT);
628+
block->_journal->beginAction(dbJournal::kCreateObject);
629629
block->_journal->pushParam(dbBTermObj);
630630
block->_journal->pushParam(net->getId());
631631
block->_journal->pushParam(name);
@@ -692,7 +692,7 @@ void _dbBTerm::connectModNet(_dbModNet* mod_net, _dbBlock* block)
692692
mod_net->getId(),
693693
static_cast<void*>(mod_net),
694694
((dbModNet*) mod_net)->getHierarchicalName());
695-
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
695+
block->_journal->beginAction(dbJournal::kConnectObject);
696696
block->_journal->pushParam(dbBTermObj);
697697
block->_journal->pushParam(bterm->getId());
698698
// the flat net is left out
@@ -729,7 +729,7 @@ void _dbBTerm::connectNet(_dbNet* net, _dbBlock* block)
729729
net->getId(),
730730
static_cast<void*>(net),
731731
((dbNet*) net)->getName());
732-
block->_journal->beginAction(dbJournal::CONNECT_OBJECT);
732+
block->_journal->beginAction(dbJournal::kConnectObject);
733733
block->_journal->pushParam(dbBTermObj);
734734
block->_journal->pushParam(bterm->getId());
735735
block->_journal->pushParam(net->getId());
@@ -794,7 +794,7 @@ void dbBTerm::destroy(dbBTerm* bterm_)
794794
bterm->getId(),
795795
static_cast<void*>(bterm),
796796
bterm->name_);
797-
block->_journal->beginAction(dbJournal::DELETE_OBJECT);
797+
block->_journal->beginAction(dbJournal::kDeleteObject);
798798
block->_journal->pushParam(dbBTermObj);
799799
block->_journal->pushParam(bterm_->getId());
800800
block->_journal->endAction();
@@ -824,7 +824,7 @@ void _dbBTerm::disconnectNet(_dbBTerm* bterm, _dbBlock* block)
824824
net->getId(),
825825
static_cast<void*>(net),
826826
net->name_);
827-
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
827+
block->_journal->beginAction(dbJournal::kDisconnectObject);
828828
block->_journal->pushParam(dbBTermObj);
829829
block->_journal->pushParam(bterm->getId());
830830
block->_journal->pushParam(net->getId());
@@ -882,7 +882,7 @@ void _dbBTerm::disconnectModNet(_dbBTerm* bterm, _dbBlock* block)
882882
mod_net->getId(),
883883
static_cast<void*>(mod_net),
884884
((dbModNet*) mod_net)->getHierarchicalName());
885-
block->_journal->beginAction(dbJournal::DISCONNECT_OBJECT);
885+
block->_journal->beginAction(dbJournal::kDisconnectObject);
886886
block->_journal->pushParam(dbBTermObj);
887887
block->_journal->pushParam(bterm->getId());
888888
// we are not considering the dbNet

‎src/odb/src/db/dbBTerm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _dbBTerm : public _dbObject
4444
public:
4545
enum Field // dbJournalField name
4646
{
47-
FLAGS
47+
kFlags
4848
};
4949
// PERSISTANT-MEMBERS
5050
_dbBTermFlags flags_;

‎src/odb/src/db/dbBlock.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2777,10 +2777,10 @@ void dbBlock::setCornerCount(int cornersStoredCnt,
27772777
cornersStoredCnt,
27782778
extDbCnt,
27792779
name_list);
2780-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
2780+
block->_journal->beginAction(dbJournal::kUpdateField);
27812781
block->_journal->pushParam(dbBlockObj);
27822782
block->_journal->pushParam(block->getId());
2783-
block->_journal->pushParam(_dbBlock::CORNERCOUNT);
2783+
block->_journal->pushParam(_dbBlock::kCornerCount);
27842784
block->_journal->pushParam(cornersStoredCnt);
27852785
block->_journal->pushParam(extDbCnt);
27862786
block->_journal->pushParam(name_list);
@@ -3147,10 +3147,10 @@ void dbBlock::writeDb(char* filename, int allNode)
31473147
1,
31483148
"ECO: dbBlock {}, writeDb",
31493149
block->getId());
3150-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
3150+
block->_journal->beginAction(dbJournal::kUpdateField);
31513151
block->_journal->pushParam(dbBlockObj);
31523152
block->_journal->pushParam(block->getId());
3153-
block->_journal->pushParam(_dbBlock::WRITEDB);
3153+
block->_journal->pushParam(_dbBlock::kWriteDb);
31543154
block->_journal->pushParam(filename);
31553155
block->_journal->pushParam(allNode);
31563156
block->_journal->endAction();

‎src/odb/src/db/dbBlock.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ class _dbBlock : public _dbObject
147147
public:
148148
enum Field // dbJournal field names
149149
{
150-
CORNERCOUNT,
151-
WRITEDB
150+
kCornerCount,
151+
kWriteDb
152152
};
153153

154154
// PERSISTANT-MEMBERS

‎src/odb/src/db/dbCCSeg.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ void dbCCSeg::adjustCapacitance(float factor, int corner)
8282
seg->getId(),
8383
factor,
8484
corner);
85-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
85+
block->_journal->beginAction(dbJournal::kUpdateField);
8686
block->_journal->pushParam(dbCCSegObj);
8787
block->_journal->pushParam(seg->getId());
88-
block->_journal->pushParam(_dbCCSeg::CAPACITANCE);
88+
block->_journal->pushParam(_dbCCSeg::kCapacitance);
8989
block->_journal->pushParam(prev_value);
9090
block->_journal->pushParam(value);
9191
block->_journal->pushParam(0);
@@ -155,10 +155,10 @@ void dbCCSeg::setAllCcCap(double* ttcap)
155155
"ECO: dbCCSeg::setAllCcCap, ccseg: {}, caps: {}",
156156
seg->getId(),
157157
ttcap[0]);
158-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
158+
block->_journal->beginAction(dbJournal::kUpdateField);
159159
block->_journal->pushParam(dbCCSegObj);
160160
block->_journal->pushParam(getId());
161-
block->_journal->pushParam(_dbCCSeg::SETALLCCCAP);
161+
block->_journal->pushParam(_dbCCSeg::kSetAllCcCap);
162162
for (uint ii = 0; ii < cornerCnt; ii++) {
163163
block->_journal->pushParam(ttcap[ii]);
164164
}
@@ -187,10 +187,10 @@ void dbCCSeg::setCapacitance(double cap, int corner)
187187
seg->getId(),
188188
value,
189189
corner);
190-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
190+
block->_journal->beginAction(dbJournal::kUpdateField);
191191
block->_journal->pushParam(dbCCSegObj);
192192
block->_journal->pushParam(seg->getId());
193-
block->_journal->pushParam(_dbCCSeg::CAPACITANCE);
193+
block->_journal->pushParam(_dbCCSeg::kCapacitance);
194194
block->_journal->pushParam(prev_value);
195195
block->_journal->pushParam(value);
196196
block->_journal->pushParam(corner);
@@ -219,10 +219,10 @@ void dbCCSeg::addCapacitance(double cap, int corner)
219219
seg->getId(),
220220
value,
221221
corner);
222-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
222+
block->_journal->beginAction(dbJournal::kUpdateField);
223223
block->_journal->pushParam(dbCCSegObj);
224224
block->_journal->pushParam(seg->getId());
225-
block->_journal->pushParam(_dbCCSeg::CAPACITANCE);
225+
block->_journal->pushParam(_dbCCSeg::kCapacitance);
226226
block->_journal->pushParam(prev_value);
227227
block->_journal->pushParam(value);
228228
block->_journal->pushParam(corner);
@@ -253,10 +253,10 @@ void dbCCSeg::addCcCapacitance(dbCCSeg* other)
253253
"ECO: dbCCSeg {}, other dbCCSeg {}, addCcCapacitance",
254254
seg->getOID(),
255255
oseg->getOID());
256-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
256+
block->_journal->beginAction(dbJournal::kUpdateField);
257257
block->_journal->pushParam(dbCCSegObj);
258258
block->_journal->pushParam(seg->getId());
259-
block->_journal->pushParam(_dbCCSeg::ADDCCCAPACITANCE);
259+
block->_journal->pushParam(_dbCCSeg::kAddCcCapacitance);
260260
block->_journal->pushParam(oseg->getId());
261261
block->_journal->endAction();
262262
}
@@ -515,7 +515,7 @@ dbCCSeg* dbCCSeg::create(dbCapNode* src_, dbCapNode* tgt_, bool mergeParallel)
515515
tgt->getOID(),
516516
mergeParallel);
517517

518-
block->_journal->beginAction(dbJournal::CREATE_OBJECT);
518+
block->_journal->beginAction(dbJournal::kCreateObject);
519519
block->_journal->pushParam(dbCCSegObj);
520520
block->_journal->pushParam(src->getOID());
521521
block->_journal->pushParam(tgt->getOID());
@@ -594,10 +594,10 @@ void dbCCSeg::unLink_cc_seg(dbCapNode* capn)
594594
"ECO: dbCCSeg::unLink, ccseg: {}, capNode: {}",
595595
getId(),
596596
capn->getId());
597-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
597+
block->_journal->beginAction(dbJournal::kUpdateField);
598598
block->_journal->pushParam(dbCCSegObj);
599599
block->_journal->pushParam(getId());
600-
block->_journal->pushParam(_dbCCSeg::UNLINKCCSEG);
600+
block->_journal->pushParam(_dbCCSeg::kUnlinkCcSeg);
601601
block->_journal->pushParam(capn->getId());
602602
block->_journal->endAction();
603603
}
@@ -619,10 +619,10 @@ void dbCCSeg::Link_cc_seg(dbCapNode* capn, uint cseq)
619619
getId(),
620620
capn->getId(),
621621
cseq);
622-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
622+
block->_journal->beginAction(dbJournal::kUpdateField);
623623
block->_journal->pushParam(dbCCSegObj);
624624
block->_journal->pushParam(getId());
625-
block->_journal->pushParam(_dbCCSeg::LINKCCSEG);
625+
block->_journal->pushParam(_dbCCSeg::kLinkCcSeg);
626626
block->_journal->pushParam(capn->getId());
627627
block->_journal->pushParam(cseq);
628628
block->_journal->endAction();
@@ -662,7 +662,7 @@ void dbCCSeg::destroy(dbCCSeg* seg_)
662662
1,
663663
"ECO: dbCCSeg::destroy, seg id: {}",
664664
seg->getId());
665-
block->_journal->beginAction(dbJournal::DELETE_OBJECT);
665+
block->_journal->beginAction(dbJournal::kDeleteObject);
666666
block->_journal->pushParam(dbCCSegObj);
667667
block->_journal->pushParam(seg->getId());
668668
block->_journal->pushParam((uint) 1); // regular destroy
@@ -688,7 +688,7 @@ void dbCCSeg::destroyS(dbCCSeg* seg_)
688688
1,
689689
"ECO: dbCCSeg::destroy, seg id: {}",
690690
seg->getId());
691-
block->_journal->beginAction(dbJournal::DELETE_OBJECT);
691+
block->_journal->beginAction(dbJournal::kDeleteObject);
692692
block->_journal->pushParam(dbCCSegObj);
693693
block->_journal->pushParam(seg->getId());
694694
block->_journal->pushParam((uint) 0); // simple destroy
@@ -741,10 +741,10 @@ void dbCCSeg::swapCapnode(dbCapNode* orig_, dbCapNode* new_)
741741
seg->getOID(),
742742
oid,
743743
nid);
744-
block->_journal->beginAction(dbJournal::UPDATE_FIELD);
744+
block->_journal->beginAction(dbJournal::kUpdateField);
745745
block->_journal->pushParam(dbCCSegObj);
746746
block->_journal->pushParam(seg->getId());
747-
block->_journal->pushParam(_dbCCSeg::SWAPCAPNODE);
747+
block->_journal->pushParam(_dbCCSeg::kSwapCapNode);
748748
block->_journal->pushParam(oid);
749749
block->_journal->pushParam(nid);
750750
block->_journal->endAction();

‎src/odb/src/db/dbCCSeg.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ class _dbCCSeg : public _dbObject
2929
public:
3030
enum Fields // dbJournal field names
3131
{
32-
FLAGS,
33-
CAPACITANCE,
34-
ADDCCCAPACITANCE,
35-
SWAPCAPNODE,
36-
LINKCCSEG,
37-
UNLINKCCSEG,
38-
SETALLCCCAP
32+
kFlags,
33+
kCapacitance,
34+
kAddCcCapacitance,
35+
kSwapCapNode,
36+
kLinkCcSeg,
37+
kUnlinkCcSeg,
38+
kSetAllCcCap
3939
};
4040

4141
// PERSISTANT-MEMBERS

0 commit comments

Comments
 (0)