mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

part2: misc source/lib fixes/improvements

Browse Source 
move all except user-specified config choices out of config.h and into
appropriate headers
CPU_IA32 -> ARCH_IA32
wsdl: disable use of ddraw (will soon be replaced by WMI)

use shared_ptr without namespace qualifier (it's in tr1)
debug_warn -> debug_assert(0)
LIB_API to allow building as DLL
smart pointers: reduce use of .get()
cache_adt: use map instead of hash_map (avoids needing a hashCompare
class). also remove spurious warning
code_annotation.h: better cassert implementation
move FPS measuring portion of timer.cpp into frequency_filter
move include of memory headers into mmgr.h (to avoid errors, we must
ensure they are included if mmgr is used)
posix_filesystem.h: move definition of mkdir to wfilesystem
stl: disable iterator checks in release mode
wmi: fix COM init bug, use smart pointers
wutil: add code to get DLL module handle (if compiled as such), add
WinScopedLock
timer: fix handling of raw ticks

This was SVN commit r5517.
This commit is contained in:
janwas
2007-12-20 20:09:19 +00:00
parent 03543147b7
commit 2e5d9452aa
68 changed files with 836 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lib/timer.h
+18 -18
View File
@@ -15,26 +15,18 @@
#include <string>
#include "debug.h" // debug_printf
#include "lib/sysdep/cpu.h"
extern void timer_Init();
extern void timer_Shutdown();
LIB_API void timer_Init();
LIB_API void timer_Shutdown();
// high resolution (> 1 us) timestamp [s], starting at or near 0 s.
extern double get_time(void);
LIB_API double get_time(void);
// return resolution (expressed in [s]) of the time source underlying
// get_time.
extern double timer_res(void);
// calculate fps (call once per frame)
// several smooth filters (tuned for ~100 FPS)
// => less fluctuation, but rapid tracking
extern int fps; // for user display
extern float spf; // for time-since-last-frame use
extern void calc_fps(void);
LIB_API double timer_res(void);
//-----------------------------------------------------------------------------
@@ -57,7 +49,7 @@ extern void calc_fps(void);
// note that overflow isn't an issue either way (63 bit cycle counts
// at 10 GHz cover intervals of 29 years).
#if CONFIG_TIMER_ALLOW_RDTSC
#if ARCH_IA32 && CONFIG_TIMER_ALLOW_RDTSC
// fast, IA-32 specific, not usable as wall-clock
// (see http://www.gamedev.net/reference/programming/features/timing)
@@ -66,6 +58,10 @@ class TimerRdtsc
public:
typedef i64 unit;
unit get_timestamp() const;
static double ToSeconds(unit value)
{
return value / cpu_ClockFrequency();
}
};
#endif
@@ -78,9 +74,13 @@ public:
{
return get_time();
}
static double ToSeconds(unit value)
{
return value;
}
};
#if CONFIG_TIMER_ALLOW_RDTSC
#if ARCH_IA32 && CONFIG_TIMER_ALLOW_RDTSC
typedef TimerRdtsc Timer;
#else
typedef TimerSafe Timer;
@@ -122,14 +122,14 @@ struct TimerClient
// - always succeeds (there's no fixed limit);
// - free() is not needed nor possible.
// - description must remain valid until exit; a string literal is safest.
extern TimerClient* timer_add_client(TimerClient* tc, const char* description);
LIB_API TimerClient* timer_add_client(TimerClient* tc, const char* description);
// add <dt> to the client's total.
extern void timer_bill_client(TimerClient* tc, TimerUnit dt);
LIB_API void timer_bill_client(TimerClient* tc, TimerUnit dt);
// display all clients' totals; does not reset them.
// typically called at exit.
extern void timer_display_client_totals();
LIB_API void timer_display_client_totals();
//-----------------------------------------------------------------------------