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. Note, the last time gator was pulled into LSK it got done as a rebase rather than a merge commit so the conflict resolution will look messy. Basically, after the merge the contents of drivers/gator/ and tools/gator/daemon/ should be identical to my lsk-3.10-gator branch. (When I tried merging with "-X theirs", it didn't seem to quite work, so watch out for that.)
Thanks
- Tixy
The following changes since commit dffc698f098d93044e28f4f97206eca6373c7cdf:
Merge in gator version 5.17 (2013-12-19 09:36:46 +0000)
are available in the git repository at:
git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
for you to fetch changes up to 03925e64e3aff28a204a61f4b833aabe6aface2c:
Merge in gator version 5.18 (2014-04-10 12:45:17 +0100)
----------------------------------------------------------------
Jon Medhurst (4): gator: Version 5.18 gator-daemon: Fix compilation error: 'sa_family_t' does not name a type gator: Add config for building the module in-tree Merge in gator version 5.18
drivers/gator/Kconfig | 10 +- drivers/gator/gator.h | 13 +- drivers/gator/gator_annotate.c | 2 +- drivers/gator/gator_annotate_kernel.c | 8 +- drivers/gator/gator_backtrace.c | 48 +- drivers/gator/gator_buffer.c | 168 +++++ .../gator/{gator_pack.c => gator_buffer_write.c} | 24 +- drivers/gator/gator_cookies.c | 8 +- drivers/gator/gator_events_armv6.c | 2 +- drivers/gator/gator_events_armv7.c | 18 +- drivers/gator/gator_events_block.c | 2 +- drivers/gator/gator_events_ccn-504.c | 2 +- drivers/gator/gator_events_irq.c | 2 +- drivers/gator/gator_events_l2c-310.c | 2 +- drivers/gator/gator_events_mali_4xx.c | 2 +- drivers/gator/gator_events_mali_4xx.h | 2 +- drivers/gator/gator_events_mali_common.c | 2 +- drivers/gator/gator_events_mali_common.h | 2 +- drivers/gator/gator_events_mali_t6xx.c | 8 +- drivers/gator/gator_events_mali_t6xx_hw.c | 10 +- drivers/gator/gator_events_mali_t6xx_hw_test.c | 2 +- drivers/gator/gator_events_meminfo.c | 28 +- drivers/gator/gator_events_mmapped.c | 2 +- drivers/gator/gator_events_net.c | 2 +- drivers/gator/gator_events_perf_pmu.c | 2 +- drivers/gator/gator_events_sched.c | 2 +- drivers/gator/gator_events_scorpion.c | 2 +- drivers/gator/gator_fs.c | 47 +- drivers/gator/gator_hrtimer_gator.c | 8 +- drivers/gator/gator_hrtimer_perf.c | 113 --- drivers/gator/gator_iks.c | 2 +- drivers/gator/gator_main.c | 290 ++----- drivers/gator/gator_marshaling.c | 97 +-- drivers/gator/gator_trace_gpu.c | 13 +- drivers/gator/gator_trace_gpu.h | 2 +- drivers/gator/gator_trace_power.c | 6 +- drivers/gator/gator_trace_sched.c | 20 +- .../gator/mali/mali_mjollnir_profiling_gator_api.h | 2 +- .../gator/mali/mali_utgard_profiling_gator_api.h | 2 +- drivers/gator/mali_t6xx.mk | 9 + tools/gator/daemon/Android.mk | 15 +- tools/gator/daemon/Buffer.cpp | 259 +++++-- tools/gator/daemon/Buffer.h | 99 ++- tools/gator/daemon/CapturedXML.cpp | 11 +- tools/gator/daemon/CapturedXML.h | 2 +- tools/gator/daemon/Child.cpp | 174 ++--- tools/gator/daemon/Child.h | 4 +- tools/gator/daemon/Collector.h | 38 - tools/gator/daemon/Config.h | 17 + tools/gator/daemon/ConfigurationXML.cpp | 16 +- tools/gator/daemon/ConfigurationXML.h | 2 +- tools/gator/daemon/Counter.h | 4 +- tools/gator/daemon/Driver.cpp | 2 +- tools/gator/daemon/Driver.h | 4 +- .../daemon/{Collector.cpp => DriverSource.cpp} | 225 +++--- tools/gator/daemon/DriverSource.h | 52 ++ tools/gator/daemon/DynBuf.cpp | 139 ++++ tools/gator/daemon/DynBuf.h | 52 ++ tools/gator/daemon/EventsXML.cpp | 4 +- tools/gator/daemon/EventsXML.h | 2 +- tools/gator/daemon/ExternalSource.cpp | 56 ++ tools/gator/daemon/ExternalSource.h | 40 + tools/gator/daemon/Fifo.cpp | 2 +- tools/gator/daemon/Fifo.h | 4 +- tools/gator/daemon/Hwmon.cpp | 40 +- tools/gator/daemon/Hwmon.h | 6 +- tools/gator/daemon/KMod.cpp | 25 +- tools/gator/daemon/KMod.h | 4 +- tools/gator/daemon/LocalCapture.cpp | 6 +- tools/gator/daemon/LocalCapture.h | 2 +- tools/gator/daemon/Logging.cpp | 6 +- tools/gator/daemon/Logging.h | 13 +- tools/gator/daemon/Monitor.cpp | 61 ++ tools/gator/daemon/Monitor.h | 32 + tools/gator/daemon/OlySocket.cpp | 101 ++- tools/gator/daemon/OlySocket.h | 43 +- tools/gator/daemon/OlyUtility.cpp | 2 +- tools/gator/daemon/OlyUtility.h | 2 +- tools/gator/daemon/PerfBuffer.cpp | 139 ++++ tools/gator/daemon/PerfBuffer.h | 39 + tools/gator/daemon/PerfDriver.cpp | 355 +++++++++ tools/gator/daemon/PerfDriver.h | 56 ++ tools/gator/daemon/PerfGroup.cpp | 206 +++++ tools/gator/daemon/PerfGroup.h | 55 ++ tools/gator/daemon/PerfSource.cpp | 271 +++++++ tools/gator/daemon/PerfSource.h | 54 ++ tools/gator/daemon/Proc.cpp | 179 +++++ tools/gator/daemon/Proc.h | 17 + tools/gator/daemon/Sender.cpp | 29 +- tools/gator/daemon/Sender.h | 2 +- tools/gator/daemon/SessionData.cpp | 29 +- tools/gator/daemon/SessionData.h | 14 +- tools/gator/daemon/SessionXML.cpp | 12 +- tools/gator/daemon/SessionXML.h | 8 +- tools/gator/daemon/Source.cpp | 33 + tools/gator/daemon/Source.h | 40 + tools/gator/daemon/StreamlineSetup.cpp | 36 +- tools/gator/daemon/StreamlineSetup.h | 7 +- tools/gator/daemon/UEvent.cpp | 76 ++ tools/gator/daemon/UEvent.h | 36 + tools/gator/daemon/UserSpaceSource.cpp | 97 +++ tools/gator/daemon/UserSpaceSource.h | 38 + tools/gator/daemon/common.mk | 4 +- .../daemon/{configuration.xml => defaults.xml} | 51 +- tools/gator/daemon/escape.c | 2 +- tools/gator/daemon/events-Cortex-A12.xml | 6 +- tools/gator/daemon/events-Cortex-A15.xml | 6 +- tools/gator/daemon/events-Cortex-A5.xml | 6 +- tools/gator/daemon/events-Cortex-A7.xml | 6 +- tools/gator/daemon/events-Cortex-A8.xml | 6 +- tools/gator/daemon/events-Cortex-A9.xml | 6 +- tools/gator/daemon/events-Linux.xml | 14 +- tools/gator/daemon/events-Mali-4xx.xml | 2 +- tools/gator/daemon/events-Mali-T6xx.xml | 16 +- tools/gator/daemon/events-Perf-Hardware.xml | 12 + tools/gator/daemon/k/perf_event.3.12.h | 792 ++++++++++++++++++++ tools/gator/daemon/k/perf_event.h | 1 + tools/gator/daemon/main.cpp | 80 +- 118 files changed, 4275 insertions(+), 1115 deletions(-) create mode 100644 drivers/gator/gator_buffer.c rename drivers/gator/{gator_pack.c => gator_buffer_write.c} (68%) delete mode 100644 drivers/gator/gator_hrtimer_perf.c delete mode 100644 tools/gator/daemon/Collector.h create mode 100644 tools/gator/daemon/Config.h rename tools/gator/daemon/{Collector.cpp => DriverSource.cpp} (58%) create mode 100644 tools/gator/daemon/DriverSource.h create mode 100644 tools/gator/daemon/DynBuf.cpp create mode 100644 tools/gator/daemon/DynBuf.h create mode 100644 tools/gator/daemon/ExternalSource.cpp create mode 100644 tools/gator/daemon/ExternalSource.h create mode 100644 tools/gator/daemon/Monitor.cpp create mode 100644 tools/gator/daemon/Monitor.h create mode 100644 tools/gator/daemon/PerfBuffer.cpp create mode 100644 tools/gator/daemon/PerfBuffer.h create mode 100644 tools/gator/daemon/PerfDriver.cpp create mode 100644 tools/gator/daemon/PerfDriver.h create mode 100644 tools/gator/daemon/PerfGroup.cpp create mode 100644 tools/gator/daemon/PerfGroup.h create mode 100644 tools/gator/daemon/PerfSource.cpp create mode 100644 tools/gator/daemon/PerfSource.h create mode 100644 tools/gator/daemon/Proc.cpp create mode 100644 tools/gator/daemon/Proc.h create mode 100644 tools/gator/daemon/Source.cpp create mode 100644 tools/gator/daemon/Source.h create mode 100644 tools/gator/daemon/UEvent.cpp create mode 100644 tools/gator/daemon/UEvent.h create mode 100644 tools/gator/daemon/UserSpaceSource.cpp create mode 100644 tools/gator/daemon/UserSpaceSource.h rename tools/gator/daemon/{configuration.xml => defaults.xml} (51%) create mode 100644 tools/gator/daemon/events-Perf-Hardware.xml create mode 100644 tools/gator/daemon/k/perf_event.3.12.h create mode 120000 tools/gator/daemon/k/perf_event.h