From e6de6c2e6f0689523c2d94b383a1e101539333c5 Mon Sep 17 00:00:00 2001 From: cjp Date: Fri, 28 Nov 2003 19:08:25 +0000 Subject: [PATCH] Timer optimizations. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@371 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_callbacks.c | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_callbacks.c b/freeglut/freeglut/src/freeglut_callbacks.c index 2c3f436..00d7ba1 100644 --- a/freeglut/freeglut/src/freeglut_callbacks.c +++ b/freeglut/freeglut/src/freeglut_callbacks.c @@ -95,19 +95,32 @@ void FGAPIENTRY glutIdleFunc( void (* callback)( void ) ) void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), int timerID ) { - SFG_Timer* timer; + SFG_Timer *timer, *node; freeglut_assert_ready; - timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 ); - if( !timer ) - fgError( "Fatal error: " - "Memory allocation failure in glutTimerFunc()\n" ); + if( (timer = fgState.FreeTimers.Last) ) + { + fgListRemove( &fgState.FreeTimers, &timer->Node ); + } + else + { + if( ! (timer = malloc(sizeof(SFG_Timer))) ) + fgError( "Fatal error: " + "Memory allocation failure in glutTimerFunc()\n" ); + } timer->Callback = callback; timer->ID = timerID; timer->TriggerTime = fgElapsedTime() + timeOut; - fgListAppend( &fgState.Timers, &timer->Node ); + + for( node = fgState.Timers.First; node; node = node->Node.Next ) + { + if( node->TriggerTime > timer->TriggerTime ) + break; + } + + fgListInsert( &fgState.Timers, &node->Node, &timer->Node ); } /*