diff options
Diffstat (limited to 'daemon')
31 files changed, 905 insertions, 502 deletions
diff --git a/daemon/Android.mk b/daemon/Android.mk index cbaf42d..cc1d542 100644 --- a/daemon/Android.mk +++ b/daemon/Android.mk @@ -1,11 +1,11 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -$(shell cd $(LOCAL_PATH);cat events_header.xml events-*\.xml events_footer.xml > events.xml;xxd -i events.xml > events_xml.h;xxd -i configuration.xml > configuration_xml.h) +XML_H := $(shell cd $(LOCAL_PATH) && make events_xml.h configuration_xml.h) -LOCAL_CFLAGS += -Wall -O3 -ftree-vectorize -Wno-error=sequence-point +LOCAL_CFLAGS += -Wall -O3 -mthumb-interwork -fno-exceptions -LOCAL_SRC_FILES:= \ +LOCAL_SRC_FILES := \ CapturedXML.cpp \ Child.cpp \ Collector.cpp \ @@ -33,9 +33,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES := $(LOCAL_PATH) -LOCAL_MODULE:= gatord -LOCAL_MODULE_TAGS:= optional - -LOCAL_LDLIBS := -lz -llog +LOCAL_MODULE := gatord +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/daemon/CapturedXML.cpp b/daemon/CapturedXML.cpp index 30d984f..cc218d7 100644 --- a/daemon/CapturedXML.cpp +++ b/daemon/CapturedXML.cpp @@ -14,8 +14,6 @@ #include "Logging.h" #include "OlyUtility.h" -extern void handleException(); - CapturedXML::CapturedXML() { } @@ -111,3 +109,42 @@ void CapturedXML::write(char* path) { free(xml); free(file); } + +// whitespace callback utility function used with mini-xml +const char * mxmlWhitespaceCB(mxml_node_t *node, int loc) { + const char *name; + + name = mxmlGetElement(node); + + if (loc == MXML_WS_BEFORE_OPEN) { + // Single indentation + if (!strcmp(name, "target") || !strcmp(name, "counters")) + return("\n "); + + // Double indentation + if (!strcmp(name, "counter")) + return("\n "); + + // Avoid a carriage return on the first line of the xml file + if (!strncmp(name, "?xml", 4)) + return(NULL); + + // Default - no indentation + return("\n"); + } + + if (loc == MXML_WS_BEFORE_CLOSE) { + // No indentation + if (!strcmp(name, "captured")) + return("\n"); + + // Single indentation + if (!strcmp(name, "counters")) + return("\n "); + + // Default - no carriage return + return(NULL); + } + + return(NULL); +} diff --git a/daemon/CapturedXML.h b/daemon/CapturedXML.h index 3f6a4de..3cac576 100644 --- a/daemon/CapturedXML.h +++ b/daemon/CapturedXML.h @@ -22,4 +22,6 @@ private: mxml_node_t* getTree(bool includeTime); }; +const char * mxmlWhitespaceCB(mxml_node_t *node, int where); + #endif //__CAPTURED_XML_H__ diff --git a/daemon/Collector.cpp b/daemon/Collector.cpp index 25bb934..2e4af0c 100644 --- a/daemon/Collector.cpp +++ b/daemon/Collector.cpp @@ -18,8 +18,6 @@ #include "Logging.h" #include "Sender.h" -extern void handleException(); - // Driver initialization independent of session settings Collector::Collector() { char text[sizeof(gSessionData->mPerfCounterType[0]) + 30]; // sufficiently large to hold all /dev/gator/events/<types>/<file> diff --git a/daemon/ConfigurationXML.cpp b/daemon/ConfigurationXML.cpp index df83697..14c2809 100644 --- a/daemon/ConfigurationXML.cpp +++ b/daemon/ConfigurationXML.cpp @@ -14,8 +14,6 @@ #include "OlyUtility.h" #include "SessionData.h" -extern void handleException(); - static const char* ATTR_COUNTER = "counter"; static const char* ATTR_REVISION = "revision"; static const char* ATTR_TITLE = "title"; @@ -171,7 +169,7 @@ void ConfigurationXML::configurationTag(mxml_node_t *node) { if (mxmlElementGetAttr(node, ATTR_AVERAGE_SELECTION)) gSessionData->mPerfCounterAverageSelection[mIndex] = util->stringToBool(mxmlElementGetAttr(node, ATTR_AVERAGE_SELECTION), false); gSessionData->mPerfCounterEnabled[mIndex] = true; - // strncpy does not guarantee a null-termianted string + // strncpy does not guarantee a null-terminated string gSessionData->mPerfCounterType[mIndex][sizeof(gSessionData->mPerfCounterType[mIndex]) - 1] = 0; gSessionData->mPerfCounterTitle[mIndex][sizeof(gSessionData->mPerfCounterTitle[mIndex]) - 1] = 0; gSessionData->mPerfCounterName[mIndex][sizeof(gSessionData->mPerfCounterName[mIndex]) - 1] = 0; @@ -184,8 +182,6 @@ void ConfigurationXML::configurationTag(mxml_node_t *node) { } void ConfigurationXML::getDefaultConfigurationXml(const char * & xml, unsigned int & len) { - // the first line of configuration_xml.h is "unsigned char configuration_xml", but configuration_xml needs to be const static as well - const static #include "configuration_xml.h" // defines and initializes char configuration_xml[] and int configuration_xml_len xml = (const char *)configuration_xml; len = configuration_xml_len; diff --git a/daemon/Fifo.cpp b/daemon/Fifo.cpp index 191536f..4a27452 100644 --- a/daemon/Fifo.cpp +++ b/daemon/Fifo.cpp @@ -12,8 +12,6 @@ #include "Fifo.h" #include "Logging.h" -extern void handleException(); - // bufferSize is the amount of data to be filled // singleBufferSize is the maximum size that may be filled during a single write // (bufferSize + singleBufferSize) will be allocated @@ -37,27 +35,29 @@ Fifo::Fifo(int singleBufferSize, int bufferSize) { Fifo::~Fifo() { free(mBuffer); + sem_destroy(&mWaitForSpaceSem); + sem_destroy(&mWaitForDataSem); } -int Fifo::numBytesFilled() { +int Fifo::numBytesFilled() const { return mWrite - mRead + mRaggedEnd; } -char* Fifo::start() { +char* Fifo::start() const { return mBuffer; } -bool Fifo::isEmpty() { +bool Fifo::isEmpty() const { return mRead == mWrite && mRaggedEnd == 0; } -bool Fifo::isFull() { +bool Fifo::isFull() const { return willFill(0); } // Determines if the buffer will fill assuming 'additional' bytes will be added to the buffer // 'full' means there is less than singleBufferSize bytes available contiguously; it does not mean there are zero bytes available -bool Fifo::willFill(int additional) { +bool Fifo::willFill(int additional) const { if (mWrite > mRead) { if (numBytesFilled() + additional < mWrapThreshold) { return false; @@ -98,7 +98,7 @@ char* Fifo::write(int length) { } // This function will stall until data is available -char* Fifo::read(int* length) { +char* Fifo::read(int *const length) { // update the read pointer now that the data has been handled mRead = mReadCommit; diff --git a/daemon/Fifo.h b/daemon/Fifo.h index b460549..e2a5d94 100644 --- a/daemon/Fifo.h +++ b/daemon/Fifo.h @@ -15,13 +15,13 @@ class Fifo { public: Fifo(int singleBufferSize, int totalBufferSize); ~Fifo(); - int numBytesFilled(); - bool isEmpty(); - bool isFull(); - bool willFill(int additional); - char* start(); + int numBytesFilled() const; + bool isEmpty() const; + bool isFull() const; + bool willFill(int additional) const; + char* start() const; char* write(int length); - char* read(int* length); + char* read(int *const length); private: int mSingleBufferSize, mWrite, mRead, mReadCommit, mRaggedEnd, mWrapThreshold; diff --git a/daemon/LocalCapture.cpp b/daemon/LocalCapture.cpp index f8cd17f..2dd3aff 100644 --- a/daemon/LocalCapture.cpp +++ b/daemon/LocalCapture.cpp @@ -17,8 +17,6 @@ #include "Logging.h" #include "OlyUtility.h" -extern void handleException(); - LocalCapture::LocalCapture() {} LocalCapture::~LocalCapture() {} @@ -56,7 +54,7 @@ char* LocalCapture::createUniqueDirectory(const char* initialPath, const char* e handleException(); } else if (initialPath[0] != '/') { if (getcwd(path, PATH_MAX) == 0) { - logg->logMessage("Unable to retrive the current working directory"); + logg->logMessage("Unable to retrieve the current working directory"); } strncat(path, "/", PATH_MAX - strlen(path) - 1); strncat(path, initialPath, PATH_MAX - strlen(path) - 1); diff --git a/daemon/Logging.h b/daemon/Logging.h index 4247966..37f7dd3 100644 --- a/daemon/Logging.h +++ b/daemon/Logging.h @@ -42,4 +42,6 @@ private: extern Logging* logg; +extern void handleException(); + #endif //__LOGGING_H__ diff --git a/daemon/Makefile b/daemon/Makefile index 5562db7..95d1809 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -8,10 +8,8 @@ # targets it is necessary to add options # '-marm -march=armv4t -mfloat-abi=soft'. -ARCH=arm - -CPP=$(CROSS_COMPILE)g++ -GCC=$(CROSS_COMPILE)gcc +CPP = $(CROSS_COMPILE)g++ +GCC = $(CROSS_COMPILE)gcc # -g produces debugging information # -O3 maximum optimization @@ -21,34 +19,40 @@ GCC=$(CROSS_COMPILE)gcc # -std=c++0x is the planned new c++ standard # -std=c++98 is the 1998 c++ standard # -mthumb-interwork is required for interworking to ARM or Thumb stdlibc -CFLAGS=-O3 -Wall -mthumb-interwork +CFLAGS = -O3 -Wall -mthumb-interwork -fno-exceptions +CXXFLAGS = -fno-rtti ifeq ($(WERROR),1) CFLAGS += -Werror endif # -s strips the binary of debug info -LDFLAGS=-s -TARGET=gatord +LDFLAGS = -s +TARGET = gatord C_SRC = $(wildcard mxml/*.c) -CPP_SRC = $(wildcard *.cpp) -TGT_OBJS = $(CPP_SRC:%.cpp=%.o) \ - $(C_SRC:%.c=%.o) +CPP_SRC = $(wildcard *.cpp) all: $(TARGET) +events.xml: events_header.xml $(wildcard events-*.xml) events_footer.xml + cat $^ > $@ + +StreamlineSetup.cpp: events_xml.h +ConfigurationXML.cpp: configuration_xml.h + +%_xml.h: %.xml escape + ./escape $< > $@ + %.o: %.c *.h $(GCC) -c $(CFLAGS) -o $@ $< %.o: %.cpp *.h - $(CPP) -c $(CFLAGS) -o $@ $< + $(CPP) -c $(CFLAGS) $(CXXFLAGS) -o $@ $< -$(TARGET): convert $(TGT_OBJS) - $(CPP) $(LDFLAGS) -o $@ $(TGT_OBJS) -lc -lrt -lpthread - rm events_xml.h configuration_xml.h +$(TARGET): $(CPP_SRC:%.cpp=%.o) $(C_SRC:%.c=%.o) + $(CPP) $(LDFLAGS) -o $@ $^ -lc -lrt -lpthread + rm -f events_xml.h configuration_xml.h -convert: - cat events_header.xml events-*\.xml events_footer.xml > events.xml - xxd -i events.xml > events_xml.h - xxd -i configuration.xml > configuration_xml.h +escape: escape.c + gcc $^ -o $@ clean: - rm -f *.o mxml/*.o $(TARGET) events.xml events_xml.h configuration_xml.h + rm -f *.o mxml/*.o $(TARGET) escape events.xml events_xml.h configuration_xml.h diff --git a/daemon/OlySocket.cpp b/daemon/OlySocket.cpp index a3bf746..6128dc0 100644 --- a/daemon/OlySocket.cpp +++ b/daemon/OlySocket.cpp @@ -20,242 +20,240 @@ #ifdef WIN32 #define CLOSE_SOCKET(x) closesocket(x) -#define SHUTDOWN_RX_TX SD_BOTH -#define snprintf _snprintf +#define SHUTDOWN_RX_TX SD_BOTH +#define snprintf _snprintf #else #define CLOSE_SOCKET(x) close(x) -#define SHUTDOWN_RX_TX SHUT_RDWR +#define SHUTDOWN_RX_TX SHUT_RDWR #endif -extern void handleException(); - OlySocket::OlySocket(int port, bool multiple) { #ifdef WIN32 - WSADATA wsaData; - if (WSAStartup(0x0202, &wsaData) != 0) { - logg->logError(__FILE__, __LINE__, "Windows socket initialization failed"); - handleException(); - } + WSADATA wsaData; + if (WSAStartup(0x0202, &wsaData) != 0) { + logg->logError(__FILE__, __LINE__, "Windows socket initialization failed"); + handleException(); + } #endif - if (multiple) { - createServerSocket(port); - } else { - createSingleServerConnection(port); - } + if (multiple) { + createServerSocket(port); + } else { + createSingleServerConnection(port); + } } OlySocket::OlySocket(int port, char* host) { - mFDServer = 0; - createClientSocket(host, port); + mFDServer = 0; + createClientSocket(host, port); } OlySocket::~OlySocket() { - if (mSocketID > 0) { - CLOSE_SOCKET(mSocketID); - } + if (mSocketID > 0) { + CLOSE_SOCKET(mSocketID); + } } void OlySocket::shutdownConnection() { - // Shutdown is primarily used to unblock other threads that are blocking on send/receive functions - shutdown(mSocketID, SHUTDOWN_RX_TX); + // Shutdown is primarily used to unblock other threads that are blocking on send/receive functions + shutdown(mSocketID, SHUTDOWN_RX_TX); } void OlySocket::closeSocket() { - // Used for closing an accepted socket but keeping the server socket active - if (mSocketID > 0) { - CLOSE_SOCKET(mSocketID); - mSocketID = -1; - } + // Used for closing an accepted socket but keeping the server socket active + if (mSocketID > 0) { + CLOSE_SOCKET(mSocketID); + mSocketID = -1; + } } void OlySocket::closeServerSocket() { - if (CLOSE_SOCKET(mFDServer) != 0) { - logg->logError(__FILE__, __LINE__, "Failed to close server socket."); - handleException(); - } - mFDServer = 0; + if (CLOSE_SOCKET(mFDServer) != 0) { + logg->logError(__FILE__, __LINE__, "Failed to close server socket."); + handleException(); + } + mFDServer = 0; } void OlySocket::createClientSocket(char* hostname, int portno) { #ifdef WIN32 - // TODO: Implement for Windows + // TODO: Implement for Windows #else - char buf[32]; - struct addrinfo hints, *res, *res0; - - snprintf(buf, sizeof(buf), "%d", portno); - mSocketID = -1; - memset((void*)&hints, 0, sizeof(hints)); - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - - if (getaddrinfo(hostname, buf, &hints, &res0)) { - logg->logError(__FILE__, __LINE__, "Client socket failed to get address info for %s", hostname); - handleException(); - } - for (res=res0; res!=NULL; res = res->ai_next) { - if ( res->ai_family != PF_INET || res->ai_socktype != SOCK_STREAM ) { - continue; - } - mSocketID = socket(res->ai_family, res->ai_socktype, res->ai_protocol); - if (mSocketID < 0) { - continue; - } - if (connect(mSocketID, res->ai_addr, res->ai_addrlen) < 0) { - close(mSocketID); - mSocketID = -1; - } - if (mSocketID > 0) { - break; - } - } - freeaddrinfo(res0); - if (mSocketID <= 0) { - logg->logError(__FILE__, __LINE__, "Could not connect to client socket. Ensure ARM Streamline is running."); - handleException(); - } + char buf[32]; + struct addrinfo hints, *res, *res0; + + snprintf(buf, sizeof(buf), "%d", portno); + mSocketID = -1; + memset((void*)&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + if (getaddrinfo(hostname, buf, &hints, &res0)) { + logg->logError(__FILE__, __LINE__, "Client socket failed to get address info for %s", hostname); + handleException(); + } + for (res=res0; res!=NULL; res = res->ai_next) { + if ( res->ai_family != PF_INET || res->ai_socktype != SOCK_STREAM ) { + continue; + } + mSocketID = socket(res->ai_family, res->ai_socktype, res->ai_protocol); + if (mSocketID < 0) { + continue; + } + if (connect(mSocketID, res->ai_addr, res->ai_addrlen) < 0) { + close(mSocketID); + mSocketID = -1; + } + if (mSocketID > 0) { + break; + } + } + freeaddrinfo(res0); + if (mSocketID <= 0) { + logg->logError(__FILE__, __LINE__, "Could not connect to client socket. Ensure ARM Streamline is running."); + handleException(); + } #endif } void OlySocket::createSingleServerConnection(int port) { - createServerSocket(port); + createServerSocket(port); - mSocketID = acceptConnection(); - closeServerSocket(); + mSocketID = acceptConnection(); + closeServerSocket(); } void OlySocket::createServerSocket(int port) { - // Create socket - mFDServer = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (mFDServer < 0) { - logg->logError(__FILE__, __LINE__, "Error creating server socket"); - handleException(); - } - - // Enable address reuse, another solution would be to create the server socket once and only close it when the object exits - int on = 1; - if (setsockopt(mFDServer, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)) != 0) { - logg->logError(__FILE__, __LINE__, "Setting server socket options failed"); - handleException(); - } - - // Create sockaddr_in structure, ensuring non-populated fields are zero - struct sockaddr_in sockaddr; - memset((void*)&sockaddr, 0, sizeof(struct sockaddr_in)); - sockaddr.sin_family = AF_INET; - sockaddr.sin_port = htons(port); - sockaddr.sin_addr.s_addr = INADDR_ANY; - - // Bind the socket to an address - if (bind(mFDServer, (const struct sockaddr*)&sockaddr, sizeof(sockaddr)) < 0) { - logg->logError(__FILE__, __LINE__, "Binding of server socket failed.\nIs an instance already running?"); - handleException(); - } - - // Listen for connections on this socket - if (listen(mFDServer, 1) < 0) { - logg->logError(__FILE__, __LINE__, "Listening of server socket failed"); - handleException(); - } + // Create socket + mFDServer = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + if (mFDServer < 0) { + logg->logError(__FILE__, __LINE__, "Error creating server socket"); + handleException(); + } + + // Enable address reuse, another solution would be to create the server socket once and only close it when the object exits + int on = 1; + if (setsockopt(mFDServer, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)) != 0) { + logg->logError(__FILE__, __LINE__, "Setting server socket options failed"); + handleException(); + } + + // Create sockaddr_in structure, ensuring non-populated fields are zero + struct sockaddr_in sockaddr; + memset((void*)&sockaddr, 0, sizeof(struct sockaddr_in)); + sockaddr.sin_family = AF_INET; + sockaddr.sin_port = htons(port); + sockaddr.sin_addr.s_addr = INADDR_ANY; + + // Bind the socket to an address + if (bind(mFDServer, (const struct sockaddr*)&sockaddr, sizeof(sockaddr)) < 0) { + logg->logError(__FILE__, __LINE__, "Binding of server socket failed.\nIs an instance already running?"); + handleException(); + } + + // Listen for connections on this socket + if (listen(mFDServer, 1) < 0) { + logg->logError(__FILE__, __LINE__, "Listening of server socket failed"); + handleException(); + } } // mSocketID is always set to the most recently accepted connection // The user of this class should maintain the different socket connections, e.g. by forking the process int OlySocket::acceptConnection() { - if (mFDServer <= 0) { - logg->logError(__FILE__, __LINE__, "Attempting multiple connections on a single connection server socket or attempting to accept on a client socket"); - handleException(); - } - - // Accept a connection, note that this call blocks until a client connects - mSocketID = accept(mFDServer, NULL, NULL); - if (mSocketID < 0) { - logg->logError(__FILE__, __LINE__, "Socket acceptance failed"); - handleException(); - } - return mSocketID; + if (mFDServer <= 0) { + logg->logError(__FILE__, __LINE__, "Attempting multiple connections on a single connection server socket or attempting to accept on a client socket"); + handleException(); + } + + // Accept a connection, note that this call blocks until a client connects + mSocketID = accept(mFDServer, NULL, NULL); + if (mSocketID < 0) { + logg->logError(__FILE__, __LINE__, "Socket acceptance failed"); + handleException(); + } + return mSocketID; } void OlySocket::send(char* buffer, int size) { - if (size <= 0 || buffer == NULL) { - return; - } - - while (size > 0) { - int n = ::send(mSocketID, buffer, size, 0); - if (n < 0) { - logg->logError(__FILE__, __LINE__, "Socket send error"); - handleException(); - } - size -= n; - buffer += n; - } + if (size <= 0 || buffer == NULL) { + return; + } + + while (size > 0) { + int n = ::send(mSocketID, buffer, size, 0); + if (n < 0) { + logg->logError(__FILE__, __LINE__, "Socket send error"); + handleException(); + } + size -= n; + buffer += n; + } } // Returns the number of bytes received int OlySocket::receive(char* buffer, int size) { - if (size <= 0 || buffer == NULL) { - return 0; - } - - int bytes = recv(mSocketID, buffer, size, 0); - if (bytes < 0) { - logg->logError(__FILE__, __LINE__, "Socket receive error"); - handleException(); - } else if (bytes == 0) { - logg->logMessage("Socket disconnected"); - return -1; - } - return bytes; + if (size <= 0 || buffer == NULL) { + return 0; + } + + int bytes = recv(mSocketID, buffer, size, 0); + if (bytes < 0) { + logg->logError(__FILE__, __LINE__, "Socket receive error"); + handleException(); + } else if (bytes == 0) { + logg->logMessage("Socket disconnected"); + return -1; + } + return bytes; } // Receive exactly size bytes of data. Note, this function will block until all bytes are received int OlySocket::receiveNBytes(char* buffer, int size) { - int bytes = 0; - while (size > 0 && buffer != NULL) { - bytes = recv(mSocketID, buffer, size, 0); - if (bytes < 0) { - logg->logError(__FILE__, __LINE__, "Socket receive error"); - handleException(); - } else if (bytes == 0) { - logg->logMessage("Socket disconnected"); - return -1; - } - buffer += bytes; - size -= bytes; - } - return bytes; + int bytes = 0; + while (size > 0 && buffer != NULL) { + bytes = recv(mSocketID, buffer, size, 0); + if (bytes < 0) { + logg->logError(__FILE__, __LINE__, "Socket receive error"); + handleException(); + } else if (bytes == 0) { + logg->logMessage("Socket disconnected"); + return -1; + } + buffer += bytes; + size -= bytes; + } + return bytes; } // Receive data until a carriage return, line feed, or null is encountered, or the buffer fills int OlySocket::receiveString(char* buffer, int size) { - int bytes_received = 0; - bool found = false; - - if (buffer == 0) { - return 0; - } - - while (!found && bytes_received < size) { - // Receive a single character - int bytes = recv(mSocketID, &buffer[bytes_received], 1, 0); - if (bytes < 0) { - logg->logError(__FILE__, __LINE__, "Socket receive error"); - handleException(); - } else if (bytes == 0) { - logg->logMessage("Socket disconnected"); - return -1; - } - - // Replace carriage returns and line feeds with zero - if (buffer[bytes_received] == '\n' || buffer[bytes_received] == '\r' || buffer[bytes_received] == '\0') { - buffer[bytes_received] = '\0'; - found = true; - } - - bytes_received++; - } - - return bytes_received; + int bytes_received = 0; + bool found = false; + + if (buffer == 0) { + return 0; + } + + while (!found && bytes_received < size) { + // Receive a single character + int bytes = recv(mSocketID, &buffer[bytes_received], 1, 0); + if (bytes < 0) { + logg->logError(__FILE__, __LINE__, "Socket receive error"); + handleException(); + } else if (bytes == 0) { + logg->logMessage("Socket disconnected"); + return -1; + } + + // Replace carriage returns and line feeds with zero + if (buffer[bytes_received] == '\n' || buffer[bytes_received] == '\r' || buffer[bytes_received] == '\0') { + buffer[bytes_received] = '\0'; + found = true; + } + + bytes_received++; + } + + return bytes_received; } diff --git a/daemon/OlySocket.h b/daemon/OlySocket.h index 266a831..b306908 100644 --- a/daemon/OlySocket.h +++ b/daemon/OlySocket.h @@ -6,31 +6,31 @@ * published by the Free Software Foundation. */ -#ifndef __OLY_SOCKET_H__ -#define __OLY_SOCKET_H__ +#ifndef __OLY_SOCKET_H__ +#define __OLY_SOCKET_H__ #include <string.h> class OlySocket { public: - OlySocket(int port, bool multipleConnections = false); - OlySocket(int port, char* hostname); - ~OlySocket(); - int acceptConnection(); - void closeSocket(); - void closeServerSocket(); - void shutdownConnection(); - void send(char* buffer, int size); - void sendString(const char* string) {send((char*)string, strlen(string));} - int receive(char* buffer, int size); - int receiveNBytes(char* buffer, int size); - int receiveString(char* buffer, int size); - int getSocketID() {return mSocketID;} + OlySocket(int port, bool multipleConnections = false); + OlySocket(int port, char* hostname); + ~OlySocket(); + int acceptConnection(); + void closeSocket(); + void closeServerSocket(); + void shutdownConnection(); + void send(char* buffer, int size); + void sendString(const char* string) {send((char*)string, strlen(string));} + int receive(char* buffer, int size); + int receiveNBytes(char* buffer, int size); + int receiveString(char* buffer, int size); + int getSocketID() {return mSocketID;} private: - int mSocketID, mFDServer; - void createClientSocket(char* hostname, int port); - void createSingleServerConnection(int port); - void createServerSocket(int port); + int mSocketID, mFDServer; + void createClientSocket(char* hostname, int port); + void createSingleServerConnection(int port); + void createServerSocket(int port); }; -#endif //__OLY_SOCKET_H__ +#endif //__OLY_SOCKET_H__ diff --git a/daemon/OlyUtility.cpp b/daemon/OlyUtility.cpp index adc7aba..df4fe22 100644 --- a/daemon/OlyUtility.cpp +++ b/daemon/OlyUtility.cpp @@ -11,10 +11,12 @@ #include <string.h> #include <ctype.h> -#ifndef WIN32 +#if defined(WIN32) +#include <windows.h> +#elif defined(__linux__) #include <unistd.h> -#else -#include <Windows.h> +#elif defined(DARWIN) +#include <mach-o/dyld.h> #endif #include "OlyUtility.h" @@ -22,138 +24,144 @@ OlyUtility* util = NULL; bool OlyUtility::stringToBool(const char* string, bool defValue) { - char value[32]; - - if (string == NULL) { - return defValue; - } - - strncpy(value, string, sizeof(value)); - if (value[0] == 0) { - return defValue; - } - value[sizeof(value) - 1] = 0; // strncpy does not guarantee a null-terminated string - - // Convert to lowercase - int i = 0; - while (value[i]) { - value[i] = tolower(value[i]); - i++; - } - - if (strcmp(value, "true") == 0 || strcmp(value, "yes") == 0 || strcmp(value, "1") == 0 || strcmp(value, "on") == 0) { - return true; - } else if (strcmp(value, "false") == 0 || strcmp(value, "no") == 0 || strcmp(value, "0") == 0 || strcmp(value, "off") == 0) { - return false; - } else { - return defValue; - } + char value[32]; + + if (string == NULL) { + return defValue; + } + + strncpy(value, string, sizeof(value)); + if (value[0] == 0) { + return defValue; + } + value[sizeof(value) - 1] = 0; // strncpy does not guarantee a null-terminated string + + // Convert to lowercase + int i = 0; + while (value[i]) { + value[i] = tolower(value[i]); + i++; + } + + if (strcmp(value, "true") == 0 || strcmp(value, "yes") == 0 || strcmp(value, "1") == 0 || strcmp(value, "on") == 0) { + return true; + } else if (strcmp(value, "false") == 0 || strcmp(value, "no") == 0 || strcmp(value, "0") == 0 || strcmp(value, "off") == 0) { + return false; + } else { + return defValue; + } } void OlyUtility::stringToLower(char* string) { - if (string == NULL) { - return; - } - - while (*string) { - *string = tolower(*string); - string++; - } + if (string == NULL) { + return; + } + + while (*string) { + *string = tolower(*string); + string++; + } } // Modifies fullpath with the path part including the trailing path separator int OlyUtility::getApplicationFullPath(char* fullpath, int sizeOfPath) { - memset(fullpath, 0, sizeOfPath); -#ifdef WIN32 - int length = GetModuleFileName(NULL, fullpath, sizeOfPath); -#else - int length = readlink("/proc/self/exe", fullpath, sizeOfPath); + memset(fullpath, 0, sizeOfPath); +#if defined(WIN32) + int length = GetModuleFileName(NULL, fullpath, sizeOfPath); +#elif defined(__linux__) + int length = readlink("/proc/self/exe", fullpath, sizeOfPath); +#elif defined(DARWIN) + uint32_t length_u = (uint32_t)sizeOfPath; + int length = sizeOfPath; + if (_NSGetExecutablePath(fullpath, &length_u) == 0) { + length = strlen(fullpath); + } #endif - if (length == sizeOfPath) { - return -1; - } + if (length == sizeOfPath) { + return -1; + } - fullpath[length] = 0; - fullpath = getPathPart(fullpath); + fullpath[length] = 0; + fullpath = getPathPart(fullpath); - return 0; + return 0; } char* OlyUtility::readFromDisk(const char* file, unsigned int *size, bool appendNull) { - // Open the file - FILE* pFile = fopen(file, "rb"); - if (pFile==NULL) { - return NULL; - } - - // Obtain file size - fseek(pFile , 0 , SEEK_END); - unsigned int lSize = ftell(pFile); - rewind(pFile); - - // Allocate memory to contain the whole file - char* buffer = (char*)malloc(lSize + (int)appendNull); - if (buffer == NULL) { - fclose(pFile); - return NULL; - } - - // Copy the file into the buffer - if (fread(buffer, 1, lSize, pFile) != lSize) { - free(buffer); - fclose(pFile); - return NULL; - } - - // Terminate - fclose(pFile); - - if (appendNull) { - buffer[lSize] = 0; - } - - if (size) { - *size = lSize; - } - - return buffer; + // Open the file + FILE* pFile = fopen(file, "rb"); + if (pFile==NULL) { + return NULL; + } + + // Obtain file size + fseek(pFile , 0 , SEEK_END); + unsigned int lSize = ftell(pFile); + rewind(pFile); + + // Allocate memory to contain the whole file + char* buffer = (char*)malloc(lSize + (int)appendNull); + if (buffer == NULL) { + fclose(pFile); + return NULL; + } + + // Copy the file into the buffer + if (fread(buffer, 1, lSize, pFile) != lSize) { + free(buffer); + fclose(pFile); + return NULL; + } + + // Terminate + fclose(pFile); + + if (appendNull) { + buffer[lSize] = 0; + } + + if (size) { + *size = lSize; + } + + return buffer; } int OlyUtility::writeToDisk(const char* path, const char* data) { - // Open the file - FILE* pFile = fopen(path, "wb"); - if (pFile == NULL) { - return -1; - } - - // Write the data to disk - if (fwrite(data, 1, strlen(data), pFile) != strlen(data)) { - fclose(pFile); - return -1; - } - - // Terminate - fclose(pFile); - return 0; + // Open the file + FILE* pFile = fopen(path, "wb"); + if (pFile == NULL) { + return -1; + } + + // Write the data to disk + if (fwrite(data, 1, strlen(data), pFile) != strlen(data)) { + fclose(pFile); + return -1; + } + + // Terminate + fclose(pFile); + return 0; } int OlyUtility::appendToDisk(const char* path, const char* data) { - // Open the file - FILE* pFile = fopen(path, "a"); - if (pFile == NULL) { - return -1; - } - - // Write the data to disk - if (fwrite(data, 1, strlen(data), pFile) != strlen(data)) { - fclose(pFile); - return -1; - } - - // Terminate - fclose(pFile); - return 0; + // Open the file + FILE* pFile = fopen(path, "a"); + if (pFile == NULL) { + return -1; + } + + // Write the data to disk + if (fwrite(data, 1, strlen(data), pFile) != strlen(data)) { + fclose(pFile); + return -1; + } + + // Terminate + fclose(pFile); + return 0; } /** @@ -163,97 +171,58 @@ int OlyUtility::appendToDisk(const char* path, const char* data) { */ #define TRANSFER_SIZE 1024 int OlyUtility::copyFile(const char* srcFile, const char* dstFile) { - char* buffer = (char*)malloc(TRANSFER_SIZE); - FILE * f_src = fopen(srcFile,"rb"); - if (!f_src) { - return 0; - } - FILE * f_dst = fopen(dstFile,"wb"); - if (!f_dst) { - fclose(f_src); - return 0; - } - while (!feof(f_src)) { - int num_bytes_read = fread(buffer, 1, TRANSFER_SIZE, f_src); - if (num_bytes_read < TRANSFER_SIZE && !feof(f_src)) { - fclose(f_src); - fclose(f_dst); - return 0; - } - int num_bytes_written = fwrite(buffer, 1, num_bytes_read, f_dst); - if (num_bytes_written != num_bytes_read) { - fclose(f_src); - fclose(f_dst); - return 0; - } - } - fclose(f_src); - fclose(f_dst); - free(buffer); - return 1; + char* buffer = (char*)malloc(TRANSFER_SIZE); + FILE * f_src = fopen(srcFile,"rb"); + if (!f_src) { + return 0; + } + FILE * f_dst = fopen(dstFile,"wb"); + if (!f_dst) { + fclose(f_src); + return 0; + } + while (!feof(f_src)) { + int num_bytes_read = fread(buffer, 1, TRANSFER_SIZE, f_src); + if (num_bytes_read < TRANSFER_SIZE && !feof(f_src)) { + fclose(f_src); + fclose(f_dst); + return 0; + } + int num_bytes_written = fwrite(buffer, 1, num_bytes_read, f_dst); + if (num_bytes_written != num_bytes_read) { + fclose(f_src); + fclose(f_dst); + return 0; + } + } + fclose(f_src); + fclose(f_dst); + free(buffer); + return 1; } const char* OlyUtility::getFilePart(const char* path) { - const char* last_sep = strrchr(path, PATH_SEPARATOR); + const char* last_sep = strrchr(path, PATH_SEPARATOR); - // in case path is not a full path - if (last_sep == NULL) { - return path; - } + // in case path is not a full path + if (last_sep == NULL) { + return path; + } - return last_sep++; + return last_sep++; } // getPathPart may modify the contents of path // returns the path including the trailing path separator char* OlyUtility::getPathPart(char* path) { - char* last_sep = strrchr(path, PATH_SEPARATOR); + char* last_sep = strrchr(path, PATH_SEPARATOR); - // in case path is not a full path - if (last_sep == NULL) { - return 0; - } - last_sep++; - *last_sep = 0; + // in case path is not a full path + if (last_sep == NULL) { + return 0; + } + last_sep++; + *last_sep = 0; - return (path); -} - -// whitespace callback utility function used with mini-xml -const char * mxmlWhitespaceCB(mxml_node_t *node, int loc) { - const char *name; - - name = mxmlGetElement(node); - - if (loc == MXML_WS_BEFORE_OPEN) { - // Single indentation - if (!strcmp(name, "target") || !strcmp(name, "counters")) - return("\n "); - - // Double indentation - if (!strcmp(name, "counter")) - return("\n "); - - // Avoid a carriage return on the first line of the xml file - if (!strncmp(name, "?xml", 4)) - return(NULL); - - // Default - no indentation - return("\n"); - } - - if (loc == MXML_WS_BEFORE_CLOSE) { - // No indentation - if (!strcmp(name, "captured")) - return("\n"); - - // Single indentation - if (!strcmp(name, "counters")) - return("\n "); - - // Default - no carriage return - return(NULL); - } - - return(NULL); + return (path); } diff --git a/daemon/OlyUtility.h b/daemon/OlyUtility.h index 793a733..424c583 100644 --- a/daemon/OlyUtility.h +++ b/daemon/OlyUtility.h @@ -11,28 +11,30 @@ #ifdef WIN32 #define PATH_SEPARATOR '\\' +#define CAIMAN_PATH_MAX MAX_PATH +#define snprintf _snprintf #else +#include <limits.h> #define PATH_SEPARATOR '/' +#define CAIMAN_PATH_MAX PATH_MAX #endif class OlyUtility { public: - OlyUtility() {}; - ~OlyUtility() {}; - bool stringToBool(const char* string, bool defValue); - void stringToLower(char* string); - int getApplicationFullPath(char* path, int sizeOfPath); - char* readFromDisk(const char* file, unsigned int *size = NULL, bool appendNull = true); - int writeToDisk(const char* path, const char* file); - int appendToDisk(const char* path, const char* file); - int copyFile(const char* srcFile, const char* dstFile); - const char* getFilePart(const char* path); - char* getPathPart(char* path); + OlyUtility() {}; + ~OlyUtility() {}; + bool stringToBool(const char* string, bool defValue); + void stringToLower(char* string); + int getApplicationFullPath(char* path, int sizeOfPath); + char* readFromDisk(const char* file, unsigned int *size = NULL, bool appendNull = true); + int writeToDisk(const char* path, const char* file); + int appendToDisk(const char* path, const char* file); + int copyFile(const char* srcFile, const char* dstFile); + const char* getFilePart(const char* path); + char* getPathPart(char* path); private: }; -#include "mxml/mxml.h" -const char * mxmlWhitespaceCB(mxml_node_t *node, int where); extern OlyUtility* util; #endif // OLY_UTILITY_H diff --git a/daemon/Sender.cpp b/daemon/Sender.cpp index eba8343..54f2207 100644 --- a/daemon/Sender.cpp +++ b/daemon/Sender.cpp @@ -17,8 +17,6 @@ #include "Logging.h" #include "SessionData.h" -extern void handleException(); - Sender::Sender(OlySocket* socket) { mDataFile = NULL; mDataSocket = NULL; @@ -37,7 +35,7 @@ Sender::Sender(OlySocket* socket) { } } - // Send magic sequence - must be done first, afterwhich error messages can be sent + // Send magic sequence - must be done first, after which error messages can be sent char magic[32]; snprintf(magic, 32, "GATOR %i\n", PROTOCOL_VERSION); mDataSocket->send(magic, strlen(magic)); diff --git a/daemon/SessionData.cpp b/daemon/SessionData.cpp index 5aa3f11..53a3ea6 100644 --- a/daemon/SessionData.cpp +++ b/daemon/SessionData.cpp @@ -10,7 +10,6 @@ #include "SessionData.h" #include "SessionXML.h" #include "Logging.h" -extern void handleException(); SessionData* gSessionData = NULL; diff --git a/daemon/SessionData.h b/daemon/SessionData.h index 00a71b1..e0e0b7a 100644 --- a/daemon/SessionData.h +++ b/daemon/SessionData.h @@ -13,7 +13,7 @@ #define MAX_STRING_LEN 80 #define MAX_DESCRIPTION_LEN 400 -#define PROTOCOL_VERSION 11 +#define PROTOCOL_VERSION 12 #define PROTOCOL_DEV 1000 // Differentiates development versions (timestamp) from release versions struct ImageLinkList { diff --git a/daemon/SessionXML.cpp b/daemon/SessionXML.cpp index 4c373d8..b2b6c30 100644 --- a/daemon/SessionXML.cpp +++ b/daemon/SessionXML.cpp @@ -13,8 +13,6 @@ #include "Logging.h" #include "OlyUtility.h" -extern void handleException(); - static const char* TAG_SESSION = "session"; static const char* TAG_IMAGE = "image"; diff --git a/daemon/StreamlineSetup.cpp b/daemon/StreamlineSetup.cpp index 3f59eab..d13cf1d 100644 --- a/daemon/StreamlineSetup.cpp +++ b/daemon/StreamlineSetup.cpp @@ -22,8 +22,6 @@ #include "StreamlineSetup.h" #include "ConfigurationXML.h" -extern void handleException(); - static const char* TAG_SESSION = "session"; static const char* TAG_REQUEST = "request"; static const char* TAG_CONFIGURATIONS = "configurations"; diff --git a/daemon/escape.c b/daemon/escape.c new file mode 100644 index 0000000..c0f47f1 --- /dev/null +++ b/daemon/escape.c @@ -0,0 +1,63 @@ +/** + * Copyright (C) ARM Limited 2010-2012. 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 + * published by the Free Software Foundation. + */ + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> + +static void print_escaped_path(char *path) { + if (isdigit(*path)) { + printf("__"); + } + for (; *path != '\0'; ++path) { + printf("%c", isalnum(*path) ? *path : '_'); + } +} + +int main(int argc, char *argv[]) { + int i; + char *path; + FILE *in = NULL; + int ch; + unsigned int len = 0; + + for (i = 1; i < argc && argv[i][0] == '-'; ++i) ; + if (i == argc) { + fprintf(stderr, "Usage: %s <filename>\n", argv[0]); + return EXIT_FAILURE; + } + path = argv[i]; + + errno = 0; + if ((in = fopen(path, "r")) == NULL) { + fprintf(stderr, "Unable to open '%s': %s\n", path, strerror(errno)); + return EXIT_FAILURE; + } + + printf("static const unsigned char "); + print_escaped_path(path); + printf("[] = {"); + for (; (ch = fgetc(in)) != EOF; ++len) { + if (len != 0) { + printf(","); + } + if (len % 12 == 0) { + printf("\n "); + } + printf(" 0x%.2x", ch); + } + printf("\n};\nstatic const unsigned int "); + print_escaped_path(path); + printf("_len = %i;\n", len); + + fclose(in); + + return EXIT_SUCCESS; +} diff --git a/daemon/events-Cortex-A15.xml b/daemon/events-Cortex-A15.xml index 0ec196f..e0bd201 100644 --- a/daemon/events-Cortex-A15.xml +++ b/daemon/events-Cortex-A15.xml @@ -65,4 +65,4 @@ <event event="0x7c" title="Instruction" name="ISB" description="Barrier speculatively executed - ISB"/> <event event="0x7d" title="Instruction" name="DSB" description="Barrier speculatively executed - DSB"/> <event event="0x7e" title="Instruction" name="DMB" description="Barrier speculatively executed - DMB"/> - </category> + </category> diff --git a/daemon/events-Cortex-A53.xml b/daemon/events-Cortex-A53.xml new file mode 100644 index 0000000..3fa9c66 --- /dev/null +++ b/daemon/events-Cortex-A53.xml @@ -0,0 +1,171 @@ + <counter_set name="ARM_Cortex-A53_cnt" count="6"/> + <category name="Cortex-A53" counter_set="ARM_Cortex-A53_cnt" per_cpu="yes" supports_event_based_sampling="yes"> + <!-- 0x11 CPU_CYCLES - Cycle --> + <event counter="ARM_Cortex-A53_ccnt" title="Clock" name="Cycles" display="hertz" units="Hz" average_selection="yes" description="The number of core clock cycles"/> + <!-- 0x00 SW_INCR - Instruction architecturally executed (condition check pass) - Software increment --> + <event event="0x00" title="Software" name="Increment" description="Incremented only on writes to the Software Increment Register"/> + <!-- 0x01 L1I_CACHE_REFILL - Level 1 instruction cache refill --> + <event event="0x01" title="Cache" name="Instruction refill" description="Instruction fetch that causes a refill of at least the level of instruction or unified cache closest to the processor"/> + <!-- 0x02 L1I_TLB_REFILL - Level 1 instruction TLB refill --> + <event event="0x02" title="Cache" name="Inst TLB refill" description="Instruction fetch that causes a TLB refill of at least the level of TLB closest to the processor"/> + <!-- 0x03 L1D_CACHE_REFILL - Level 1 data cache refill --> + <event event="0x03" title="Cache" name="Data refill" description="Memory Read or Write operation that causes a refill of at least the level of data or unified cache closest to the processor"/> + <!-- 0x04 L1D_CACHE - Level 1 data cache access --> + <event event="0x04" title="Cache" name="Data access" description="Memory Read or Write operation that causes a cache access to at least the level of data or unified cache closest to the processor"/> + <!-- 0x05 L1D_TLB_REFILL - Level 1 data TLB refill --> + <event event="0x05" title="Cache" name="Data TLB refill" description="Memory Read or Write operation that causes a TLB refill of at least the level of TLB closest to the processor"/> + <!-- 0x08 INST_RETIRED - Instruction architecturally executed --> + <event event="0x08" title="-" name="INST_RETIRED" description="Instruction architecturally executed"/> + <!-- 0x09 EXC_TAKEN - Exception taken --> + <event event="0x09" title="Exception" name="Taken" description="Exceptions taken"/> + <!-- 0x0A EXC_RETURN - Instruction architecturally executed (condition check pass) - Exception return --> + <event event="0x0a" title="Exception" name="Return" description="Exception return architecturally executed"/> + <!-- 0x0B CID_WRITE_RETIRED - Instruction architecturally executed (condition check pass) - Write to CONTEXTIDR --> + <event event="0x0b" title="Instruction" name="CONTEXTIDR" description="Instruction that writes to the CONTEXTIDR architecturally executed"/> + <!-- 0x10 BR_MIS_PRED - Mispredicted or not predicted branch speculatively executed --> + <event event="0x10" title="Branch" name="Mispredicted" description="Branch mispredicted or not predicted"/> + <!-- 0x12 BR_PRED - Predictable branch speculatively executed --> + <event event="0x12" title="Branch" name="Potential prediction" description="Branch or other change in program flow that could have been predicted by the branch prediction resources of the processor"/> + <!-- 0x13 MEM_ACCESS - Data memory access --> + <event event="0x13" title="-" name="MEM_ACCESS" description="Data memory access"/> + <!-- 0x14 L1I_CACHE - Level 1 instruction cache access --> + <event event="0x14" title="-" name="L1I_CACHE" description="Level 1 instruction cache access"/> + <!-- 0x15 L1D_CACHE_WB - Level 1 data cache Write-Back --> + <event event="0x15" title="-" name="L1D_CACHE_WB" description="Level 1 data cache Write-Back"/> + <!-- 0x16 L2D_CACHE - Level 2 data cache access --> + <event event="0x16" title="-" name="L2D_CACHE" description="Level 2 data cache access"/> + <!-- 0x17 L2D_CACHE_REFILL - Level 2 data cache refill --> + <event event="0x17" title="-" name="L2D_CACHE_REFILL" description="Level 2 data cache refill"/> + <!-- 0x18 L2D_CACHE_WB - Level 2 data cache Write-Back --> + <event event="0x18" title="-" name="L2D_CACHE_WB" description="Level 2 data cache Write-Back"/> + <!-- 0x19 BUS_ACCESS - Bus access --> + <event event="0x19" title="-" name="BUS_ACCESS" description="Bus access"/> + <!-- 0x1A MEMORY_ERROR - Local memory error --> + <event event="0x1A" title="-" name="MEMORY_ERROR" description="Local memory error"/> + <!-- 0x1B INST_SPEC - Operation speculatively executed --> + <event event="0x1B" title="-" name="INST_SPEC" description="Operation speculatively executed"/> + <!-- 0x1C TTBR_WRITE_RETIRED - Instruction architecturally executed (condition check pass) - Write to translation table base --> + <event event="0x1C" title="-" name="TTBR_WRITE_RETIRED" description="Instruction architecturally executed (condition check pass) - Write to translation table base"/> + <!-- 0x1D BUS_CYCLES - Bus cycle --> + <event event="0x1D" title="-" name="BUS_CYCLES" description="Bus cycle"/> + <!-- 0x1E CHAIN - Odd performance counter chain mode --> + <event event="0x1E" title="-" name="CHAIN" description="Odd performance counter chain mode"/> + <!-- 0x40 L1D_CACHE_LD - Level 1 data cache access - Read --> + <event event="0x40" title="-" name="L1D_CACHE_LD" description="Level 1 data cache access - Read"/> + <!-- 0x41 L1D_CACHE_ST - Level 1 data cache access - Write --> + <event event="0x41" title="-" name="L1D_CACHE_ST" description="Level 1 data cache access - Write"/> + <!-- 0x42 L1D_CACHE_REFILL_LD - Level 1 data cache refill - Read --> + <event event="0x42" title="-" name="L1D_CACHE_REFILL_LD" description="Level 1 data cache refill - Read"/> + <!-- 0x43 L1D_CACHE_REFILL_ST - Level 1 data cache refill - Write --> + <event event="0x43" title="-" name="L1D_CACHE_REFILL_ST" description="Level 1 data cache refill - Write"/> + <!-- 0x46 L1D_CACHE_WB_VICTIM - Level 1 data cache Write-back - Victim --> + <event event="0x46" title="-" name="L1D_CACHE_WB_VICTIM" description="Level 1 data cache Write-back - Victim"/> + <!-- 0x47 L1D_CACHE_WB_CLEAN - Level 1 data cache Write-back - Cleaning and coherency --> + <event event="0x47" title="-" name="L1D_CACHE_WB_CLEAN" description="Level 1 data cache Write-back - Cleaning and coherency"/> + <!-- 0x48 L1D_CACHE_INVAL - Level 1 data cache invalidate --> + <event event="0x48" title="-" name="L1D_CACHE_INVAL" description="Level 1 data cache invalidate"/> + <!-- 0x4C L1D_TLB_REFILL_LD - Level 1 data TLB refill - Read --> + <event event="0x4C" title="-" name="L1D_TLB_REFILL_LD" description="Level 1 data TLB refill - Read"/> + <!-- 0x4D L1D_TLB_REFILL_ST - Level 1 data TLB refill - Write --> + <event event="0x4D" title="-" name="L1D_TLB_REFILL_ST" description="Level 1 data TLB refill - Write"/> + <!-- 0x50 L2D_CACHE_LD - Level 2 data cache access - Read --> + <event event="0x50" title="-" name="L2D_CACHE_LD" description="Level 2 data cache access - Read"/> + <!-- 0x51 L2D_CACHE_ST - Level 2 data cache access - Write --> + <event event="0x51" title="-" name="L2D_CACHE_ST" description="Level 2 data cache access - Write"/> + <!-- 0x52 L2D_CACHE_REFILL_LD - Level 2 data cache refill - Read --> + <event event="0x52" title="-" name="L2D_CACHE_REFILL_LD" description="Level 2 data cache refill - Read"/> + <!-- 0x53 L2D_CACHE_REFILL_ST - Level 2 data cache refill - Write --> + <event event="0x53" title="-" name="L2D_CACHE_REFILL_ST" description="Level 2 data cache refill - Write"/> + <!-- 0x56 L2D_CACHE_WB_VICTIM - Level 2 data cache Write-back - Victim --> + <event event="0x56" title="-" name="L2D_CACHE_WB_VICTIM" description="Level 2 data cache Write-back - Victim"/> + <!-- 0x57 L2D_CACHE_WB_CLEAN - Level 2 data cache Write-back - Cleaning and coherency --> + <event event="0x57" title="-" name="L2D_CACHE_WB_CLEAN" description="Level 2 data cache Write-back - Cleaning and coherency"/> + <!-- 0x58 L2D_CACHE_INVAL - Level 2 data cache invalidate --> + <event event="0x58" title="-" name="L2D_CACHE_INVAL" description="Level 2 data cache invalidate"/> + <!-- 0x60 BUS_ACCESS_LD - Bus access - Read --> + <event event="0x60" title="-" name="BUS_ACCESS_LD" description="Bus access - Read"/> + <!-- 0x61 BUS_ACCESS_ST - Bus access - Write --> + <event event="0x61" title="-" name="BUS_ACCESS_ST" description="Bus access - Write"/> + <!-- 0x62 BUS_ACCESS_SHARED - Bus access - Normal --> + <event event="0x62" title="-" name="BUS_ACCESS_SHARED" description="Bus access - Normal"/> + <!-- 0x63 BUS_ACCESS_NOT_SHARED - Bus access - Not normal --> + <event event="0x63" title="-" name="BUS_ACCESS_NOT_SHARED" description="Bus access - Not normal"/> + <!-- 0x64 BUS_ACCESS_NORMAL - Bus access - Normal --> + <event event="0x64" title="-" name="BUS_ACCESS_NORMAL" description="Bus access - Normal"/> + <!-- 0x65 BUS_ACCESS_PERIPH - Bus access - Peripheral --> + <event event="0x65" title="-" name="BUS_ACCESS_PERIPH" description="Bus access - Peripheral"/> + <!-- 0x66 MEM_ACCESS_LD - Data memory access - Read --> + <event event="0x66" title="-" name="MEM_ACCESS_LD" description="Data memory access - Read"/> + <!-- 0x67 MEM_ACCESS_ST - Data memory access - Write --> + <event event="0x67" title="-" name="MEM_ACCESS_ST" description="Data memory access - Write"/> + <!-- 0x68 UNALIGNED_LD_SPEC - Unaligned access - Read --> + <event event="0x68" title="-" name="UNALIGNED_LD_SPEC" description="Unaligned access - Read"/> + <!-- 0x69 UNALIGNED_ST_SPEC - Unaligned access - Write --> + <event event="0x69" title="-" name="UNALIGNED_ST_SPEC" description="Unaligned access - Write"/> + <!-- 0x6A UNALIGNED_LDST_SPEC - Unaligned access --> + <event event="0x6A" title="-" name="UNALIGNED_LDST_SPEC" description="Unaligned access"/> + <!-- 0x6C LDREX_SPEC - Exclusive operation speculatively executed - LDREX --> + <event event="0x6C" title="-" name="LDREX_SPEC" description="Exclusive operation speculatively executed - LDREX"/> + <!-- 0x6D STREX_PASS_SPEC - Exclusive instruction speculatively executed - STREX pass --> + <event event="0x6D" title="-" name="STREX_PASS_SPEC" description="Exclusive instruction speculatively executed - STREX pass"/> + <!-- 0x6E STREX_FAIL_SPEC - Exclusive operation speculatively executed - STREX fail --> + <event event="0x6E" title="-" name="STREX_FAIL_SPEC" description="Exclusive operation speculatively executed - STREX fail"/> + <!-- 0x70 LD_SPEC - Operation speculatively executed - Load --> + <event event="0x70" title="-" name="LD_SPEC" description="Operation speculatively executed - Load"/> + <!-- 0x71 ST_SPEC - Operation speculatively executed - Store --> + <event event="0x71" title="-" name="ST_SPEC" description="Operation speculatively executed - Store"/> + <!-- 0x72 LDST_SPEC - Operation speculatively executed - Load or store --> + <event event="0x72" title="-" name="LDST_SPEC" description="Operation speculatively executed - Load or store"/> + <!-- 0x73 DP_SPEC - Operation speculatively executed - Integer data processing --> + <event event="0x73" title="-" name="DP_SPEC" description="Operation speculatively executed - Integer data processing"/> + <!-- 0x74 ASE_SPEC - Operation speculatively executed - Advanced SIMD --> + <event event="0x74" title="-" name="ASE_SPEC" description="Operation speculatively executed - Advanced SIMD"/> + <!-- 0x75 VFP_SPEC - Operation speculatively executed - VFP --> + <event event="0x75" title="-" name="VFP_SPEC" description="Operation speculatively executed - VFP"/> + <!-- 0x76 PC_WRITE_SPEC - Operation speculatively executed - Software change of the PC --> + <event event="0x76" title="-" name="PC_WRITE_SPEC" description="Operation speculatively executed - Software change of the PC"/> + <!-- 0x77 CRYPTO_SPEC - Operation speculatively executed, crypto data processing --> + <event event="0x77" title="-" name="CRYPTO_SPEC" description="Operation speculatively executed, crypto data processing"/> + <!-- 0x78 BR_IMMED_SPEC - Branch speculatively executed - Immediate branch --> + <event event="0x78" title="-" name="BR_IMMED_SPEC" description="Branch speculatively executed - Immediate branch"/> + <!-- 0x79 BR_RETURN_SPEC - Branch speculatively executed - Procedure return --> + <event event="0x79" title="-" name="BR_RETURN_SPEC" description="Branch speculatively executed - Procedure return"/> + <!-- 0x7A BR_INDIRECT_SPEC - Branch speculatively executed - Indirect branch --> + <event event="0x7A" title="-" name="BR_INDIRECT_SPEC" description="Branch speculatively executed - Indirect branch"/> + <!-- 0x7C ISB_SPEC - Barrier speculatively executed - ISB --> + <event event="0x7C" title="-" name="ISB_SPEC" description="Barrier speculatively executed - ISB"/> + <!-- 0x7D DSB_SPEC - Barrier speculatively executed - DSB --> + <event event="0x7D" title="-" name="DSB_SPEC" description="Barrier speculatively executed - DSB"/> + <!-- 0x7E DMB_SPEC - Barrier speculatively executed - DMB --> + <event event="0x7E" title="-" name="DMB_SPEC" description="Barrier speculatively executed - DMB"/> + <!-- 0x81 EXC_UNDEF - Exception taken, other synchronous --> + <event event="0x81" title="-" name="EXC_UNDEF" description="Exception taken, other synchronous"/> + <!-- 0x82 EXC_SVC - Exception taken, Supervisor Call --> + <event event="0x82" title="-" name="EXC_SVC" description="Exception taken, Supervisor Call"/> + <!-- 0x83 EXC_PABORT - Exception taken, Instruction Abort --> + <event event="0x83" title="-" name="EXC_PABORT" description="Exception taken, Instruction Abort"/> + <!-- 0x84 EXC_DABORT - Exception taken, Data Abort or SError --> + <event event="0x84" title="-" name="EXC_DABORT" description="Exception taken, Data Abort or SError"/> + <!-- 0x86 EXC_IRQ - Exception taken, IRQ --> + <event event="0x86" title="-" name="EXC_IRQ" description="Exception taken, IRQ"/> + <!-- 0x87 EXC_FIQ - Exception taken, FIQ --> + <event event="0x87" title="-" name="EXC_FIQ" description="Exception taken, FIQ"/> + <!-- 0x88 EXC_SMC - Exception taken, Secure Monitor Call --> + <event event="0x88" title="-" name="EXC_SMC" description="Exception taken, Secure Monitor Call"/> + <!-- 0x8A EXC_HVC - Exception taken, Hypervisor Call --> + <event event="0x8A" title="-" name="EXC_HVC" description="Exception taken, Hypervisor Call"/> + <!-- 0x8B EXC_TRAP_PABORT - Exception taken, Instruction Abort not taken locally --> + <event event="0x8B" title="-" name="EXC_TRAP_PABORT" description="Exception taken, Instruction Abort not taken locally"/> + <!-- 0x8C EXC_TRAP_DABORT - Exception taken, Data Abort or SError not taken locally --> + <event event="0x8C" title="-" name="EXC_TRAP_DABORT" description="Exception taken, Data Abort or SError not taken locally"/> + <!-- 0x8D EXC_TRAP_OTHER - Exception taken – Other traps not taken locally --> + <event event="0x8D" title="-" name="EXC_TRAP_OTHER" description="Exception taken – Other traps not taken locally"/> + <!-- 0x8E EXC_TRAP_IRQ - Exception taken, IRQ not taken locally --> + <event event="0x8E" title="-" name="EXC_TRAP_IRQ" description="Exception taken, IRQ not taken locally"/> + <!-- 0x8F EXC_TRAP_FIQ - Exception taken, FIQ not taken locally --> + <event event="0x8F" title="-" name="EXC_TRAP_FIQ" description="Exception taken, FIQ not taken locally"/> + <!-- 0x90 RC_LD_SPEC - Release consistency instruction speculatively executed – Load Acquire --> + <event event="0x90" title="-" name="RC_LD_SPEC" description="Release consistency instruction speculatively executed – Load Acquire"/> + <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed – Store Release --> + <event event="0x91" title="-" name="RC_ST_SPEC" description="Release consistency instruction speculatively executed – Store Release"/> + </category> diff --git a/daemon/events-Cortex-A57.xml b/daemon/events-Cortex-A57.xml new file mode 100644 index 0000000..5db6dc2 --- /dev/null +++ b/daemon/events-Cortex-A57.xml @@ -0,0 +1,171 @@ + <counter_set name="ARM_Cortex-A57_cnt" count="6"/> + <category name="Cortex-A57" counter_set="ARM_Cortex-A57_cnt" per_cpu="yes" supports_event_based_sampling="yes"> + <!-- 0x11 CPU_CYCLES - Cycle --> + <event counter="ARM_Cortex-A57_ccnt" title="Clock" name="Cycles" display="hertz" units="Hz" average_selection="yes" description="The number of core clock cycles"/> + <!-- 0x00 SW_INCR - Instruction architecturally executed number (condition check pass) - Software increment --> + <event event="0x00" title="Software" name="Increment" description="Incremented only on writes to the Software Increment Register"/> + <!-- 0x01 L1I_CACHE_REFILL - Level 1 instruction cache refill --> + <event event="0x01" title="Cache" name="Instruction refill" description="Instruction fetch that causes a refill of at least the level of instruction or unified cache closest to the processor"/> + <!-- 0x02 L1I_TLB_REFILL - Level 1 instruction TLB refill --> + <event event="0x02" title="Cache" name="Inst TLB refill" description="Instruction fetch that causes a TLB refill of at least the level of TLB closest to the processor"/> + <!-- 0x03 L1D_CACHE_REFILL - Level 1 data cache refill --> + <event event="0x03" title="Cache" name="Data refill" description="Memory Read or Write operation that causes a refill of at least the level of data or unified cache closest to the processor"/> + <!-- 0x04 L1D_CACHE - Level 1 data cache access --> + <event event="0x04" title="Cache" name="Data access" description="Memory Read or Write operation that causes a cache access to at least the level of data or unified cache closest to the processor"/> + <!-- 0x05 L1D_TLB_REFILL - Level 1 data TLB refill --> + <event event="0x05" title="Cache" name="Data TLB refill" description="Memory Read or Write operation that causes a TLB refill of at least the level of TLB closest to the processor"/> + <!-- 0x08 INST_RETIRED - Instruction architecturally executed --> + <event event="0x08" title="-" name="INST_RETIRED" description="Instruction architecturally executed"/> + <!-- 0x09 EXC_TAKEN - Exception taken --> + <event event="0x09" title="Exception" name="Taken" description="Exceptions taken"/> + <!-- 0x0A EXC_RETURN - Instruction architecturally executed (condition check pass) - Exception return --> + <event event="0x0a" title="Exception" name="Return" description="Exception return architecturally executed"/> + <!-- 0x0B CID_WRITE_RETIRED - Instruction architecturally executed (condition check pass) - Write to CONTEXTIDR --> + <event event="0x0b" title="Instruction" name="CONTEXTIDR" description="Instruction that writes to the CONTEXTIDR architecturally executed"/> + <!-- 0x10 BR_MIS_PRED - Mispredicted or not predicted branch speculatively executed --> + <event event="0x10" title="Branch" name="Mispredicted" description="Branch mispredicted or not predicted"/> + <!-- 0x12 BR_PRED - Predictable branch speculatively executed --> + <event event="0x12" title="Branch" name="Potential prediction" description="Branch or other change in program flow that could have been predicted by the branch prediction resources of the processor"/> + <!-- 0x13 MEM_ACCESS - Data memory access --> + <event event="0x13" title="-" name="MEM_ACCESS" description="Data memory access"/> + <!-- 0x14 L1I_CACHE - Level 1 instruction cache access --> + <event event="0x14" title="-" name="L1I_CACHE" description="Level 1 instruction cache access"/> + <!-- 0x15 L1D_CACHE_WB - Level 1 data cache Write-Back --> + <event event="0x15" title="-" name="L1D_CACHE_WB" description="Level 1 data cache Write-Back"/> + <!-- 0x16 L2D_CACHE - Level 2 data cache access --> + <event event="0x16" title="-" name="L2D_CACHE" description="Level 2 data cache access"/> + <!-- 0x17 L2D_CACHE_REFILL - Level 2 data cache refill --> + <event event="0x17" title="-" name="L2D_CACHE_REFILL" description="Level 2 data cache refill"/> + <!-- 0x18 L2D_CACHE_WB - Level 2 data cache Write-Back --> + <event event="0x18" title="-" name="L2D_CACHE_WB" description="Level 2 data cache Write-Back"/> + <!-- 0x19 BUS_ACCESS - Bus access --> + <event event="0x19" title="-" name="BUS_ACCESS" description="Bus access"/> + <!-- 0x1A MEMORY_ERROR - Local memory error --> + <event event="0x1A" title="-" name="MEMORY_ERROR" description="Local memory error"/> + <!-- 0x1B INST_SPEC - Operation speculatively executed --> + <event event="0x1B" title="-" name="INST_SPEC" description="Operation speculatively executed"/> + <!-- 0x1C TTBR_WRITE_RETIRED - Instruction architecturally executed (condition check pass) - Write to translation table base --> + <event event="0x1C" title="-" name="TTBR_WRITE_RETIRED" description="Instruction architecturally executed (condition check pass) - Write to translation table base"/> + <!-- 0x1D BUS_CYCLES - Bus cycle --> + <event event="0x1D" title="-" name="BUS_CYCLES" description="Bus cycle"/> + <!-- 0x1E CHAIN - Odd performance counter chain mode --> + <event event="0x1E" title="-" name="CHAIN" description="Odd performance counter chain mode"/> + <!-- 0x40 L1D_CACHE_LD - Level 1 data cache access - Read --> + <event event="0x40" title="-" name="L1D_CACHE_LD" description="Level 1 data cache access - Read"/> + <!-- 0x41 L1D_CACHE_ST - Level 1 data cache access - Write --> + <event event="0x41" title="-" name="L1D_CACHE_ST" description="Level 1 data cache access - Write"/> + <!-- 0x42 L1D_CACHE_REFILL_LD - Level 1 data cache refill - Read --> + <event event="0x42" title="-" name="L1D_CACHE_REFILL_LD" description="Level 1 data cache refill - Read"/> + <!-- 0x43 L1D_CACHE_REFILL_ST - Level 1 data cache refill - Write --> + <event event="0x43" title="-" name="L1D_CACHE_REFILL_ST" description="Level 1 data cache refill - Write"/> + <!-- 0x46 L1D_CACHE_WB_VICTIM - Level 1 data cache Write-back - Victim --> + <event event="0x46" title="-" name="L1D_CACHE_WB_VICTIM" description="Level 1 data cache Write-back - Victim"/> + <!-- 0x47 L1D_CACHE_WB_CLEAN - Level 1 data cache Write-back - Cleaning and coherency --> + <event event="0x47" title="-" name="L1D_CACHE_WB_CLEAN" description="Level 1 data cache Write-back - Cleaning and coherency"/> + <!-- 0x48 L1D_CACHE_INVAL - Level 1 data cache invalidate --> + <event event="0x48" title="-" name="L1D_CACHE_INVAL" description="Level 1 data cache invalidate"/> + <!-- 0x4C L1D_TLB_REFILL_LD - Level 1 data TLB refill - Read --> + <event event="0x4C" title="-" name="L1D_TLB_REFILL_LD" description="Level 1 data TLB refill - Read"/> + <!-- 0x4D L1D_TLB_REFILL_ST - Level 1 data TLB refill - Write --> + <event event="0x4D" title="-" name="L1D_TLB_REFILL_ST" description="Level 1 data TLB refill - Write"/> + <!-- 0x50 L2D_CACHE_LD - Level 2 data cache access - Read --> + <event event="0x50" title="-" name="L2D_CACHE_LD" description="Level 2 data cache access - Read"/> + <!-- 0x51 L2D_CACHE_ST - Level 2 data cache access - Write --> + <event event="0x51" title="-" name="L2D_CACHE_ST" description="Level 2 data cache access - Write"/> + <!-- 0x52 L2D_CACHE_REFILL_LD - Level 2 data cache refill - Read --> + <event event="0x52" title="-" name="L2D_CACHE_REFILL_LD" description="Level 2 data cache refill - Read"/> + <!-- 0x53 L2D_CACHE_REFILL_ST - Level 2 data cache refill - Write --> + <event event="0x53" title="-" name="L2D_CACHE_REFILL_ST" description="Level 2 data cache refill - Write"/> + <!-- 0x56 L2D_CACHE_WB_VICTIM - Level 2 data cache Write-back - Victim --> + <event event="0x56" title="-" name="L2D_CACHE_WB_VICTIM" description="Level 2 data cache Write-back - Victim"/> + <!-- 0x57 L2D_CACHE_WB_CLEAN - Level 2 data cache Write-back - Cleaning and coherency --> + <event event="0x57" title="-" name="L2D_CACHE_WB_CLEAN" description="Level 2 data cache Write-back - Cleaning and coherency"/> + <!-- 0x58 L2D_CACHE_INVAL - Level 2 data cache invalidate --> + <event event="0x58" title="-" name="L2D_CACHE_INVAL" description="Level 2 data cache invalidate"/> + <!-- 0x60 BUS_ACCESS_LD - Bus access - Read --> + <event event="0x60" title="-" name="BUS_ACCESS_LD" description="Bus access - Read"/> + <!-- 0x61 BUS_ACCESS_ST - Bus access - Write --> + <event event="0x61" title="-" name="BUS_ACCESS_ST" description="Bus access - Write"/> + <!-- 0x62 BUS_ACCESS_SHARED - Bus access - Normal --> + <event event="0x62" title="-" name="BUS_ACCESS_SHARED" description="Bus access - Normal"/> + <!-- 0x63 BUS_ACCESS_NOT_SHARED - Bus access - Not normal --> + <event event="0x63" title="-" name="BUS_ACCESS_NOT_SHARED" description="Bus access - Not normal"/> + <!-- 0x64 BUS_ACCESS_NORMAL - Bus access - Normal --> + <event event="0x64" title="-" name="BUS_ACCESS_NORMAL" description="Bus access - Normal"/> + <!-- 0x65 BUS_ACCESS_PERIPH - Bus access - Peripheral --> + <event event="0x65" title="-" name="BUS_ACCESS_PERIPH" description="Bus access - Peripheral"/> + <!-- 0x66 MEM_ACCESS_LD - Data memory access - Read --> + <event event="0x66" title="-" name="MEM_ACCESS_LD" description="Data memory access - Read"/> + <!-- 0x67 MEM_ACCESS_ST - Data memory access - Write --> + <event event="0x67" title="-" name="MEM_ACCESS_ST" description="Data memory access - Write"/> + <!-- 0x68 UNALIGNED_LD_SPEC - Unaligned access - Read --> + <event event="0x68" title="-" name="UNALIGNED_LD_SPEC" description="Unaligned access - Read"/> + <!-- 0x69 UNALIGNED_ST_SPEC - Unaligned access - Write --> + <event event="0x69" title="-" name="UNALIGNED_ST_SPEC" description="Unaligned access - Write"/> + <!-- 0x6A UNALIGNED_LDST_SPEC - Unaligned access --> + <event event="0x6A" title="-" name="UNALIGNED_LDST_SPEC" description="Unaligned access"/> + <!-- 0x6C LDREX_SPEC - Exclusive operation speculatively executed - LDREX --> + <event event="0x6C" title="-" name="LDREX_SPEC" description="Exclusive operation speculatively executed - LDREX"/> + <!-- 0x6D STREX_PASS_SPEC - Exclusive instruction speculatively executed - STREX pass --> + <event event="0x6D" title="-" name="STREX_PASS_SPEC" description="Exclusive instruction speculatively executed - STREX pass"/> + <!-- 0x6E STREX_FAIL_SPEC - Exclusive operation speculatively executed - STREX fail --> + <event event="0x6E" title="-" name="STREX_FAIL_SPEC" description="Exclusive operation speculatively executed - STREX fail"/> + <!-- 0x70 LD_SPEC - Operation speculatively executed - Load --> + <event event="0x70" title="-" name="LD_SPEC" description="Operation speculatively executed - Load"/> + <!-- 0x71 ST_SPEC - Operation speculatively executed - Store --> + <event event="0x71" title="-" name="ST_SPEC" description="Operation speculatively executed - Store"/> + <!-- 0x72 LDST_SPEC - Operation speculatively executed - Load or store --> + <event event="0x72" title="-" name="LDST_SPEC" description="Operation speculatively executed - Load or store"/> + <!-- 0x73 DP_SPEC - Operation speculatively executed - Integer data processing --> + <event event="0x73" title="-" name="DP_SPEC" description="Operation speculatively executed - Integer data processing"/> + <!-- 0x74 ASE_SPEC - Operation speculatively executed - Advanced SIMD --> + <event event="0x74" title="-" name="ASE_SPEC" description="Operation speculatively executed - Advanced SIMD"/> + <!-- 0x75 VFP_SPEC - Operation speculatively executed - VFP --> + <event event="0x75" title="-" name="VFP_SPEC" description="Operation speculatively executed - VFP"/> + <!-- 0x76 PC_WRITE_SPEC - Operation speculatively executed - Software change of the PC --> + <event event="0x76" title="-" name="PC_WRITE_SPEC" description="Operation speculatively executed - Software change of the PC"/> + <!-- 0x77 CRYPTO_SPEC - Operation speculatively executed, crypto data processing --> + <event event="0x77" title="-" name="CRYPTO_SPEC" description="Operation speculatively executed, crypto data processing"/> + <!-- 0x78 BR_IMMED_SPEC - Branch speculatively executed - Immediate branch --> + <event event="0x78" title="-" name="BR_IMMED_SPEC" description="Branch speculatively executed - Immediate branch"/> + <!-- 0x79 BR_RETURN_SPEC - Branch speculatively executed - Procedure return --> + <event event="0x79" title="-" name="BR_RETURN_SPEC" description="Branch speculatively executed - Procedure return"/> + <!-- 0x7A BR_INDIRECT_SPEC - Branch speculatively executed - Indirect branch --> + <event event="0x7A" title="-" name="BR_INDIRECT_SPEC" description="Branch speculatively executed - Indirect branch"/> + <!-- 0x7C ISB_SPEC - Barrier speculatively executed - ISB --> + <event event="0x7C" title="-" name="ISB_SPEC" description="Barrier speculatively executed - ISB"/> + <!-- 0x7D DSB_SPEC - Barrier speculatively executed - DSB --> + <event event="0x7D" title="-" name="DSB_SPEC" description="Barrier speculatively executed - DSB"/> + <!-- 0x7E DMB_SPEC - Barrier speculatively executed - DMB --> + <event event="0x7E" title="-" name="DMB_SPEC" description="Barrier speculatively executed - DMB"/> + <!-- 0x81 EXC_UNDEF - Exception taken, other synchronous --> + <event event="0x81" title="-" name="EXC_UNDEF" description="Exception taken, other synchronous"/> + <!-- 0x82 EXC_SVC - Exception taken, Supervisor Call --> + <event event="0x82" title="-" name="EXC_SVC" description="Exception taken, Supervisor Call"/> + <!-- 0x83 EXC_PABORT - Exception taken, Instruction Abort --> + <event event="0x83" title="-" name="EXC_PABORT" description="Exception taken, Instruction Abort"/> + <!-- 0x84 EXC_DABORT - Exception taken, Data Abort or SError --> + <event event="0x84" title="-" name="EXC_DABORT" description="Exception taken, Data Abort or SError"/> + <!-- 0x86 EXC_IRQ - Exception taken, IRQ --> + <event event="0x86" title="-" name="EXC_IRQ" description="Exception taken, IRQ"/> + <!-- 0x87 EXC_FIQ - Exception taken, FIQ --> + <event event="0x87" title="-" name="EXC_FIQ" description="Exception taken, FIQ"/> + <!-- 0x88 EXC_SMC - Exception taken, Secure Monitor Call --> + <event event="0x88" title="-" name="EXC_SMC" description="Exception taken, Secure Monitor Call"/> + <!-- 0x8A EXC_HVC - Exception taken, Hypervisor Call --> + <event event="0x8A" title="-" name="EXC_HVC" description="Exception taken, Hypervisor Call"/> + <!-- 0x8B EXC_TRAP_PABORT - Exception taken, Instruction Abort not taken locally --> + <event event="0x8B" title="-" name="EXC_TRAP_PABORT" description="Exception taken, Instruction Abort not taken locally"/> + <!-- 0x8C EXC_TRAP_DABORT - Exception taken, Data Abort or SError not taken locally --> + <event event="0x8C" title="-" name="EXC_TRAP_DABORT" description="Exception taken, Data Abort or SError not taken locally"/> + <!-- 0x8D EXC_TRAP_OTHER - Exception taken – Other traps not taken locally --> + <event event="0x8D" title="-" name="EXC_TRAP_OTHER" description="Exception taken – Other traps not taken locally"/> + <!-- 0x8E EXC_TRAP_IRQ - Exception taken, IRQ not taken locally --> + <event event="0x8E" title="-" name="EXC_TRAP_IRQ" description="Exception taken, IRQ not taken locally"/> + <!-- 0x8F EXC_TRAP_FIQ - Exception taken, FIQ not taken locally --> + <event event="0x8F" title="-" name="EXC_TRAP_FIQ" description="Exception taken, FIQ not taken locally"/> + <!-- 0x90 RC_LD_SPEC - Release consistency instruction speculatively executed – Load Acquire --> + <event event="0x90" title="-" name="RC_LD_SPEC" description="Release consistency instruction speculatively executed – Load Acquire"/> + <!-- 0x91 RC_ST_SPEC - Release consistency instruction speculatively executed – Store Release --> + <event event="0x91" title="-" name="RC_ST_SPEC" description="Release consistency instruction speculatively executed – Store Release"/> + </category> diff --git a/daemon/events-Cortex-A7.xml b/daemon/events-Cortex-A7.xml index 2bd4797..50bba7f 100644 --- a/daemon/events-Cortex-A7.xml +++ b/daemon/events-Cortex-A7.xml @@ -41,4 +41,4 @@ <event event="0xC8" title="ETM" name="ETM Ext Out[1]" description=""/> <event event="0xC9" title="Instruction" name="Pipeline stall" description="Data Write operation that stalls the pipeline because the store buffer is full"/> <event event="0xCA" title="Memory" name="Snoop" description="Data snooped from other processor. This event counts memory-read operations that read data from another processor within the local cluster, rather than accessing the L2 cache or issuing an external read."/> - </category> + </category> diff --git a/daemon/events-Cortex-A9.xml b/daemon/events-Cortex-A9.xml index 7597f78..89d6a19 100644 --- a/daemon/events-Cortex-A9.xml +++ b/daemon/events-Cortex-A9.xml @@ -31,9 +31,9 @@ <event event="0x66" title="Pipeline" name="Issue stage no dispatch" description="Counts the number of cycles where the issue stage does not dispatch any instruction because it is empty or cannot dispatch any instructions"/> <event event="0x67" title="Pipeline" name="Issue stage empty" description="Counts the number of cycles where the issue stage is empty"/> <event event="0x68" title="Instruction" name="Executed" description="Counts the number of instructions going through the Register Renaming stage. This number is an approximate number of the total number of instructions speculatively executed, and even more approximate of the total number of instructions architecturally executed"/> - <event event="0x69" title="Cache" name="Data linefills" description="Counts the number of linefills performed on the external AXI bus"/> - <event event="0x6A" title="Cache" name="Prefetch linefills" description="Counts the number of data linefills caused by prefetcher requests"/> - <event event="0x6B" title="Cache" name="Prefetch hits" description="Counts the number of cache hits in a line that belongs to a stream followed by the prefetcher"/> + <event event="0x69" title="Cache" name="Data linefills" description="Counts the number of linefills performed on the external AXI bus"/> + <event event="0x6A" title="Cache" name="Prefetch linefills" description="Counts the number of data linefills caused by prefetcher requests"/> + <event event="0x6B" title="Cache" name="Prefetch hits" description="Counts the number of cache hits in a line that belongs to a stream followed by the prefetcher"/> <event event="0x6E" title="Core" name="Functions" description="Counts the number of procedure returns whose condition codes do not fail, excluding all returns from exception"/> <event event="0x70" title="Instruction" name="Main execution unit" description="Counts the number of instructions being executed in the main execution pipeline of the processor, the multiply pipeline and arithmetic logic unit pipeline"/> <event event="0x71" title="Instruction" name="Second execution unit" description="Counts the number of instructions being executed in the processor second execution pipeline (ALU)"/> @@ -49,9 +49,9 @@ <event event="0x86" title="Stalls" name="DMB" description="Counts the number of stall cycles because of the execution of a DMB memory barrier"/> <event event="0x8A" title="Clock" name="Integer core" description="Counts the number of cycles during which the integer core clock is enabled"/> <event event="0x8B" title="Clock" name="Data engine" description="Counts the number of cycles during which the Data Engine clock is enabled"/> - <event event="0x8C" title="Clock" name="NEON" description="Counts the number of cycles when the NEON SIMD clock is enabled"/> - <event event="0x8D" title="Memory" name="TLB inst allocations" description="Counts the number of TLB allocations because of Instruction requests"/> - <event event="0x8E" title="Memory" name="TLB data allocations" description="Counts the number of TLB allocations because of Data requests"/> + <event event="0x8C" title="Clock" name="NEON" description="Counts the number of cycles when the NEON SIMD clock is enabled"/> + <event event="0x8D" title="Memory" name="TLB inst allocations" description="Counts the number of TLB allocations because of Instruction requests"/> + <event event="0x8E" title="Memory" name="TLB data allocations" description="Counts the number of TLB allocations because of Data requests"/> <event event="0x90" title="Instruction" name="ISB" description="Counts the number of ISB instructions architecturally executed"/> <event event="0x91" title="Instruction" name="DSB" description="Counts the number of DSB instructions architecturally executed"/> <event event="0x92" title="Instruction" name="DMB" description="Counts the number of DMB instructions speculatively executed"/> diff --git a/daemon/events-Linux.xml b/daemon/events-Linux.xml index b45a122..42baf14 100644 --- a/daemon/events-Linux.xml +++ b/daemon/events-Linux.xml @@ -8,8 +8,8 @@ <event counter="Linux_sched_switch" title="Scheduler" name="Switch" per_cpu="yes" description="Context switch events"/> <event counter="Linux_meminfo_memused" title="Memory" name="Used" display="maximum" units="B" average_selection="yes" description="Total used memory size"/> <event counter="Linux_meminfo_memfree" title="Memory" name="Free" display="minimum" units="B" average_selection="yes" description="Available memory size"/> - <event counter="Linux_meminfo_bufferram" title="Memory" name="Buffer" display="maximum" units="B" average_selection="yes" description="Memory used by buffers"/> + <event counter="Linux_meminfo_bufferram" title="Memory" name="Buffer" display="maximum" units="B" average_selection="yes" description="Memory used by OS disk buffers"/> <event counter="Linux_power_cpu_freq" title="Clock" name="Frequency" per_cpu="yes" display="maximum" units="Hz" average_selection="yes" description="Frequency setting of the CPU"/> <event counter="Linux_power_cpu_idle" title="Power" name="Idle" per_cpu="yes" display="maximum" average_selection="yes" description="CPU Idle State + 1, set the Sample Rate to None to prevent the hrtimer from interrupting the system"/> </category> - + diff --git a/daemon/events-Mali-400.xml b/daemon/events-Mali-400.xml index 6830d46..cb0b9d5 100644 --- a/daemon/events-Mali-400.xml +++ b/daemon/events-Mali-400.xml @@ -30,7 +30,7 @@ <event event="0x1b" title="Mali GPU Vertex Processor" name="Active cycles, PLBU primitive assembly" description="Number of active cycles per frame spent by the MaliGP2 PLBU doing primitive assembly. This does not include scissoring or final output. This includes time spent waiting on the bus."/> <event event="0x1c" title="Mali GPU Vertex Processor" name="Active cycles, PLBU vertex fetcher" description="Number of active cycles per frame spent by the MaliGP2 PLBU fetching vertex data. This includes time spent waiting on the bus."/> <event event="0x1e" title="Mali GPU Vertex Processor" name="Active cycles, Bounding-box and command generator" description="Number of active cycles per frame spent by the MaliGP2 PLBU setting up bounding boxes and commands (mainly graphics primitives). This includes time spent waiting on the bus."/> - <event event="0x20" title="Mali GPU Vertex Processor" name="Active cycles, Scissor tile iterator" description="Number of active cycles per frame spent by the MaliGP2 PLBU iterating over tiles to perform scissoringi. This includes time spent waiting on the bus."/> + <event event="0x20" title="Mali GPU Vertex Processor" name="Active cycles, Scissor tile iterator" description="Number of active cycles per frame spent by the MaliGP2 PLBU iterating over tiles to perform scissoring. This includes time spent waiting on the bus."/> <event event="0x21" title="Mali GPU Vertex Processor" name="Active cycles, PLBU tile iterator" description="Number of active cycles per frame spent by the MaliGP2 PLBU iterating over the tiles in the bounding box generating commands (mainly graphics primitives). This includes time spent waiting on the bus."/> </category> <category name="Mali-400-FP0" counter_set="ARM_Mali-400_FP0_cnt" per_cpu="no"> @@ -344,10 +344,10 @@ </category> <category name="Mali-400-SW" counter_set="ARM_Mali-400_SW_cnt" per_cpu="no"> <!-- EGL Counters --> - <event counter="ARM_Mali-400_SW_17" title="Mali EGL Software Counters" name="Blit Time" description="Time spent blitting the the framebuffer from video memory to framebuffer."/> + <event counter="ARM_Mali-400_SW_17" title="Mali EGL Software Counters" name="Blit Time" description="Time spent blitting the framebuffer from video memory to framebuffer."/> <!-- glDrawElements Counters --> <event counter="ARM_Mali-400_SW_18" title="glDrawElements Statistics" name="Calls to glDrawElements" description="Number of calls to glDrawElements."/> - <event counter="ARM_Mali-400_SW_19" title="glDrawElements Statistics" name="Indices to glDrawElements" description="Number of indicies to glDrawElements."/> + <event counter="ARM_Mali-400_SW_19" title="glDrawElements Statistics" name="Indices to glDrawElements" description="Number of indices to glDrawElements."/> <event counter="ARM_Mali-400_SW_20" title="glDrawElements Statistics" name="Transformed by glDrawElements" description="Number of vertices transformed by glDrawElements."/> <!-- glDrawArrays Counters --> <event counter="ARM_Mali-400_SW_21" title="glDrawArrays Statistics" name="Calls to glDrawArrays" description="Number of calls to glDrawArrays."/> @@ -365,7 +365,7 @@ <!-- Buffer Profiling Counters --> <event counter="ARM_Mali-400_SW_32" title="Buffer Profiling" name="Texture Upload Time (ms)" description="Time spent uploading textures."/> <event counter="ARM_Mali-400_SW_33" title="Buffer Profiling" name="VBO Upload Time (ms)" description="Time spent uploading vertex buffer objects."/> - <event counter="ARM_Mali-400_SW_34" title="Buffer Profiling" name="FBO Flushes" description="Number of flushed on framebuffer attachement."/> + <event counter="ARM_Mali-400_SW_34" title="Buffer Profiling" name="FBO Flushes" description="Number of flushed on framebuffer attachment."/> <!-- OpenGL ES 1.1 Emulation --> <event counter="ARM_Mali-400_SW_35" title="Fixed-function Emulation" name="# Vertex Shaders Generated" description="Number of vertex shaders generated."/> <event counter="ARM_Mali-400_SW_36" title="Fixed-function Emulation" name="# Fragment Shaders Generated" description="Number of fragment shaders generated."/> diff --git a/daemon/events-Mali-T6xx.xml b/daemon/events-Mali-T6xx.xml index 5237e30..3d795de 100644 --- a/daemon/events-Mali-T6xx.xml +++ b/daemon/events-Mali-T6xx.xml @@ -1,8 +1,8 @@ - + <category name="Mali-T6xx-SW-counters" per_cpu="no"> <event counter="ARM_Mali-T6xx_TOTAL_ALLOC_PAGES" title="Mali Total Alloc Pages" name="Total number of allocated pages" description="Mali total number of allocated pages."/> </category> - + <category name="Mali-T6xx-PMShader" per_cpu="no"> <event counter="ARM_Mali-T6xx_PM_SHADER_0" display="average" average_selection="yes" units="%" title="Mali PM Shader" name="PM Shader Core 0" description="Mali PM Shader: PM Shader Core 0."/> <event counter="ARM_Mali-T6xx_PM_SHADER_1" display="average" average_selection="yes" units="%" title="Mali PM Shader" name="PM Shader Core 1" description="Mali PM Shader: PM Shader Core 1."/> @@ -13,23 +13,23 @@ <event counter="ARM_Mali-T6xx_PM_SHADER_6" display="average" average_selection="yes" units="%" title="Mali PM Shader" name="PM Shader Core 6" description="Mali PM Shader: PM Shader Core 6."/> <event counter="ARM_Mali-T6xx_PM_SHADER_7" display="average" average_selection="yes" units="%" title="Mali PM Shader" name="PM Shader Core 7" description="Mali PM Shader: PM Shader Core 7."/> </category> - + <category name="Mali-T6xx-PMTiler" per_cpu="no"> <event counter="ARM_Mali-T6xx_PM_TILER_0" display="average" average_selection="yes" units="%" title="Mali PM Tiler" name="PM Tiler Core 0" description="Mali PM Tiler: PM Tiler Core 0."/> </category> - + <category name="Mali-T6xx-PML2" per_cpu="no"> <event counter="ARM_Mali-T6xx_PM_L2_0" display="average" average_selection="yes" units="%" title="Mali PM L2" name="PM L2 Core 0" description="Mali PM L2: PM L2 Core 0."/> <event counter="ARM_Mali-T6xx_PM_L2_1" display="average" average_selection="yes" units="%" title="Mali PM L2" name="PM L2 Core 1" description="Mali PM L2: PM L2 Core 1."/> </category> - + <category name="Mali-T6xx-MMU_AS" per_cpu="no"> <event counter="ARM_Mali-T6xx_MMU_AS_0" display="average" average_selection="yes" units="%" title="Mali MMU Address Space" name="MMU Address Space 0" description="Mali MMU Address Space 0 usage."/> <event counter="ARM_Mali-T6xx_MMU_AS_1" display="average" average_selection="yes" units="%" title="Mali MMU Address Space" name="MMU Address Space 1" description="Mali MMU Address Space 1 usage."/> <event counter="ARM_Mali-T6xx_MMU_AS_2" display="average" average_selection="yes" units="%" title="Mali MMU Address Space" name="MMU Address Space 2" description="Mali MMU Address Space 2 usage."/> <event counter="ARM_Mali-T6xx_MMU_AS_3" display="average" average_selection="yes" units="%" title="Mali MMU Address Space" name="MMU Address Space 3" description="Mali MMU Address Space 3 usage."/> </category> - + <category name="Mali-T6xx-MMU_page_fault" per_cpu="no"> <event counter="ARM_Mali-T6xx_MMU_PAGE_FAULT_0" title="Mali MMU Page Fault Add. Space" name="Mali MMU Page Fault Add. Space 0" description="Reports the number of newly allocated pages after a MMU page fault in address space 0."/> <event counter="ARM_Mali-T6xx_MMU_PAGE_FAULT_1" title="Mali MMU Page Fault Add. Space" name="Mali MMU Page Fault Add. Space 1" description="Reports the number of newly allocated pages after a MMU page fault in address space 1."/> diff --git a/daemon/events-Mali-T6xx_hw.xml b/daemon/events-Mali-T6xx_hw.xml index 77f7aec..825b668 100644 --- a/daemon/events-Mali-T6xx_hw.xml +++ b/daemon/events-Mali-T6xx_hw.xml @@ -1,5 +1,5 @@ - <category name="Mali-T6xx-JobManager" per_cpu="no"> + <category name="Mali-T6xx-JobManager" per_cpu="no"> <event counter="ARM_Mali-T6xx_MESSAGES_SENT" title="Mali GPU Job Manager" name="Job Manager messages sent" description="Number of JCB messages sent by the Job Manager."/> <event counter="ARM_Mali-T6xx_MESSAGES_RECEIVED" title="Mali GPU Job Manager" name="Job Manager messages received " description="Number of JCB messages received by the Job Manager."/> <event counter="ARM_Mali-T6xx_GPU_ACTIVE" title="Mali GPU Job Manager" name="GPU active cycles" description="Number of cycles the GPU was active."/> @@ -63,7 +63,7 @@ --> </category> - <category name="Mali-T6xx-Tiler" per_cpu="no"> + <category name="Mali-T6xx-Tiler" per_cpu="no"> <!-- <event counter="ARM_Mali-T6xx_JOBS_PROCESSED" title="Mali GPU Tiler" name="Jobs processed" description="Number of jobs processed."/> --> @@ -119,7 +119,7 @@ <event counter="ARM_Mali-T6xx_WRBUF_STALL" title="Mali GPU Tiler" name="Write-buffer stalls" description="Number of write-buffer stalls."/> <event counter="ARM_Mali-T6xx_ACTIVE" title="Mali GPU Tiler" name="Tiler active cycles" description="Number of cycles the tiler is active."/> - <event counter="ARM_Mali-T6xx_LOADING_DESC" title="Mali GPU Tiler" name="Cycles loading descriptors" description="Number of cycle spent loading descriptors while the tiler frontend is otherwise idle."/> + <event counter="ARM_Mali-T6xx_LOADING_DESC" title="Mali GPU Tiler" name="Cycles loading descriptors" description="Number of cycle spent loading descriptors while the tiler frontend is otherwise idle."/> <event counter="ARM_Mali-T6xx_INDEX_WAIT" title="Mali GPU Tiler" name="Cycles index fetch miss" description="Number of cycles the vertex cache could accept an index, but due to a miss, the index fetcher could not provide one."/> <event counter="ARM_Mali-T6xx_INDEX_RANGE_WAIT" title="Mali GPU Tiler" name="Cycles index out of range" description="Number of cycles the index fetcher provides an index, but the index is outside the range of currently shaded vertices. Only relevant for fused jobs."/> @@ -132,7 +132,7 @@ <event counter="ARM_Mali-T6xx_UTLB_STALL" title="Mali GPU Tiler" name="uTLB cycles stall" description="uTLB: Cycles with stall on input AXI address channel."/> - <event counter="ARM_Mali-T6xx_UTLB_REPLAY_MISS" title="Mali GPU Tiler" name="uTLB replay buffer cache misses" description="uTLB: Number of cache misses on accesses from replay buffer."/> + <event counter="ARM_Mali-T6xx_UTLB_REPLAY_MISS" title="Mali GPU Tiler" name="uTLB replay buffer cache misses" description="uTLB: Number of cache misses on accesses from replay buffer."/> <event counter="ARM_Mali-T6xx_UTLB_REPLAY_FULL" title="Mali GPU Tiler" name="uTLB cycle reply buffer full" description="uTLB: Number of cycles replay buffer is full."/> <event counter="ARM_Mali-T6xx_UTLB_NEW_MISS" title="Mali GPU Tiler" name="uTLB cache misses on new request" description="uTLB: Number of cache misses on new requests."/> <event counter="ARM_Mali-T6xx_UTLB_HIT" title="Mali GPU Tiler" name="uTLB cache hits" description="uTLB: Number of cache hits."/> diff --git a/daemon/events-ScorpionMP.xml b/daemon/events-ScorpionMP.xml index 42acc64..309f103 100644 --- a/daemon/events-ScorpionMP.xml +++ b/daemon/events-ScorpionMP.xml @@ -87,4 +87,4 @@ <event event="0x8d" title="Scorpion" name="EXCEPTIONS_DENORM" description="Scorpion denorm exceptions"/> <event event="0x8e" title="ScorpionMP" name="NUM_BARRIERS" description="Barriers"/> <event event="0x8f" title="ScorpionMP" name="BARRIER_CYCLES" description="Barrier cycles"/> - </category> + </category> diff --git a/daemon/main.cpp b/daemon/main.cpp index 5bc75ef..894bad7 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -19,6 +19,8 @@ #include <sys/mount.h> #include <fcntl.h> #include <sys/mman.h> +#include <sys/time.h> +#include <sys/resource.h> #include "Child.h" #include "SessionData.h" #include "OlySocket.h" @@ -28,7 +30,6 @@ #define DEBUG false extern Child* child; -extern void handleException(); int shutdownFilesystem(); static pthread_mutex_t numSessions_mutex; static int numSessions = 0; @@ -297,7 +298,10 @@ struct cmdline_t parseCommandLine(int argc, char** argv) { // Gator data flow: collector -> collector fifo -> sender int main(int argc, char** argv, char* envp[]) { + // Ensure proper signal handling by making gatord the process group leader + // e.g. it may not be the group leader when launched as 'sudo gatord' setsid(); + gSessionData = new SessionData(); // Global data class logg = new Logging(DEBUG); // Set up global thread-safe logging util = new OlyUtility(); // Set up global utility class @@ -314,9 +318,6 @@ int main(int argc, char** argv, char* envp[]) { logg->logMessage("setpriority() failed"); } - // Initialize session data - gSessionData->initialize(); - // Parse the command line parameters struct cmdline_t cmdline = parseCommandLine(argc, argv); |