Merge pull request #8936 from gadfort/odb-bpin-callback

odb: add callback to BPin when adding or removing boxes so the gui and psm get updated

Author: maliberty

src/gui/src/search.cpp

@@ -61,6 +61,16 @@ void Search::inDbBPinCreate(odb::dbBPin* pin)
   clearShapes();
 }
 
+void Search::inDbBPinAddBox(odb::dbBox* box)
+{
+  clearShapes();
+}
+
+void Search::inDbBPinRemoveBox(odb::dbBox* box)
+{
+  clearShapes();
+}
+
 void Search::inDbBPinDestroy(odb::dbBPin* pin)
 {
   clearShapes();

src/gui/src/search.h

@@ -226,6 +226,8 @@ class Search : public QObject, public odb::dbBlockCallBackObj
       const odb::dbPlacementStatus& status) override;
   void inDbPostMoveInst(odb::dbInst* inst) override;
   void inDbBPinCreate(odb::dbBPin* pin) override;
+  void inDbBPinAddBox(odb::dbBox* box) override;
+  void inDbBPinRemoveBox(odb::dbBox* box) override;
   void inDbBPinDestroy(odb::dbBPin* pin) override;
   void inDbFillCreate(odb::dbFill* fill) override;
   void inDbWireCreate(odb::dbWire* wire) override;

src/odb/include/odb/dbBlockCallBackObj.h

@@ -125,6 +125,8 @@ class dbBlockCallBackObj
 
   // dbBPin Start
   virtual void inDbBPinCreate(dbBPin*) {}
+  virtual void inDbBPinAddBox(dbBox*) {}
+  virtual void inDbBPinRemoveBox(dbBox*) {}
   virtual void inDbBPinDestroy(dbBPin*) {}
   // dbBPin End
 

src/odb/src/db/dbBPin.cpp

@@ -291,6 +291,10 @@ void _dbBPin::removeBox(_dbBox* box)
 {
   _dbBlock* block = (_dbBlock*) getOwner();
 
+  for (auto callback : block->_callbacks) {
+    callback->inDbBPinRemoveBox((dbBox*) box);
+  }
+
   dbId<_dbBox> boxid = box->getOID();
   if (boxid == boxes_) {
     // at head of list, need to move head

src/odb/src/db/dbBox.cpp

@@ -721,6 +721,11 @@ dbBox* dbBox::create(dbBPin* bpin_,
   bpin->boxes_ = box->getOID();
 
   block->add_rect(box->shape_.rect);
+
+  for (auto callback : block->_callbacks) {
+    callback->inDbBPinAddBox((dbBox*) box);
+  }
+
   return (dbBox*) box;
 }
 

src/odb/test/cpp/CallBack.h

@@ -175,6 +175,28 @@ class CallBack : public dbBlockCallBackObj
       events.push_back("Create BPin for " + pin->getBTerm()->getName());
     }
   }
+
+  void inDbBPinAddBox(dbBox* box) override
+  {
+    if (!_pause) {
+      char buffer[100];
+      sprintf(buffer,
+              "Create BPin box (%d,%d) (%d,%d)",
+              box->xMin(),
+              box->yMin(),
+              box->xMax(),
+              box->yMax());
+      events.emplace_back(buffer);
+    }
+  }
+
+  void inDbBPinRemoveBox(dbBox* box) override
+  {
+    if (!_pause) {
+      events.emplace_back("Destroy bpin box");
+    }
+  }
+
   void inDbBPinDestroy(dbBPin*) override
   {
     if (!_pause) {

src/odb/test/cpp/TestCallBacks.cpp

@@ -122,6 +122,15 @@ TEST_F(CallbackFixture, test_bpin)
   EXPECT_EQ(cb_.events.size(), 1);
   EXPECT_EQ(cb_.events[0], "Create BPin for IN1");
   cb_.clearEvents();
+  dbBox* box
+      = dbBox::create(pin, db_->getTech()->findLayer("L1"), 0, 0, 100, 100);
+  EXPECT_EQ(cb_.events.size(), 1);
+  EXPECT_EQ(cb_.events[0], "Create BPin box (0,0) (100,100)");
+  cb_.clearEvents();
+  dbBox::destroy(box);
+  EXPECT_EQ(cb_.events.size(), 1);
+  EXPECT_EQ(cb_.events[0], "Destroy bpin box");
+  cb_.clearEvents();
   dbBPin::destroy(pin);
   EXPECT_EQ(cb_.events.size(), 1);
   EXPECT_EQ(cb_.events[0], "Destroy BPin");

src/psm/include/psm/pdnsim.h

@@ -103,6 +103,9 @@ class PDNSim : public odb::dbBlockCallBackObj
   void inDbNetDestroy(odb::dbNet*) override;
   void inDbBTermPostConnect(odb::dbBTerm*) override;
   void inDbBTermPostDisConnect(odb::dbBTerm*, odb::dbNet*) override;
+  void inDbBPinCreate(odb::dbBPin*) override;
+  void inDbBPinAddBox(odb::dbBox*) override;
+  void inDbBPinRemoveBox(odb::dbBox*) override;
   void inDbBPinDestroy(odb::dbBPin*) override;
   void inDbSWireAddSBox(odb::dbSBox*) override;
   void inDbSWireRemoveSBox(odb::dbSBox*) override;

src/psm/src/pdnsim.cpp

@@ -232,6 +232,21 @@ void PDNSim::inDbBTermPostDisConnect(odb::dbBTerm*, odb::dbNet*)
   clearSolvers();
 }
 
+void PDNSim::inDbBPinCreate(odb::dbBPin*)
+{
+  clearSolvers();
+}
+
+void PDNSim::inDbBPinAddBox(odb::dbBox*)
+{
+  clearSolvers();
+}
+
+void PDNSim::inDbBPinRemoveBox(odb::dbBox*)
+{
+  clearSolvers();
+}
+
 void PDNSim::inDbBPinDestroy(odb::dbBPin*)
 {
   clearSolvers();