diff --git a/daemon/SessionData.h b/daemon/SessionData.h
index e0e0b7ad8a29adc695b665d27b10ca0b0d9b7008..5b6899b20796f7541b8745e521146030df40e4f9 100644 (file)
--- a/daemon/SessionData.h
+++ b/daemon/SessionData.h
/**
- * Copyright (C) ARM Limited 2010-2012. All rights reserved.
+ * Copyright (C) ARM Limited 2010-2013. 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
#ifndef SESSION_DATA_H
#define SESSION_DATA_H
+#include <stdint.h>
+
+#include "Counter.h"
+#include "Hwmon.h"
+
#define MAX_PERFORMANCE_COUNTERS 50
-#define MAX_STRING_LEN 80
-#define MAX_DESCRIPTION_LEN 400
-#define PROTOCOL_VERSION 12
+#define PROTOCOL_VERSION 13
#define PROTOCOL_DEV 1000 // Differentiates development versions (timestamp) from release versions
struct ImageLinkList {
class SessionData {
public:
+ static const size_t MAX_STRING_LEN = 80;
+
SessionData();
~SessionData();
void initialize();
- void initializeCounters();
void parseSessionXML(char* xmlString);
+ Hwmon hwmon;
+
char mCoreName[MAX_STRING_LEN];
struct ImageLinkList *mImages;
char* mConfigurationXMLPath;
int mBacktraceDepth;
int mTotalBufferSize; // number of MB to use for the entire collection buffer
int mSampleRate;
+ int64_t mLiveRate;
int mDuration;
int mCores;
+ int mCpuId;
// PMU Counters
bool mCounterOverflow;
- char mPerfCounterType[MAX_PERFORMANCE_COUNTERS][MAX_STRING_LEN];
- char mPerfCounterTitle[MAX_PERFORMANCE_COUNTERS][MAX_STRING_LEN];
- char mPerfCounterName[MAX_PERFORMANCE_COUNTERS][MAX_STRING_LEN];
- char mPerfCounterDescription[MAX_PERFORMANCE_COUNTERS][MAX_DESCRIPTION_LEN];
- char mPerfCounterDisplay[MAX_PERFORMANCE_COUNTERS][MAX_STRING_LEN];
- char mPerfCounterUnits[MAX_PERFORMANCE_COUNTERS][MAX_STRING_LEN];
- int mPerfCounterEnabled[MAX_PERFORMANCE_COUNTERS];
- int mPerfCounterEvent[MAX_PERFORMANCE_COUNTERS];
- int mPerfCounterColor[MAX_PERFORMANCE_COUNTERS];
- int mPerfCounterCount[MAX_PERFORMANCE_COUNTERS];
- int mPerfCounterKey[MAX_PERFORMANCE_COUNTERS];
- bool mPerfCounterPerCPU[MAX_PERFORMANCE_COUNTERS];
- bool mPerfCounterEBSCapable[MAX_PERFORMANCE_COUNTERS];
- bool mPerfCounterAverageSelection[MAX_PERFORMANCE_COUNTERS];
+ Counter mCounters[MAX_PERFORMANCE_COUNTERS];
+
+private:
+ void readCpuInfo();
};
extern SessionData* gSessionData;
+int getEventKey();
+
#endif // SESSION_DATA_H