ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv

Browse Source
This commit is contained in:
Bart Cools 2014-05-15 18:30:16 +02:00
parent f4a5949198
commit 61d9b7a0ea
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/modes/profile_world.cpp
View File

@ -203,6 +203,7 @@ void ProfileWorld::enterRaceOverState()
// Print geometry statistics if we're not in no-graphics mode // Print geometry statistics if we're not in no-graphics mode
if(!m_no_graphics) if(!m_no_graphics)
{ {
//TODO change printf to Log::profile (after discussing lay-out)
printf("Average # drawn nodes %f k\n", printf("Average # drawn nodes %f k\n",
(float)m_num_triangles/m_frame_count); (float)m_num_triangles/m_frame_count);
printf("Average # culled nodes: %f k\n", printf("Average # culled nodes: %f k\n",
@ -217,10 +218,11 @@ void ProfileWorld::enterRaceOverState()
// Print race statistics for each individual kart // Print race statistics for each individual kart
float min_t=999999.9f, max_t=0.0, av_t=0.0; float min_t=999999.9f, max_t=0.0, av_t=0.0;
printf("name,start_position,end_position,time,average_speed,top_speed," //printf(output);
"skid_time,rescue_time,rescue_count,brake_count," Log::profile("Kart stats", "name start_position end_position time average_speed top_speed "
"explosion_time,explosion_count,bonus_count,banana_count," "skid_time rescue_time rescue_count brake_count "
"small_nitro_count,large_nitro_count,bubblegum_count\n"); "explosion_time explosion_count bonus_count banana_count "
"small_nitro_count large_nitro_count bubblegum_count");
std::set<std::string> all_groups; std::set<std::string> all_groups;
@ -231,21 +233,33 @@ void ProfileWorld::enterRaceOverState()
max_t = std::max(max_t, kart->getFinishTime()); max_t = std::max(max_t, kart->getFinishTime());
min_t = std::min(min_t, kart->getFinishTime()); min_t = std::min(min_t, kart->getFinishTime());
av_t += kart->getFinishTime(); av_t += kart->getFinishTime();
printf("%s %s,", kart->getIdent().c_str(), std::stringstream ss;
kart->getController()->getControllerName().c_str()); ss << kart->getIdent().c_str() << " " << kart->getController()->getControllerName().c_str() << " ";
ss << 1+(int)i << " " << kart->getPosition() << " " << kart->getFinishTime() << " ";
//printf("%s %s,", kart->getIdent().c_str(),
// kart->getController()->getControllerName().c_str());
all_groups.insert(kart->getController()->getControllerName()); all_groups.insert(kart->getController()->getControllerName());
printf("%d,%d,%4.2f,", 1 + (int)i, kart->getPosition(), kart->getFinishTime()); //printf("%d,%d,%4.2f,", 1 + (int)i, kart->getPosition(), kart->getFinishTime());
float distance = (float)(m_profile_mode==PROFILE_LAPS float distance = (float)(m_profile_mode==PROFILE_LAPS
? race_manager->getNumLaps() : 1); ? race_manager->getNumLaps() : 1);
distance *= m_track->getTrackLength(); distance *= m_track->getTrackLength();
printf("%4.2f,%3.2f,%4.2f,%4.2f,%d,%d,%4.2f,%d,%d,%d,%d,%d,%d,%d\n", ss << distance/kart->getFinishTime() << " " << kart->getTopSpeed() << " ";
distance/kart->getFinishTime(), kart->getTopSpeed(), ss << kart->getSkiddingTime() << " " << kart->getRescueTime() << " ";
kart->getSkiddingTime(), kart->getRescueTime(), ss << kart->getRescueCount() << " " << kart->getBrakeCount() << " ";
kart->getRescueCount(), kart->getBrakeCount(), ss << kart->getExplosionTime() << " " << kart->getExplosionCount() << " ";
kart->getExplosionTime(), kart->getExplosionCount(), ss << kart->getBonusCount() << " " << kart->getBananaCount() << " ";
kart->getBonusCount(), kart->getBananaCount(), ss << kart->getSmallNitroCount() << " " << kart->getLargeNitroCount() << " ";
kart->getSmallNitroCount(), kart->getLargeNitroCount(), ss << kart->getBubblegumCount() << " " << kart->getOffTrackCount() << " ";
kart->getBubblegumCount(), kart->getOffTrackCount() ); //printf("%4.2f,%3.2f,%4.2f,%4.2f,%d,%d,%4.2f,%d,%d,%d,%d,%d,%d,%d\n",
// distance/kart->getFinishTime(), kart->getTopSpeed(),
// kart->getSkiddingTime(), kart->getRescueTime(),
// kart->getRescueCount(), kart->getBrakeCount(),
// kart->getExplosionTime(), kart->getExplosionCount(),
// kart->getBonusCount(), kart->getBananaCount(),
// kart->getSmallNitroCount(), kart->getLargeNitroCount(),
// kart->getBubblegumCount(), kart->getOffTrackCount() );
Log::profile("Kart stats", ss.str().c_str());
} }
// Print group statistics of all karts // Print group statistics of all karts

2
src/utils/log.cpp
View File

@ -153,7 +153,7 @@ void Log::printMessage(int level, const char *component, const char *format,
} }
__android_log_vprint(alp, "SuperTuxKart", format, args); __android_log_vprint(alp, "SuperTuxKart", format, args);
#else #else
static const char *names[] = {"verbose", "debug ", "info ", static const char *names[] = {"verbose", "debug ", "profile", "info ",
"warn ", "error ", "fatal "}; "warn ", "error ", "fatal "};
// Using a va_list twice produces undefined results, ie crash. // Using a va_list twice produces undefined results, ie crash.

2
src/utils/log.hpp
View File

@ -42,6 +42,7 @@ public:
/** The various log levels used in STK. */ /** The various log levels used in STK. */
enum LogLevel { LL_DEBUG, enum LogLevel { LL_DEBUG,
LL_VERBOSE, LL_VERBOSE,
LL_PROFILE,
LL_INFO, LL_INFO,
LL_WARN, LL_WARN,
LL_ERROR, LL_ERROR,
@ -86,6 +87,7 @@ public:
} \ } \
} }
LOG(verbose, LL_VERBOSE); LOG(verbose, LL_VERBOSE);
LOG(profile, LL_PROFILE);
LOG(debug, LL_DEBUG); LOG(debug, LL_DEBUG);
LOG(info, LL_INFO); LOG(info, LL_INFO);
LOG(warn, LL_WARN); LOG(warn, LL_WARN);