Hi Mark, Alex

ARM have released a new version of DS-5 and I have a pull request below to update the version of gator in LSK...

The following changes since commit 14899ae67197e6e84cecf018f39d1be1a2d75b92:

Merge branch 'lsk-3.10-gator-5.18' into lsk-3.10-gator (2014-06-12 14:01:48 +0100)

are available in the git repository at:

git://git.linaro.org/landing-teams/working/arm/kernel.git

for you to fetch changes up to ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14:

Merge branch 'lsk-3.10-gator-5.19' into lsk-3.10-gator (2014-08-04 15:52:55 +0100)

---------------------------------------------------------------- Jon Medhurst (3): gator: Version 5.19 gator: Add config for building the module in-tree Merge branch 'lsk-3.10-gator-5.19' into lsk-3.10-gator

drivers/gator/Makefile | 15 +- drivers/gator/gator.h | 16 +- drivers/gator/gator_backtrace.c | 2 +- drivers/gator/gator_buffer.c | 6 +- drivers/gator/gator_events_armv7.c | 4 +- drivers/gator/gator_events_block.c | 17 +- drivers/gator/gator_events_mali_4xx.c | 144 +++++----------- drivers/gator/gator_events_mali_common.c | 36 ++-- drivers/gator/gator_events_mali_common.h | 20 +-- drivers/gator/gator_events_mali_t6xx.c | 5 +- drivers/gator/gator_events_mali_t6xx_hw.c | 183 ++++++++++++++++---- drivers/gator/gator_events_mmapped.c | 26 +-- drivers/gator/gator_events_perf_pmu.c | 6 +- drivers/gator/gator_events_scorpion.c | 4 +- drivers/gator/gator_events_threads.c | 115 +++++++++++++ drivers/gator/gator_iks.c | 2 +- drivers/gator/gator_main.c | 126 +++++++++++--- drivers/gator/gator_marshaling.c | 101 +++++------ drivers/gator/gator_trace_gpu.c | 178 ++++++++++++-------- drivers/gator/gator_trace_gpu.h | 79 --------- drivers/gator/gator_trace_power.c | 4 +- drivers/gator/gator_trace_sched.c | 85 ++++++---- drivers/gator/mali/mali_dd_gator_api.h | 40 +++++ drivers/gator/mali_t6xx.mk | 4 + tools/gator/daemon/Android.mk | 6 +- tools/gator/daemon/Application.mk | 1 + tools/gator/daemon/Buffer.cpp | 36 +++- tools/gator/daemon/Buffer.h | 11 +- tools/gator/daemon/CapturedXML.cpp | 11 +- tools/gator/daemon/CapturedXML.h | 2 +- tools/gator/daemon/Child.cpp | 45 ++--- tools/gator/daemon/Child.h | 2 +- tools/gator/daemon/ConfigurationXML.cpp | 10 +- tools/gator/daemon/Counter.h | 4 + tools/gator/daemon/DriverSource.cpp | 53 +++++- tools/gator/daemon/DriverSource.h | 5 + tools/gator/daemon/EventsXML.cpp | 16 +- tools/gator/daemon/EventsXML.h | 5 +- tools/gator/daemon/ExternalSource.cpp | 177 +++++++++++++++++++- tools/gator/daemon/ExternalSource.h | 11 +- tools/gator/daemon/FSDriver.cpp | 212 +++++++++++++++++++++++ tools/gator/daemon/FSDriver.h | 44 +++++ tools/gator/daemon/Fifo.h | 2 +- tools/gator/daemon/Hwmon.cpp | 16 +- tools/gator/daemon/KMod.cpp | 11 +- tools/gator/daemon/LocalCapture.h | 2 +- tools/gator/daemon/Logging.h | 2 +- tools/gator/daemon/Makefile | 8 +- tools/gator/daemon/Makefile_aarch64 | 9 +- tools/gator/daemon/MaliVideoDriver.cpp | 253 ++++++++++++++++++++++++++++ tools/gator/daemon/MaliVideoDriver.h | 50 ++++++ tools/gator/daemon/Monitor.cpp | 11 +- tools/gator/daemon/Monitor.h | 1 + tools/gator/daemon/OlySocket.cpp | 77 +++------ tools/gator/daemon/OlySocket.h | 14 +- tools/gator/daemon/PerfDriver.cpp | 92 +++++++--- tools/gator/daemon/PerfDriver.h | 6 +- tools/gator/daemon/PerfGroup.cpp | 28 +++- tools/gator/daemon/PerfGroup.h | 2 + tools/gator/daemon/PerfSource.cpp | 14 +- tools/gator/daemon/Proc.cpp | 106 ++++++++---- tools/gator/daemon/Proc.h | 2 +- tools/gator/daemon/Sender.h | 2 +- tools/gator/daemon/SessionData.cpp | 55 ++++-- tools/gator/daemon/SessionData.h | 17 +- tools/gator/daemon/SessionXML.cpp | 8 +- tools/gator/daemon/StreamlineSetup.cpp | 2 +- tools/gator/daemon/StreamlineSetup.h | 4 +- tools/gator/daemon/UEvent.cpp | 6 +- tools/gator/daemon/UserSpaceSource.cpp | 14 +- tools/gator/daemon/UserSpaceSource.h | 2 +- tools/gator/daemon/c++.cpp | 40 +++++ tools/gator/daemon/common.mk | 16 +- tools/gator/daemon/defaults.xml | 5 + tools/gator/daemon/escape.c | 2 +- tools/gator/daemon/events-CCI-400.xml | 21 +-- tools/gator/daemon/events-CCN-504.xml | 9 - tools/gator/daemon/events-Cortex-A53.xml | 84 ---------- tools/gator/daemon/events-Cortex-A57.xml | 84 ---------- tools/gator/daemon/events-Filesystem.xml | 11 ++ tools/gator/daemon/events-L2C-310.xml | 30 ++-- tools/gator/daemon/events-Linux.xml | 5 +- tools/gator/daemon/events-Mali-4xx.xml | 126 +++++++------- tools/gator/daemon/events-Mali-T6xx.xml | 26 ++- tools/gator/daemon/events-Mali-T6xx_hw.xml | 33 +--- tools/gator/daemon/events-Mali-V500.xml | 29 ++++ tools/gator/daemon/main.cpp | 260 +++++++++++++++++------------ 87 files changed, 2309 insertions(+), 1157 deletions(-) create mode 100644 drivers/gator/gator_events_threads.c delete mode 100644 drivers/gator/gator_trace_gpu.h create mode 100644 drivers/gator/mali/mali_dd_gator_api.h create mode 100644 tools/gator/daemon/Application.mk create mode 100644 tools/gator/daemon/FSDriver.cpp create mode 100644 tools/gator/daemon/FSDriver.h create mode 100644 tools/gator/daemon/MaliVideoDriver.cpp create mode 100644 tools/gator/daemon/MaliVideoDriver.h create mode 100644 tools/gator/daemon/c++.cpp create mode 100644 tools/gator/daemon/events-Filesystem.xml create mode 100644 tools/gator/daemon/events-Mali-V500.xml