*
*/
+// EXTERNAL INCLDUES
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/devel-api/common/mutex.h>
+
// INTERNAL INCLUDES
#include <base/performance-logging/frame-time-stats.h>
-#include <dali/public-api/common/dali-vector.h>
+#include <base/performance-logging/networking/network-performance-server.h>
#include <base/interfaces/adaptor-internal-services.h>
#include <base/performance-logging/performance-marker.h>
-
-// EXTERNAL INCLUDES
-#include <boost/thread/mutex.hpp>
+#include <base/performance-logging/statistics/stat-context-manager.h>
namespace Dali
{
{
class EnvironmentOptions;
-
+class StatContext;
/**
* Concrete implementation of performance interface.
* Adaptor classes should never include this file, they
* just need to include the abstract class performance-interface.h
*/
-class PerformanceServer : public PerformanceInterface
+class PerformanceServer : public PerformanceInterface, public StatContextLogInterface
{
public:
/**
- * Constructor
- * @param adaptorServices adaptor internal services
- * @param environmentOptions environment options
+ * @brief Constructor
+ * @param[in] adaptorServices adaptor internal services
+ * @param[in] environmentOptions environment options
*/
PerformanceServer( AdaptorInternalServices& adaptorServices,
const EnvironmentOptions& environmentOptions );
virtual void RemoveContext( ContextId contextId );
/**
- * @copydoc PerformanceInterface::AddMarker()
+ * @copydoc PerformanceInterface::AddMarker( MarkerType markerType )
*/
virtual void AddMarker( MarkerType markerType );
/**
- * @copydoc PerformanceLogger::AddMarker()
+ * @copydoc PerformanceLogger::AddMarker( MarkerType markerType, ContextId contextId )
*/
virtual void AddMarker( MarkerType markerType, ContextId contextId );
/**
* @copydoc PerformanceInterface::SetLogging()
*/
- virtual void SetLogging( unsigned int level, unsigned int logFrequency );
+ virtual void SetLogging( unsigned int statisticsLogOptions,
+ unsigned int timeStampOutput,
+ unsigned int logFrequency );
/**
* @copydoc PerformanceLogger::SetLoggingFrequency()
*/
virtual void EnableLogging( bool enable, ContextId contextId );
-private:
-
- /**
- * Class to hold a stat context
- */
- class StatContext
- {
- public:
-
- /**
- * Default constructor
- */
- StatContext();
-
- /**
- * Constructor
- *
- * @param[in] id The ID to give the context
- * @param[in] contextName Name of the context to print in console
- */
- StatContext( unsigned int id, const char* contextName );
-
- /**
- * Return the ID
- *
- * @return Return the ID
- */
- unsigned int GetId() const;
-
- /**
- * Return the context name
- *
- * @return Return the context name
- */
- const char* GetName() const;
-
- /**
- * Log the given marker
- *
- * @param[in] marker The marker to log
- */
- void LogMarker( const PerformanceMarker& marker );
-
- /**
- * Set the frequency for logging
- *
- * @param[in] frequencyMicroseconds The frequency to set
- */
- void SetLogFrequency( unsigned int frequencyMicroseconds );
-
- /**
- * Enable/disable logging
- *
- * @param[in] enableLogging Flag to spePerformancecify enabling/disabling
- */
- void EnableLogging( bool enableLogging );
-
- private:
-
- /**
- * Helper to print to console
- */
- void LogMarker();
-
- /**
- * Accumulate timer from markers
- */
- void TimeMarkers();
-
- private:
-
- typedef Dali::Vector< PerformanceMarker > MarkerVector;
-
- FrameTimeStats mStats; ///< Frame time stats to accumulate
- MarkerVector mMarkers; ///< vector of markers
- boost::mutex mDataMutex; ///< mutex
-
- const char* mName; ///< Name of the context
-
- unsigned int mId; ///< The ID of the context
-
- unsigned int mLogFrequencyMicroseconds; ///< if logging is enabled, what frequency to log out at in micro-seconds
- bool mLog; ///< Whether to print the log for this context or not
- };
+public: //StatLogInterface
/**
- * Helper
+ * @copydoc StatLogInterface::LogContextStatistics()
*/
- void AddMarkerToLog( const PerformanceMarker& marker, ContextId contextId );
+ virtual void LogContextStatistics( const char* const text );
- /**
- * Retrieve a stat context by ID
- *
- * @param[in] contextId The ID of the context to retrieve
- * @return Return the stat context if it exists or null
- */
- StatContext* GetContext( ContextId contextId );
+private:
/**
- * Return a string representation of the marker type
- *
- * @param[in] type The marker type
- * @return Return the name of the given marker
+ * @brief log the marker out to kernel/ DALi log
+ * @param[in] marker performance marker
+ * @param[in] description marker description
*/
- const char* GetMarkerName( MarkerType type ) const;
+ void LogMarker( const PerformanceMarker& marker, const char* const description );
private:
- typedef Dali::Vector< StatContext* > StatContexts;
-
- // The list of stat contexts
- StatContexts mStatContexts;
-
Integration::PlatformAbstraction& mPlatformAbstraction; ///< platform abstraction
const EnvironmentOptions& mEnvironmentOptions; ///< environment options
- KernelTraceInterface& mKernelTrace; ///< kernel trace interface
-
- unsigned int mLogLevel; ///< log level
- unsigned int mNextContextId; ///< The next valid context ID
-
- // Some defaults
- ContextId mUpdateStats; ///< update time statistics
- ContextId mRenderStats; ///< render time statistics
- ContextId mEventStats; ///< event time statistics
-
- bool mLoggingEnabled:1; ///< whether logging update / render to a log is enabled
- bool mLogFunctionInstalled:1; ///< whether the log function is installed
+ TraceInterface& mKernelTrace; ///< kernel trace interface
+ TraceInterface& mSystemTrace; ///< system trace interface
+ Dali::Mutex mLogMutex; ///< mutex
+ NetworkPerformanceServer mNetworkServer; ///< network server
+ StatContextManager mStatContextManager; ///< Stat context manager
+ unsigned int mStatisticsLogBitmask; ///< statistics log level
+ unsigned int mPerformanceOutputBitmask; ///< performance marker output
+ bool mNetworkControlEnabled:1; ///< Whether network control is enabled
+ bool mLoggingEnabled:1; ///< whether logging update / render to a log is enabled
+ bool mLogFunctionInstalled:1; ///< whether the log function is installed
};
projects / platform / core / uifw / dali-adaptor.git / blobdiff