Merge pull request #525 from asarium/cleanup/timer

Remove some unused code from timer.h/.cpp

Author: Goober5000

code/freespace2/freespace.cpp

@@ -4448,7 +4448,6 @@ void game_frame(bool paused)
 	}
 #endif
 	// start timing frame
-	timing_frame_start();
 	profile_begin("Main Frame");
 
 	DEBUG_GET_TIME( total_time1 )
@@ -4613,11 +4612,7 @@ void game_frame(bool paused)
 
 			// maybe render and process the dead popup
 			game_maybe_do_dead_popup(flFrametime);
-
-			// start timing frame
-			timing_frame_stop();
-			// timing_display(30, 10);			
-
+			
 			// If a regular popup is active, don't flip (popup code flips)
 			if( !popup_running_state() ){
 				DEBUG_GET_TIME( flip_time1 )

code/io/timer.cpp

@@ -27,11 +27,6 @@
 #include "osapi/osapi.h"	// for multi-thread macros
 
 
-
-#ifndef NDEBUG
-	#define USE_TIMING
-#endif
-
 #ifdef _WIN32
 static longlong Timer_last_value = 0, Timer_base = 0, Timer_freq = 0;
 static const int precision = 1;
@@ -288,219 +283,3 @@ int timestamp_has_time_elapsed(int stamp, int time)
 	return 0;
 }
 
-// timing functions -------------------------------------------------------------------------------
-
-#define MAX_TIMING_EVENTS		15
-
-// timing struct
-#ifdef USE_TIMING
-
-typedef struct timing {
-	char name[64];
-	int microseconds_total;
-	int start;
-	int ref_count;
-} timing;
-
-timing Timing_frame;
-timing Timing_events[MAX_TIMING_EVENTS];
-int Timing_event_count = 0;
-
-#endif
-
-// lookup a timing event
-int timing_event_lookup(char *event_name)
-{
-#ifndef USE_TIMING
-	return -1;
-#else
-	int idx;
-
-	// sanity
-	if(event_name == NULL){
-		return -1;
-	}
-
-	// look through all events
-	for(idx=0; idx<MAX_TIMING_EVENTS; idx++){
-		if(!stricmp(Timing_events[idx].name, event_name)){
-			return idx;
-		}
-	}
-
-	return -1;
-#endif
-}
-
-// start timing frame stuff
-void timing_frame_start()
-{
-#ifndef USE_TIMING
-	return;
-#else
-	int idx;
-
-	// restart the frame
-	Timing_event_count = 0;
-	Timing_frame.start = timer_get_microseconds();
-	for(idx=0; idx<MAX_TIMING_EVENTS; idx++){
-		Timing_events[idx].microseconds_total = 0;
-		strcpy_s(Timing_events[idx].name, "");
-		Timing_events[idx].ref_count = 0;
-	}
-#endif
-}
-
-// done timing the frame
-void timing_frame_stop()
-{
-#ifndef USE_TIMING
-	return;
-#else	
-	int stop_time;
-
-	// stop time
-	stop_time = timer_get_microseconds();
-
-	// calc times
-	Timing_frame.microseconds_total = stop_time - Timing_frame.start;	
-#endif
-}
-
-// get the total frame time in microseconds
-int timing_frame_total()
-{
-#ifndef USE_TIMING
-	return 0;
-#else
-	return Timing_frame.microseconds_total;
-#endif
-}
-
-// time an individual event
-void timing_event_start(char *event_name)
-{
-#ifndef USE_TIMING
-	return;
-#else
-	int event;
-
-	// sanity
-	if(event_name == NULL){
-		return;
-	}
-
-	// try and find the event
-	event = timing_event_lookup(event_name);
-
-	// if we already have one
-	if(event != -1){
-		Assert(Timing_events[event].ref_count == 0);
-		Timing_events[event].start = timer_get_microseconds();
-		Timing_events[event].ref_count++;
-	}
-	// if we need to add a new one
-	else {
-		if(Timing_event_count < MAX_TIMING_EVENTS){
-			strcpy_s(Timing_events[Timing_event_count].name, event_name);
-			Timing_events[Timing_event_count].start = timer_get_microseconds();
-			Timing_events[Timing_event_count++].ref_count++;
-		}
-	}
-#endif
-}
-
-// stop timing an event
-void timing_event_stop(char *event_name)
-{
-#ifndef USE_TIMING
-	return;
-#else
-	int event;
-
-	// sanity
-	if(event_name == NULL){
-		return;
-	}
-
-	// try and find the event
-	event = timing_event_lookup(event_name);
-
-	// if we already have one
-	if(event != -1){
-		Assert(Timing_events[event].ref_count == 1);
-		Timing_events[event].microseconds_total += timer_get_microseconds() - Timing_events[event].start;
-		Timing_events[event].ref_count--;
-	}
-#endif
-}
-
-// get the total time for an event in microseconds
-int timing_event_total(char *event_name)
-{
-#ifndef USE_TIMING
-	return -1;
-#else
-	int event;
-
-	// sanity
-	if(event_name == NULL){
-		return -1;
-	}
-
-	// try and find the event
-	event = timing_event_lookup(event_name);
-	if(event == -1){
-		return -1;
-	}
-	
-	return Timing_events[event].microseconds_total;
-#endif
-}
-
-// get the percentage of total frametime for the event (0.0 to 1.0)
-float timing_event_pct(char *event_name)
-{
-#ifndef USE_TIMING
-	return 0.0f;
-#else
-	int event;
-
-	// sanity
-	if(event_name == NULL){
-		return -1.0f;
-	}
-
-	// try and find the event
-	event = timing_event_lookup(event_name);
-	if(event == -1){
-		return -1.0f;
-	}
-
-	return (float)((double)Timing_events[event].microseconds_total / (double)Timing_frame.microseconds_total);
-#endif
-}
-
-// display timing 
-void timing_display(int x, int y)
-{
-#ifndef USE_TIMING
-	return;
-#else
-	int idx;
-
-	int line_height = gr_get_font_height() + 1;
-
-	gr_set_color_fast(&Color_bright_blue);
-
-	// total time
-	gr_printf_no_resize(x, y, "Total time %f\n", (float)timing_frame_total() / 1000000.0f);
-	y += line_height;
-
-	// each event percentage
-	for(idx=0; idx<Timing_event_count; idx++){
-		gr_printf_no_resize(x, y, "%s: %f\n", Timing_events[idx].name, timing_event_pct(Timing_events[idx].name));
-		y += line_height;
-	}
-#endif
-}

code/io/timer.h

@@ -28,8 +28,6 @@
 
 extern void timer_init();
 extern void timer_close();
-extern void timer_set_rate(int count_val);
-extern void timer_set_function( void * function );
 
 //==========================================================================
 // These functions return the time since the timer was initialized in
@@ -48,10 +46,6 @@ extern uint timer_get_high_res_microseconds();
 extern int timer_get_seconds();				// seconds since program started... not accurate, but good for long
 											//     runtimes with second-based timeouts
 
-//==========================================================================
-// Use to access the BIOS ticker... ie...   i = TICKER
-void timer_delay(fix seconds);
-
 
 //=================================================================
 //=================================================================
@@ -120,30 +114,4 @@ int timestamp_has_time_elapsed(int stamp, int time);
 #define timestamp_elapsed_safe(_a, _b)		( (_a != 0) ? (((timestamp_ticker >= (_a)) || (timestamp_ticker < (_a - (_b + 100)))) ? 1 : 0) : 1 )
 
 
-// timing functions -------------------------------------------------------------------------------
-
-// start timing frame stuff
-void timing_frame_start();
-
-// done timing the frame
-void timing_frame_stop();
-
-// get the total frame time in microseconds
-int timing_frame_total();
-
-// time an individual event
-void timing_event_start(char *event_name);
-
-// stop timing an event
-void timing_event_stop(char *event_name);
-
-// get the total time for an event in microseconds
-int timing_event_total(char *event_name);
-
-// get the percentage of total frametime for the event (0.0 to 1.0)
-float timing_event_pct(char *event_name);
-
-// display timing 
-void timing_display(int x, int y);
-
 #endif