0
0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-25 23:40:51 +08:00

EasyProfilerGUI: Limit max thread time in thread view based on calculation of thread duration

This commit is contained in:
Sergey Yagovtsev 2024-11-30 13:15:11 +03:00
parent c863641968
commit 3283b7c0d3
3 changed files with 30 additions and 8 deletions

View File

@ -8,7 +8,7 @@ find_package(Qt6Widgets)
find_package(Qt6Core5Compat) find_package(Qt6Core5Compat)
if (Qt6Widgets_FOUND) if (Qt6Widgets_FOUND)
message(STATUS "Using Qt v${Qt5Widgets_VERSION}") message(STATUS "Using Qt v${Qt6Widgets_VERSION}")
if (NOT("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") AND WIN32) if (NOT("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") AND WIN32)
set(APPLICATION_PLATFORM WIN32) set(APPLICATION_PLATFORM WIN32)
endif () endif ()
@ -89,6 +89,6 @@ if (Qt6Widgets_FOUND)
set_property(TARGET profiler_gui PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET profiler_gui PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
else () else ()
message(STATUS "INFO\n\n\tQt5 not found! Generating EasyProfiler projects without GUI.\n") message(STATUS "INFO\n\n\tQt6 not found! Generating EasyProfiler projects without GUI.\n")
endif () endif ()

View File

@ -91,7 +91,7 @@
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
const qreal MIN_SCALE = pow(profiler_gui::SCALING_COEFFICIENT_INV, 70); // Up to 1000 sec scale const qreal MIN_SCALE = pow(profiler_gui::SCALING_COEFFICIENT_INV, 60); // Up to 100 sec scale and 1000 sec max
const qreal MAX_SCALE = pow(profiler_gui::SCALING_COEFFICIENT, 45); // ~23000 --- Up to 10 ns scale const qreal MAX_SCALE = pow(profiler_gui::SCALING_COEFFICIENT, 45); // ~23000 --- Up to 10 ns scale
const qreal BASE_SCALE = pow(profiler_gui::SCALING_COEFFICIENT_INV, 25); // ~0.003 const qreal BASE_SCALE = pow(profiler_gui::SCALING_COEFFICIENT_INV, 25); // ~0.003
@ -680,6 +680,7 @@ BlocksGraphicsView::BlocksGraphicsView(QWidget* _parent)
, m_beginTime(profiler_gui::numeric_max<decltype(m_beginTime)>()) , m_beginTime(profiler_gui::numeric_max<decltype(m_beginTime)>())
, m_sceneWidth(0) , m_sceneWidth(0)
, m_scale(1) , m_scale(1)
, m_minScale(MIN_SCALE)
, m_offset(0) , m_offset(0)
, m_visibleRegionWidth(0) , m_visibleRegionWidth(0)
, m_timelineStep(0) , m_timelineStep(0)
@ -881,6 +882,8 @@ void BlocksGraphicsView::setTree(const profiler::thread_blocks_tree_t& _blocksTr
if (_blocksTree.empty()) if (_blocksTree.empty())
return; return;
calculateMinScale();
m_backgroundItem = new BackgroundItem(); m_backgroundItem = new BackgroundItem();
scene()->addItem(m_backgroundItem); scene()->addItem(m_backgroundItem);
@ -1276,7 +1279,7 @@ void BlocksGraphicsView::scaleTo(qreal _scale)
// have to limit scale because of Qt's QPainter feature: it doesn't draw text // have to limit scale because of Qt's QPainter feature: it doesn't draw text
// with very big coordinates (but it draw rectangles with the same coordinates good). // with very big coordinates (but it draw rectangles with the same coordinates good).
m_scale = clamp(MIN_SCALE, _scale, MAX_SCALE); m_scale = clamp(m_minScale, _scale, MAX_SCALE);
const int vbar_width = updateVisibleSceneRect(); const int vbar_width = updateVisibleSceneRect();
// Update slider width for scrollbar // Update slider width for scrollbar
@ -1369,7 +1372,7 @@ void BlocksGraphicsView::onWheel(qreal _scenePos, int _wheelDelta)
// with very big coordinates (but it draw rectangles with the same coordinates good). // with very big coordinates (but it draw rectangles with the same coordinates good).
_scenePos -= m_offset; _scenePos -= m_offset;
_scenePos *= m_scale; _scenePos *= m_scale;
m_scale = clamp(MIN_SCALE, m_scale * scaleCoeff, MAX_SCALE); m_scale = clamp(m_minScale, m_scale * scaleCoeff, MAX_SCALE);
//updateVisibleSceneRect(); // Update scene rect //updateVisibleSceneRect(); // Update scene rect
@ -1769,13 +1772,13 @@ void BlocksGraphicsView::onZoomSelection()
if (fabs(deltaScale - 1) < 1e-6) if (fabs(deltaScale - 1) < 1e-6)
{ {
// Restore scale value multiple to SCALING_COEFFICIENT // Restore scale value multiple to SCALING_COEFFICIENT
const int steps = static_cast<int>(log(m_scale / MIN_SCALE) / log(profiler_gui::SCALING_COEFFICIENT)); const int steps = static_cast<int>(log(m_scale / m_minScale) / log(profiler_gui::SCALING_COEFFICIENT));
const auto desiredScale = MIN_SCALE * pow(profiler_gui::SCALING_COEFFICIENT, steps); const auto desiredScale = m_minScale * pow(profiler_gui::SCALING_COEFFICIENT, steps);
deltaScale = desiredScale / m_scale; deltaScale = desiredScale / m_scale;
} }
m_offset = m_selectionItem->left() + (m_selectionItem->width() - m_visibleRegionWidth / deltaScale) * 0.5; m_offset = m_selectionItem->left() + (m_selectionItem->width() - m_visibleRegionWidth / deltaScale) * 0.5;
m_scale = clamp(MIN_SCALE, m_scale * deltaScale, MAX_SCALE); m_scale = clamp(m_minScale, m_scale * deltaScale, MAX_SCALE);
// Update slider width for scrollbar // Update slider width for scrollbar
notifyVisibleRegionSizeChange(); notifyVisibleRegionSizeChange();
@ -2087,6 +2090,22 @@ void BlocksGraphicsView::resizeEvent(QResizeEvent* event)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void BlocksGraphicsView::calculateMinScale()
{
profiler::timestamp_t threadMaxDuration = 0;
for (const auto& [_, root]: EASY_GLOBALS.profiler_blocks) {
if (root.children.empty()) {
continue;
}
const auto threadDuration = easyBlock(root.children.back()).tree.node->end() - easyBlock(root.children.front()).tree.node->begin();
threadMaxDuration = std::max(threadMaxDuration, threadDuration);
}
// Every 10 step is equal to x10 in max time in thread view
// Formulae for correct coefficient is: log10(desired_max_time) = x/10 + 30
const auto scalePower = 10.0*log(threadMaxDuration*1.10/1e9)/log(10.0) + 30.0;
m_minScale = pow(profiler_gui::SCALING_COEFFICIENT_INV, scalePower);
}
void BlocksGraphicsView::initMode() void BlocksGraphicsView::initMode()
{ {
// TODO: find mode with least number of bugs :) // TODO: find mode with least number of bugs :)

View File

@ -201,6 +201,7 @@ private:
::profiler::timestamp_t m_beginTime; ///< Begin time of profiler session. Used to reduce values of all begin and end times of profiler blocks. ::profiler::timestamp_t m_beginTime; ///< Begin time of profiler session. Used to reduce values of all begin and end times of profiler blocks.
qreal m_sceneWidth; ///< qreal m_sceneWidth; ///<
qreal m_scale; ///< Current scale qreal m_scale; ///< Current scale
qreal m_minScale; ///< Minimal scale to limit max time in thread widget
qreal m_offset; ///< Have to use manual offset for all scene content instead of using scrollbars because QScrollBar::value is 32-bit integer :( qreal m_offset; ///< Have to use manual offset for all scene content instead of using scrollbars because QScrollBar::value is 32-bit integer :(
qreal m_visibleRegionWidth; ///< Visible scene rectangle in scene coordinates + width of vertical scrollbar (if visible) qreal m_visibleRegionWidth; ///< Visible scene rectangle in scene coordinates + width of vertical scrollbar (if visible)
qreal m_timelineStep; ///< qreal m_timelineStep; ///<
@ -279,6 +280,8 @@ private:
// Private non-virtual methods // Private non-virtual methods
void calculateMinScale();
void notifySceneSizeChange(); void notifySceneSizeChange();
void notifyVisibleRegionSizeChange(); void notifyVisibleRegionSizeChange();
void notifyVisibleRegionSizeChange(qreal _size); void notifyVisibleRegionSizeChange(qreal _size);