@@ -52,22 +52,25 @@ size_t KsFilterProxyModel::_search(int column,
const QString &searchText,
search_condition_func cond,
QList<int> *matchList,
+ int step,
int first, int last,
QProgressBar *pb,
QLabel *l,
+ int *lastRowSearched,
bool notify)
{
int index, row, nRows(last - first + 1);
- int pbCount(1);
+ int milestone(1), pbCount(1);
QString item;
if (nRows > KS_PROGRESS_BAR_MAX)
- pbCount = nRows / (KS_PROGRESS_BAR_MAX - _searchProgress);
+ milestone = pbCount = nRows / (KS_PROGRESS_BAR_MAX - step -
+ _searchProgress);
else
_searchProgress = KS_PROGRESS_BAR_MAX - nRows;
/* Loop over the items of the proxy model. */
- for (index = first; index <= last; ++index) {
+ for (index = first; index <= last; index += step) {
/*
* Use the index of the proxy model to retrieve the value
* of the row number in the base model.
@@ -78,17 +81,23 @@ size_t KsFilterProxyModel::_search(int column,
matchList->append(row);
if (_searchStop) {
- if (notify) {
- _searchProgress = KS_PROGRESS_BAR_MAX;
+ if (lastRowSearched)
+ *lastRowSearched = index;
+
+ if (notify)
_pbCond.notify_one();
- }
break;
}
/* Deal with the Progress bar of the seatch. */
- if ((index - first) % pbCount == 0) {
+ if ((index - first) >= milestone) {
+ milestone += pbCount;
if (notify) {
+ /*
+ * This is a multi-threaded search. Notify
+ * the main thread to update the progress bar.
+ */
std::lock_guard<std::mutex> lk(_mutex);
++_searchProgress;
_pbCond.notify_one();
@@ -100,6 +109,7 @@ size_t KsFilterProxyModel::_search(int column,
if (l)
l->setText(QString(" %1").arg(matchList->count()));
+
QApplication::processEvents();
}
}
@@ -130,8 +140,17 @@ size_t KsFilterProxyModel::search(int column,
QLabel *l)
{
int nRows = rowCount({});
- _search(column, searchText, cond, matchList,
- 0, nRows - 1, pb, l, false);
+ _search(column,
+ searchText,
+ cond,
+ matchList,
+ 1, // step
+ 0, // first
+ nRows - 1, // last
+ pb,
+ l,
+ nullptr,
+ false);
return matchList->count();
}
@@ -148,16 +167,17 @@ size_t KsFilterProxyModel::search(KsSearchFSM *sm, QList<int> *matchList)
{
int nRows = rowCount({});
- sm->_lastRowSearched =
- _search(sm->column(),
- sm->searchText(),
- sm->condition(),
- matchList,
- sm->_lastRowSearched + 1,
- nRows - 1,
- &sm->_searchProgBar,
- &sm->_searchCountLabel,
- false);
+ _search(sm->column(),
+ sm->searchText(),
+ sm->condition(),
+ matchList,
+ 1, // step
+ sm->_lastRowSearched + 1, // first
+ nRows - 1, // last
+ &sm->_searchProgBar,
+ &sm->_searchCountLabel,
+ &sm->_lastRowSearched,
+ false);
return matchList->count();
}
@@ -168,26 +188,41 @@ size_t KsFilterProxyModel::search(KsSearchFSM *sm, QList<int> *matchList)
* @param column: The number of the column to search in.
* @param searchText: The text to search for.
* @param cond: Matching condition function.
+ * @param step: The step used by the thread of the search when looping over
+ * the data.
* @param first: Row index specifying the position inside the table from
* where the search starts.
* @param last: Row index specifying the position inside the table from
* where the search ends.
+ * @param lastRowSearched: Output location for parameter showing the index of
+ * the last searched item (data row).
* @param notify: Input location for flag specifying if the search has to
* notify the main thread when to update the progress bar.
*
* @returns A list containing the row indexes of the cells satisfying matching
* condition.
*/
-QList<int> KsFilterProxyModel::searchMap(int column,
- const QString &searchText,
- search_condition_func cond,
- int first,
- int last,
- bool notify)
+QList<int> KsFilterProxyModel::searchThread(int column,
+ const QString &searchText,
+ search_condition_func cond,
+ int step,
+ int first,
+ int last,
+ int *lastRowSearched,
+ bool notify)
{
QList<int> matchList;
- _search(column, searchText, cond, &matchList, first, last,
- nullptr, nullptr, notify);
+ _search(column,
+ searchText,
+ cond,
+ &matchList,
+ step,
+ first,
+ last,
+ nullptr,
+ nullptr,
+ lastRowSearched,
+ notify);
return matchList;
}
@@ -170,12 +170,14 @@ public:
size_t search(KsSearchFSM *sm, QList<int> *matchList);
- QList<int> searchMap(int column,
- const QString &searchText,
- search_condition_func cond,
- int first,
- int last,
- bool notify);
+ QList<int> searchThread(int column,
+ const QString &searchText,
+ search_condition_func cond,
+ int step,
+ int first,
+ int last,
+ int *lastRowSearched,
+ bool notify);
/** Get the progress of the search. */
int searchProgress() const {return _searchProgress;}
@@ -223,9 +225,11 @@ private:
const QString &searchText,
search_condition_func cond,
QList<int> *matchList,
+ int step,
int first, int last,
QProgressBar *pb,
QLabel *l,
+ int *lastRowSearched,
bool notify);
};
@@ -168,9 +168,10 @@ public:
/**
* Last row, tested for matching. To be used when restarting the
- * search.
+ * search. Note that the field uses "int" as a type because this
+ * is the type supported by the Qt widget (QTableView).
*/
- ssize_t _lastRowSearched;
+ int _lastRowSearched;
//! @cond Doxygen_Suppress
@@ -12,6 +12,7 @@
// C++11
#include <thread>
#include <future>
+#include <queue>
// KernelShark
#include "KsQuickContextMenu.hpp"
@@ -676,49 +677,129 @@ void KsTraceViewer::_setSearchIterator(int row)
void KsTraceViewer::_searchItemsMT()
{
int nThreads = std::thread::hardware_concurrency();
+ int startFrom, nRows(_proxyModel.rowCount({}));
std::vector<QPair<int, int>> ranges(nThreads);
std::vector<std::future<QList<int>>> maps;
- int i(0), nRows(_proxyModel.rowCount({}));
- int delta(nRows / nThreads);
-
- auto lamSearchMap = [&] (const QPair<int, int> &range,
- bool notify) {
- return _proxyModel.searchMap(_searchFSM._columnComboBox.currentIndex(),
- _searchFSM._searchLineEdit.text(),
- _searchFSM.condition(),
- range.first, range.second,
- notify);
+ std::mutex lrs_mtx;
+
+ auto lamLRSUpdate = [&] (int lastRowSearched) {
+ std::lock_guard<std::mutex> lock(lrs_mtx);
+
+ if (_searchFSM._lastRowSearched > lastRowSearched ||
+ _searchFSM._lastRowSearched < 0) {
+ /*
+ * This thread has been slower and processed
+ * less data. Take the place where it stopped
+ * as a starting point of the next search.
+ */
+ _searchFSM._lastRowSearched = lastRowSearched;
+ }
};
- auto lamSearchReduce = [&] (QList<int> &resultList,
- const QList<int> &mapList) {
- resultList << mapList;
- _searchFSM.incrementProgress();
+ auto lamSearchMap = [&] (const int first, bool notify) {
+ int lastRowSearched;
+ QList<int> list;
+
+ list = _proxyModel.searchThread(_searchFSM._columnComboBox.currentIndex(),
+ _searchFSM._searchLineEdit.text(),
+ _searchFSM.condition(),
+ nThreads,
+ first, nRows - 1,
+ &lastRowSearched,
+ notify);
+
+ lamLRSUpdate(lastRowSearched);
+
+ return list;
};
- for (auto &r: ranges) {
- r.first = (i++) * delta;
- r.second = r.first + delta - 1;
- }
+ using merge_pair_t = std::pair<int, int>;
+ using merge_container_t = std::vector<merge_pair_t>;
- /*
- * If the range is not multiple of the number of threads, adjust
- * the last range interval.
- */
- ranges.back().second = nRows - 1;
- maps.push_back(std::async(lamSearchMap, ranges[0], true));
+ auto lamComp = [] (const merge_pair_t& itemA, const merge_pair_t& itemB) {
+ return itemA.second > itemB.second;
+ };
+
+ using merge_queue_t = std::priority_queue<merge_pair_t,
+ merge_container_t,
+ decltype(lamComp)>;
+
+ auto lamSearchMerge = [&] (QList<int> &resultList,
+ QVector< QList<int> >&mapList) {
+ merge_queue_t queue(lamComp);
+ int id, stop(-1);
+
+ auto pop = [&] () {
+ if (queue.size() == 0)
+ return stop;
+
+ auto item = queue.top();
+ queue.pop();
+
+ if (!mapList[item.first].empty()) {
+ /*
+ * Replace the popped item with the next
+ * matching item fron the same search thread.
+ */
+ queue.push(std::make_pair(item.first,
+ mapList[item.first].front()));
+ mapList[item.first].pop_front();
+ }
+
+ if (_searchFSM.getState() == search_state_t::Paused_s &&
+ item.second > _searchFSM._lastRowSearched) {
+ /*
+ * The search has been paused and we already
+ * passed the last row searched by the slowest
+ * search thread. Stop here and ignore all
+ * following matches found by faster threads.
+ */
+ return stop;
+ }
+
+ return item.second;
+ };
+
+ for (int i = 0; i < mapList.size(); ++i)
+ if ( mapList[i].count()) {
+ queue.push(std::make_pair(i, mapList[i].front()));
+ mapList[i].pop_front();
+ }
+
+ id = pop();
+ while (id >= 0) {
+ resultList.append(id);
+ id = pop();
+ }
+ };
+
+ startFrom = _searchFSM._lastRowSearched + 1;
+ _searchFSM._lastRowSearched = -1;
+
+ /* Start the thread that will update the progress bar. */
+ maps.push_back(std::async(lamSearchMap,
+ startFrom,
+ true)); // notify = true
+
+ /* Start all other threads. */
for (int r = 1; r < nThreads; ++r)
- maps.push_back(std::async(lamSearchMap, ranges[r], false));
+ maps.push_back(std::async(lamSearchMap,
+ startFrom + r,
+ false)); // notify = false
- while (_proxyModel.searchProgress() < KS_PROGRESS_BAR_MAX - nThreads) {
+ while (_searchFSM.getState() == search_state_t::InProgress_s &&
+ _proxyModel.searchProgress() < KS_PROGRESS_BAR_MAX - nThreads - 1) {
std::unique_lock<std::mutex> lk(_proxyModel._mutex);
_proxyModel._pbCond.wait(lk);
_searchFSM.setProgress(_proxyModel.searchProgress());
QApplication::processEvents();
}
+ QVector<QList<int>> res;
for (auto &m: maps)
- lamSearchReduce(_matchList, m.get());
+ res.append(std::move(m.get()));
+
+ lamSearchMerge(_matchList, res);
}
/**
We switch from classical Map-Reduce approach in which the data is divided in sub-sets and each thread searches into its own sub-set to a solution in which all thread are progressing in the data in parallel. Note that the Map-Reduce solution is more efficient because at the end when we merge the searching results we simply have to append the outputs of the threads, while in the case of a parallel search we hare to also sort the merged outputs of the threads. However, the parallel search allows the user to stop and later restart the search at any time. The GUI buttons, needed to stop and restart the multi-threaded search will be enabled in the following patch. Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> --- kernel-shark/src/KsModels.cpp | 89 +++++++++++++------ kernel-shark/src/KsModels.hpp | 16 ++-- kernel-shark/src/KsSearchFSM.hpp | 5 +- kernel-shark/src/KsTraceViewer.cpp | 135 +++++++++++++++++++++++------ 4 files changed, 183 insertions(+), 62 deletions(-)