ofxAddons/ofxProfiler
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uncrustify

Browse source
This commit is contained in:
jrkb 2023-09-24 21:08:54 +02:00
parent 0b8fb261fa
commit fa1d70e6a5
4 changed files with 189 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
example-slowFastRendering/config.make
View file

@ -88,6 +88,7 @@
# Note: Leave a leading space when adding list items with the += operator # Note: Leave a leading space when adding list items with the += operator
################################################################################ ################################################################################
# PROJECT_DEFINES = # PROJECT_DEFINES =
PROJECT_DEFINES = OFX_PROFILER=1
################################################################################ ################################################################################
# PROJECT CFLAGS # PROJECT CFLAGS

97
example-slowFastRendering/src/ofApp.cpp
View file

@ -1,12 +1,13 @@
#include "ofApp.h" #include "ofApp.h"
#include "ofAppRunner.h"
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::setup() { void ofApp::setup(){
OFX_PROFILER_BEGIN_SESSION("test","result.json"); OFX_PROFILER_BEGIN_SESSION("test", "result.json");
OFX_PROFILER_FUNCTION(); OFX_PROFILER_FUNCTION();
ofBackgroundHex(0x57554c); ofBackgroundHex(0x57554c);
ofSetFrameRate(60); //ofSetFrameRate(60);
ofSetVerticalSync(true); ofSetVerticalSync(true);
@ -18,60 +19,67 @@ void ofApp::setup() {
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::update() { void ofApp::update(){
OFX_PROFILER_FUNCTION(); OFX_PROFILER_FUNCTION();
// add points all the time // add points all the time
if(points.size() < 500000) { if(points.size() < 500000 || ofGetFrameRate() > 30){
for (int i=0; i<30; i++) { for(int i = 0; i < 300; i++){
addPoint(ofGetWidth()/2, ofGetHeight()/2); addPoint(ofGetWidth() / 2, ofGetHeight() / 2);
} }
} }
// move all the points around // move all the points around
for (unsigned int i=0; i<points.size(); i++) { for(unsigned int i = 0; i < points.size(); i++){
speeds[i].y += 0.04; // some grav speeds[i].y += 0.04; // some grav
points[i] += speeds[i]; points[i] += speeds[i];
speeds[i] *= 0.98; speeds[i] *= 0.98;
// move from the mouse // move from the mouse
glm::vec2 mouseVec = glm::vec2(ofGetMouseX(), ofGetMouseY()) - points[i]; glm::vec2 mouseVec = glm::vec2(ofGetMouseX(), ofGetMouseY()) - points[i];
if(glm::length(mouseVec) < 100) { if(glm::length(mouseVec) < 100){
mouseVec = glm::normalize(mouseVec); mouseVec = glm::normalize(mouseVec);
speeds[i] -= mouseVec; speeds[i] -= mouseVec;
} }
// wrap the screenhttps://profiler.firefox.com/from-file/calltree/?v=4 // wrap the screenhttps://profiler.firefox.com/from-file/calltree/?v=4
if(points[i].x > ofGetWidth()) points[i].x = 1; if(points[i].x > ofGetWidth()){
if(points[i].x < 0) points[i].x = ofGetWidth()-1; points[i].x = 1;
if(points[i].y > ofGetHeight()) points[i].y = 1; }
if(points[i].y < 0) points[i].y = ofGetHeight()-1; if(points[i].x < 0){
points[i].x = ofGetWidth() - 1;
}
if(points[i].y > ofGetHeight()){
points[i].y = 1;
}
if(points[i].y < 0){
points[i].y = ofGetHeight() - 1;
}
} }
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::draw() { void ofApp::draw(){
OFX_PROFILER_FUNCTION(); OFX_PROFILER_FUNCTION();
// draw the points the slow way // draw the points the slow way
if(mode == 1) { if(mode == 1){
OFX_PROFILER_SCOPE("mode 1"); OFX_PROFILER_SCOPE("mode 1");
#ifdef TARGET_OPENGLES #ifdef TARGET_OPENGLES
ofSetColor(255); ofSetColor(255);
ofDrawBitmapString("OpenGL immediate mode not available in OpenGL ES. Press 2 or 3.",ofGetWidth() / 2.0f - 300,ofGetHeight() / 2.0f); ofDrawBitmapString("OpenGL immediate mode not available in OpenGL ES. Press 2 or 3.", ofGetWidth() / 2.0f - 300, ofGetHeight() / 2.0f);
#else #else
ofSetColor(255); ofSetColor(255);
glBegin(GL_POINTS); glBegin(GL_POINTS);
for (unsigned int i=0; i<points.size(); i++) { for(unsigned int i = 0; i < points.size(); i++){
glVertex2f(points[i].x, points[i].y); glVertex2f(points[i].x, points[i].y);
} }
glEnd(); glEnd();
#endif #endif
} }
// a bit faster // a bit faster
else if(mode == 2) { else if(mode == 2){
OFX_PROFILER_SCOPE("mode 2"); OFX_PROFILER_SCOPE("mode 2");
ofSetColor(255); ofSetColor(255);
@ -80,9 +88,8 @@ void ofApp::draw() {
glDrawArrays(GL_POINTS, 0, (int)points.size()); glDrawArrays(GL_POINTS, 0, (int)points.size());
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
} }
// super fast (vbo) // super fast (vbo)
else if(mode == 3) { else if(mode == 3){
OFX_PROFILER_SCOPE("mode 3"); OFX_PROFILER_SCOPE("mode 3");
ofSetColor(255); ofSetColor(255);
vbo.setVertexData(&points[0], (int)points.size(), GL_DYNAMIC_DRAW); vbo.setVertexData(&points[0], (int)points.size(), GL_DYNAMIC_DRAW);
@ -94,34 +101,40 @@ void ofApp::draw() {
ofSetColor(0); ofSetColor(0);
ofDrawRectangle(0, 0, 250, 90); ofDrawRectangle(0, 0, 250, 90);
ofSetColor(255); ofSetColor(255);
ofDrawBitmapString("Mode "+ofToString(mode), 20, 20); ofDrawBitmapString("Mode " + ofToString(mode), 20, 20);
ofDrawBitmapString("FPS "+ofToString(ofGetFrameRate(), 0), 20, 40); ofDrawBitmapString("FPS " + ofToString(ofGetFrameRate(), 0), 20, 40);
ofDrawBitmapString("Total Points "+ofToString((int)points.size()), 20, 60); ofDrawBitmapString("Total Points " + ofToString((int)points.size()), 20, 60);
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::exit() { void ofApp::exit(){
OFX_PROFILER_END_SESSION(); OFX_PROFILER_END_SESSION();
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::keyPressed(int key) { void ofApp::keyPressed(int key){
if(key == '1') mode = 1; if(key == '1'){
if(key == '2') mode = 2; mode = 1;
if(key == '3') mode = 3; }
if(key == '2'){
mode = 2;
}
if(key == '3'){
mode = 3;
}
// clear all the points // clear all the points
if(key == 'c') { if(key == 'c'){
points.clear(); points.clear();
speeds.clear(); speeds.clear();
} }
// add crazy amount // add crazy amount
if(key == 'z') { if(key == 'z'){
for (int i=0; i<400000; i++) { for(int i = 0; i < 400000; i++){
addPoint(ofRandomWidth(), ofRandomHeight()); addPoint(ofRandomWidth(), ofRandomHeight());
} }
} }
@ -134,14 +147,14 @@ void ofApp::keyReleased(int key){
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::mouseMoved(int x, int y ){ void ofApp::mouseMoved(int x, int y){
} }
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::mouseDragged(int x, int y, int button){ void ofApp::mouseDragged(int x, int y, int button){
// add a bunch as you drag // add a bunch as you drag
for (int i=0; i<400; i++) { for(int i = 0; i < 400; i++){
addPoint(x, y); addPoint(x, y);
} }
} }

58
example-slowFastRendering/src/ofApp.h
View file

@ -1,44 +1,42 @@
#pragma once #pragma once
#define OFX_PROFILER 1
#include "ofMain.h" #include "ofMain.h"
#include "ofxProfiler.h" #include "ofxProfiler.h"
class ofApp : public ofBaseApp{ class ofApp : public ofBaseApp {
public: public:
void setup(); void setup();
void update(); void update();
void draw(); void draw();
void exit(); void exit();
void keyPressed (int key); void keyPressed(int key);
void keyReleased(int key); void keyReleased(int key);
void mouseMoved(int x, int y ); void mouseMoved(int x, int y);
void mouseDragged(int x, int y, int button); void mouseDragged(int x, int y, int button);
void mousePressed(int x, int y, int button); void mousePressed(int x, int y, int button);
void mouseReleased(int x, int y, int button); void mouseReleased(int x, int y, int button);
void mouseEntered(int x, int y); void mouseEntered(int x, int y);
void mouseExited(int x, int y); void mouseExited(int x, int y);
void windowResized(int w, int h); void windowResized(int w, int h);
void dragEvent(ofDragInfo dragInfo); void dragEvent(ofDragInfo dragInfo);
void gotMessage(ofMessage msg); void gotMessage(ofMessage msg);
void addPoint(float x, float y) { void addPoint(float x, float y){
points.push_back(glm::vec2(x, y)); points.push_back(glm::vec2(x, y));
speeds.push_back(glm::vec2(ofRandom(-1, 1), ofRandom(-1, 1))); speeds.push_back(glm::vec2(ofRandom(-1, 1), ofRandom(-1, 1)));
} }
// a simple vector of points // a simple vector of points
vector <glm::vec2> points; vector <glm::vec2> points;
vector <glm::vec2> speeds; vector <glm::vec2> speeds;
// in super fast mode we use a vbo // in super fast mode we use a vbo
ofVbo vbo; ofVbo vbo;
// mode switcher // mode switcher
int mode; int mode;
}; };

85
src/ofxProfiler.h
View file

@ -27,12 +27,12 @@ struct InstrumentationSession {
}; };
class Instrumentor { class Instrumentor {
private: private:
mutex m_Mutex; mutex m_Mutex;
InstrumentationSession * m_CurrentSession; InstrumentationSession * m_CurrentSession;
ofstream m_OutputStream; ofstream m_OutputStream;
public: public:
Instrumentor() Instrumentor()
: m_CurrentSession(nullptr){ : m_CurrentSession(nullptr){
} }
@ -59,12 +59,12 @@ class Instrumentor {
ofLog(OF_LOG_ERROR, "Instrumentor could not open results file '%s'.", filepath.c_str()); ofLog(OF_LOG_ERROR, "Instrumentor could not open results file '%s'.", filepath.c_str());
} }
} }
} }
void EndSession(){ void EndSession(){
lock_guard <mutex> lock(m_Mutex); lock_guard <mutex> lock(m_Mutex);
InternalEndSession(); InternalEndSession();
} }
void WriteProfile(const ProfileResult & result){ void WriteProfile(const ProfileResult & result){
stringstream json; stringstream json;
@ -73,62 +73,62 @@ class Instrumentor {
replace(name.begin(), name.end(), '"', '\''); replace(name.begin(), name.end(), '"', '\'');
json << setprecision(3) << fixed; json << setprecision(3) << fixed;
json << ",{"; json << ",{";
json << "\"cat\":\"function\","; json << "\"cat\":\"function\",";
json << "\"dur\":" << (result.ElapsedTime.count()) << ','; json << "\"dur\":" << (result.ElapsedTime.count()) << ',';
json << "\"name\":\"" << name << "\","; json << "\"name\":\"" << name << "\",";
json << "\"ph\":\"X\","; json << "\"ph\":\"X\",";
json << "\"pid\":0,"; json << "\"pid\":0,";
json << "\"tid\":" << result.ThreadID << ","; json << "\"tid\":" << result.ThreadID << ",";
json << "\"ts\":" << result.Start.count(); json << "\"ts\":" << result.Start.count();
json << "}"; json << "}";
lock_guard <mutex> lock(m_Mutex); lock_guard <mutex> lock(m_Mutex);
if(m_CurrentSession){ if(m_CurrentSession){
m_OutputStream << json.str(); m_OutputStream << json.str();
m_OutputStream.flush(); m_OutputStream.flush();
} }
} }
static Instrumentor & Get(){ static Instrumentor & Get(){
static Instrumentor instance; static Instrumentor instance;
return instance; return instance;
} }
private: private:
void WriteHeader(){ void WriteHeader(){
m_OutputStream << "{\"otherData\": {},\"traceEvents\":[{}"; m_OutputStream << "{\"otherData\": {},\"traceEvents\":[{}";
m_OutputStream.flush(); m_OutputStream.flush();
} }
void WriteFooter(){ void WriteFooter(){
m_OutputStream << "]}"; m_OutputStream << "]}";
m_OutputStream.flush(); m_OutputStream.flush();
} }
// Note: you must already own lock on m_Mutex before // Note: you must already own lock on m_Mutex before
// calling InternalEndSession() // calling InternalEndSession()
void InternalEndSession(){ void InternalEndSession(){
if(m_CurrentSession){ if(m_CurrentSession){
WriteFooter(); WriteFooter();
m_OutputStream.close(); m_OutputStream.close();
delete m_CurrentSession; delete m_CurrentSession;
m_CurrentSession = nullptr; m_CurrentSession = nullptr;
} }
} }
}; };
class InstrumentationTimer { class InstrumentationTimer {
public: public:
InstrumentationTimer(const char * name) InstrumentationTimer(const char * name)
: m_Name(name), m_Stopped(false){ : m_Name(name), m_Stopped(false){
m_StartTimepoint = chrono::steady_clock::now(); m_StartTimepoint = chrono::steady_clock::now();
} }
~InstrumentationTimer(){ ~InstrumentationTimer(){
if(!m_Stopped){ if(!m_Stopped){
Stop(); Stop();
} }
} }
@ -139,16 +139,15 @@ class InstrumentationTimer {
Instrumentor::Get().WriteProfile({m_Name, highResStart, elapsedTime, this_thread::get_id()}); Instrumentor::Get().WriteProfile({m_Name, highResStart, elapsedTime, this_thread::get_id()});
m_Stopped = true; m_Stopped = true;
} }
private: private:
const char * m_Name; const char * m_Name;
chrono::time_point <chrono::steady_clock> m_StartTimepoint; chrono::time_point <chrono::steady_clock> m_StartTimepoint;
bool m_Stopped; bool m_Stopped;
}; };
} }
#define OFX_PROFILER 1
// Resolve which function signature macro will HZ_PROFILE_BEGIN_SESSIONbe used. Note that this only // Resolve which function signature macro will HZ_PROFILE_BEGIN_SESSIONbe used. Note that this only
// is resolved when the (pre)compiler starts, so the syntax highlighting // is resolved when the (pre)compiler starts, so the syntax highlighting
// could mark the wrong one in your editor! // could mark the wrong one in your editor!