diff options
| author | Drew Richardson <drew.richardson@arm.com> | 2015-03-28 12:00:00 -0700 |
|---|---|---|
| committer | Drew Richardson <drew.richardson@arm.com> | 2015-04-01 14:41:00 -0700 |
| commit | abc3535c0d237bf7968b7092e545f2ff422af954 (patch) | |
| tree | 778f83b3d8fd576762290b58b12c33cca5a193e1 /daemon/SessionData.h | |
| parent | e8f6a181be0b67fc9d9ac117bc2ed01737be654c (diff) | |
gator: Version 5.215.21
Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Diffstat (limited to 'daemon/SessionData.h')
| -rw-r--r-- | daemon/SessionData.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/daemon/SessionData.h b/daemon/SessionData.h index ed282af..d0c8900 100644 --- a/daemon/SessionData.h +++ b/daemon/SessionData.h @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2010-2014. All rights reserved. + * Copyright (C) ARM Limited 2010-2015. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -11,7 +11,6 @@ #include <stdint.h> -#include "AnnotateListener.h" #include "Config.h" #include "Counter.h" #include "FtraceDriver.h" @@ -19,7 +18,7 @@ #include "MaliVideoDriver.h" #include "PerfDriver.h" -#define PROTOCOL_VERSION 20 +#define PROTOCOL_VERSION 21 // Differentiates development versions (timestamp) from release versions #define PROTOCOL_DEV 1000 @@ -43,18 +42,18 @@ public: void readModel(); void readCpuInfo(); - PolledDriver *usDrivers[6]; + PolledDriver *usDrivers[5]; KMod kmod; PerfDriver perf; MaliVideoDriver maliVideo; FtraceDriver ftraceDriver; - AnnotateListener annotateListener; char mCoreName[MAX_STRING_LEN]; struct ImageLinkList *mImages; char *mConfigurationXMLPath; char *mSessionXMLPath; char *mEventsXMLPath; + char *mEventsXMLAppend; char *mTargetPath; char *mAPCDir; char *mCaptureWorkingDir; @@ -81,6 +80,7 @@ public: int mPageSize; int *mCpuIds; int mMaxCpuId; + int mAnnotateStart; // PMU Counters int mCounterOverflow; @@ -93,6 +93,7 @@ private: }; extern SessionData* gSessionData; +extern const char *const gSrcMd5; uint64_t getTime(); int getEventKey(); |