diff --git a/DRAMSys/traceAnalyzer/data/tracedb.cpp b/DRAMSys/traceAnalyzer/data/tracedb.cpp index 29dcc652..3d32946b 100644 --- a/DRAMSys/traceAnalyzer/data/tracedb.cpp +++ b/DRAMSys/traceAnalyzer/data/tracedb.cpp @@ -173,29 +173,29 @@ shared_ptr TraceDB::getNextPrecharge(ID currentTransactionId) return parseTransactionFromQuery(query); } -shared_ptr TraceDB::getNextActb(ID currentTransactionId) -{ - QSqlQuery query(database); - QString queryText = queryTexts.queryHead + - "WHERE TransactionID > :currentID AND PhaseName = 'ACTB' LIMIT 1"; +// shared_ptr TraceDB::getNextActb(ID currentTransactionId) +// { +// QSqlQuery query(database); +// QString queryText = queryTexts.queryHead + +// "WHERE TransactionID > :currentID AND PhaseName = 'ACTB' LIMIT 1"; +// +// query.prepare(queryText); +// query.bindValue(":currentID", currentTransactionId); +// executeQuery(query); +// return parseTransactionFromQuery(query); +// } - query.prepare(queryText); - query.bindValue(":currentID", currentTransactionId); - executeQuery(query); - return parseTransactionFromQuery(query); -} - -shared_ptr TraceDB::getNextPreb(ID currentTransactionId) -{ - QSqlQuery query(database); - QString queryText = queryTexts.queryHead + - "WHERE TransactionID > :currentID AND PhaseName = 'PREB' LIMIT 1"; - - query.prepare(queryText); - query.bindValue(":currentID", currentTransactionId); - executeQuery(query); - return parseTransactionFromQuery(query); -} +// shared_ptr TraceDB::getNextPreb(ID currentTransactionId) +// { +// QSqlQuery query(database); +// QString queryText = queryTexts.queryHead + +// "WHERE TransactionID > :currentID AND PhaseName = 'PREB' LIMIT 1"; +// +// query.prepare(queryText); +// query.bindValue(":currentID", currentTransactionId); +// executeQuery(query); +// return parseTransactionFromQuery(query); +// } shared_ptr TraceDB::getNextRefresh(ID currentTransactionId) { @@ -208,17 +208,17 @@ shared_ptr TraceDB::getNextRefresh(ID currentTransactionId) return parseTransactionFromQuery(query); } -shared_ptr TraceDB::getNextRefb(ID currentTransactionId) -{ - QSqlQuery query(database); - QString queryText = queryTexts.queryHead + - "WHERE TransactionID > :currentID AND PhaseName = 'REFB' LIMIT 1"; - - query.prepare(queryText); - query.bindValue(":currentID", currentTransactionId); - executeQuery(query); - return parseTransactionFromQuery(query); -} +// shared_ptr TraceDB::getNextRefb(ID currentTransactionId) +// { +// QSqlQuery query(database); +// QString queryText = queryTexts.queryHead + +// "WHERE TransactionID > :currentID AND PhaseName = 'REFB' LIMIT 1"; +// +// query.prepare(queryText); +// query.bindValue(":currentID", currentTransactionId); +// executeQuery(query); +// return parseTransactionFromQuery(query); +// } ID TraceDB::getTransactionIDFromPhaseID(ID phaseID) { diff --git a/DRAMSys/traceAnalyzer/data/tracedb.h b/DRAMSys/traceAnalyzer/data/tracedb.h index f5f5ba56..74c0176e 100644 --- a/DRAMSys/traceAnalyzer/data/tracedb.h +++ b/DRAMSys/traceAnalyzer/data/tracedb.h @@ -89,9 +89,9 @@ public: std::shared_ptr getNextPrecharge(ID currentTransactionId); std::shared_ptr getNextActivate(ID currentTransactionId); std::shared_ptr getNextRefresh(ID currentTransactionId); - std::shared_ptr getNextPreb(ID currentTransactionId); - std::shared_ptr getNextActb(ID currentTransactionId); - std::shared_ptr getNextRefb(ID currentTransactionId); +// std::shared_ptr getNextPreb(ID currentTransactionId); +// std::shared_ptr getNextActb(ID currentTransactionId); +// std::shared_ptr getNextRefb(ID currentTransactionId); std::shared_ptr getTransactionByID(ID id); diff --git a/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp b/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp index 86ea4bc1..592601b5 100644 --- a/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp +++ b/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp @@ -241,45 +241,45 @@ void TraceNavigator::selectNextPrecharge() selectTransaction(nextPrecharge); } -void TraceNavigator::selectNextActb() -{ - shared_ptr nextActb; - - if (!SelectedTransactions().empty()) - nextActb = traceFile.getNextActb(SelectedTransactions().front()->id); - else - nextActb = traceFile.getNextActb(0); - - if (nextActb) - selectTransaction(nextActb); -} - -void TraceNavigator::selectNextPreb() -{ - shared_ptr nextPreb; - - if (!SelectedTransactions().empty()) - nextPreb = traceFile.getNextPreb( - SelectedTransactions().front()->id); - else - nextPreb = traceFile.getNextPreb(0); - - if (nextPreb) - selectTransaction(nextPreb); -} - -void TraceNavigator::selectNextRefb() -{ - shared_ptr n; - - if (!SelectedTransactions().empty()) - n = traceFile.getNextRefb(SelectedTransactions().front()->id); - else - n = traceFile.getNextRefb(0); - - if (n) - selectTransaction(n); -} +// void TraceNavigator::selectNextActb() +// { +// shared_ptr nextActb; +// +// if (!SelectedTransactions().empty()) +// nextActb = traceFile.getNextActb(SelectedTransactions().front()->id); +// else +// nextActb = traceFile.getNextActb(0); +// +// if (nextActb) +// selectTransaction(nextActb); +// } +// +// void TraceNavigator::selectNextPreb() +// { +// shared_ptr nextPreb; +// +// if (!SelectedTransactions().empty()) +// nextPreb = traceFile.getNextPreb( +// SelectedTransactions().front()->id); +// else +// nextPreb = traceFile.getNextPreb(0); +// +// if (nextPreb) +// selectTransaction(nextPreb); +// } +// +// void TraceNavigator::selectNextRefb() +// { +// shared_ptr n; +// +// if (!SelectedTransactions().empty()) +// n = traceFile.getNextRefb(SelectedTransactions().front()->id); +// else +// n = traceFile.getNextRefb(0); +// +// if (n) +// selectTransaction(n); +// } bool TraceNavigator::transactionIsSelected(const shared_ptr &transaction) const diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp index ebc67c39..5636ff39 100644 --- a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp +++ b/DRAMSys/traceAnalyzer/presentation/traceplot.cpp @@ -114,23 +114,23 @@ void TracePlot::setUpActions() QObject::connect(selectNextPrecharge, SIGNAL(triggered()), this, SLOT(on_selectNextPrecharge())); - selectNextActb = new QAction("Select next atcb", this); - selectNextActb->setShortcut(QKeySequence("alt+b")); - addAction(selectNextActb); - QObject::connect(selectNextActb, SIGNAL(triggered()), this, - SLOT(on_selectNextActb())); - - selectNextPreb = new QAction("Select next preb", this); - selectNextPreb->setShortcut(QKeySequence("alt+q")); - addAction(selectNextPreb); - QObject::connect(selectNextPreb, SIGNAL(triggered()), this, - SLOT(on_selectNextPreb())); - - selectNextRefb = new QAction("Select next refb", this); - selectNextRefb->setShortcut(QKeySequence("alt+s")); - addAction(selectNextRefb); - QObject::connect(selectNextRefb, SIGNAL(triggered()), this, - SLOT(on_selectNextRefb())); +// selectNextActb = new QAction("Select next atcb", this); +// selectNextActb->setShortcut(QKeySequence("alt+b")); +// addAction(selectNextActb); +// QObject::connect(selectNextActb, SIGNAL(triggered()), this, +// SLOT(on_selectNextActb())); +// +// selectNextPreb = new QAction("Select next preb", this); +// selectNextPreb->setShortcut(QKeySequence("alt+q")); +// addAction(selectNextPreb); +// QObject::connect(selectNextPreb, SIGNAL(triggered()), this, +// SLOT(on_selectNextPreb())); +// +// selectNextRefb = new QAction("Select next refb", this); +// selectNextRefb->setShortcut(QKeySequence("alt+s")); +// addAction(selectNextRefb); +// QObject::connect(selectNextRefb, SIGNAL(triggered()), this, +// SLOT(on_selectNextRefb())); setColorGroupingPhase = new QAction("Group by Phase", this); addAction(setColorGroupingPhase); @@ -169,7 +169,7 @@ void TracePlot::setUpContextMenu() contextMenu->addMenu(goToSubMenu); QMenu *selectSubMenu = new QMenu("Select", contextMenu); - selectSubMenu->addActions({selectNextRefresh, selectNextActivate, selectNextPrecharge, selectNextActb, selectNextPreb, selectNextRefb}); + selectSubMenu->addActions({selectNextRefresh, selectNextActivate, selectNextPrecharge /*, selectNextActb, selectNextPreb, selectNextRefb */}); contextMenu->addMenu(selectSubMenu); contextMenu->addActions({showQueryEditor, insertComment, exportToPdf}); @@ -440,20 +440,20 @@ void TracePlot::on_selectNextPrecharge() navigator->selectNextPrecharge(); } -void TracePlot::on_selectNextActb() -{ - navigator->selectNextActb(); -} - -void TracePlot::on_selectNextPreb() -{ - navigator->selectNextPreb(); -} - -void TracePlot::on_selectNextRefb() -{ - navigator->selectNextRefb(); -} +// void TracePlot::on_selectNextActb() +// { +// navigator->selectNextActb(); +// } +// +// void TracePlot::on_selectNextPreb() +// { +// navigator->selectNextPreb(); +// } +// +// void TracePlot::on_selectNextRefb() +// { +// navigator->selectNextRefb(); +// } void TracePlot::on_colorGroupingPhase() { diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.h b/DRAMSys/traceAnalyzer/presentation/traceplot.h index 3b2f9dc7..9fb4253b 100644 --- a/DRAMSys/traceAnalyzer/presentation/traceplot.h +++ b/DRAMSys/traceAnalyzer/presentation/traceplot.h @@ -101,9 +101,9 @@ private Q_SLOTS: void on_selectNextRefresh(); void on_selectNextActivate(); void on_selectNextPrecharge(); - void on_selectNextActb(); - void on_selectNextPreb(); - void on_selectNextRefb(); +// void on_selectNextActb(); +// void on_selectNextPreb(); +// void on_selectNextRefb(); void on_colorGroupingPhase(); void on_colorGroupingTransaction(); void on_colorGroupingThread(); @@ -168,9 +168,9 @@ private: QAction *selectNextRefresh; QAction *selectNextActivate; QAction *selectNextPrecharge; - QAction *selectNextActb; - QAction *selectNextPreb; - QAction *selectNextRefb; +// QAction *selectNextActb; +// QAction *selectNextPreb; +// QAction *selectNextRefb; QAction *setColorGroupingPhase; QAction *setColorGroupingTransaction; QAction *setColorGroupingThread;