diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
| commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
| tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /src/testlib/doc | |
| parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'src/testlib/doc')
| -rw-r--r-- | src/testlib/doc/src/qttestlib-manual.qdoc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 13654972ec..4125e63ddc 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -315,12 +315,15 @@ \row \li CPU tick counter \li -tickcounter \li Windows, Mac OS X, Linux, many UNIX-like systems. - \row \li Valgrind Callgrind - \li -callgrind - \li Linux (if installed) \row \li Event Counter \li -eventcounter \li All platforms + \row \li Valgrind Callgrind + \li -callgrind + \li Linux (if installed) + \row \li Linux Perf + \li -perf + \li Linux \endtable In short, walltime is always available but requires many repetitions to @@ -335,6 +338,16 @@ that were received by the event loop before they are sent to their corresponding targets (this might include non-Qt events). + The Linux Performance Monitoring solution is available only on Linux and + provides many different counters, which can be selected by passing an + additional option \c {-perfcounter countername}, such as \c {-perfcounter + cache-misses}, \c {-perfcounter branch-misses}, or \c {-perfcounter + l1d-load-misses}. The default counter is \c {cpu-cycles}. The full list of + counters can be obtained by running any benchmark executable with the + option \c -perfcounterlist. + + Note that using the performance counter may require enabling access to non-privileged applications. + \note Depending on the device configuration, tick counters on the Windows CE platform may not be as fine-grained, compared to other platforms. Devices that do not support high-resolution timers default to |