flash_v2: packages/kernel/current/src/common/clock.cxx comparison

comparison packages/kernel/current/src/common/clock.cxx @ 148:8f2f7615e727

Merge from eCos master repository on 2001-01-12-06:43:03-GMT

author	jlarmour
date	Fri, 12 Jan 2001 08:11:46 +0000
parents	0ae0bc38e387
children	25e238959bae

comparison

equal deleted inserted replaced

-:d397fc472bcf
+:8f2f7615e727
 {
 CYG_REPORT_FUNCTION();
 counter = 0;
 increment = incr;
-#if defined(CYGIMP_KERNEL_COUNTERS_SINGLE_LIST)
-alarm_list = NULL;    // Linear list of Alarms
-#elif defined(CYGIMP_KERNEL_COUNTERS_MULTI_LIST)
-for(cyg_ucount32 i=0; i < CYGNUM_KERNEL_COUNTERS_MULTI_LIST_SIZE; i++) {
-alarm_list[i] = NULL;
-}
-#else
-#error "No CYGIMP_KERNEL_COUNTERS_x_LIST config"
-#endif
 }
 // -------------------------------------------------------------------------
 // Destructor for Counter object
 // allowed to wrap.
 counter += increment;
 // now check for any expired alarms
-Cyg_Alarm **alarm_list_ptr;     // pointer to list
+Cyg_Alarm_List *alarm_list_ptr;     // pointer to list
 #if defined(CYGIMP_KERNEL_COUNTERS_SINGLE_LIST)
 alarm_list_ptr = &alarm_list;
 #ifdef CYGIMP_KERNEL_COUNTERS_SORT_LIST
 // With a sorted alarm list, we can simply pick alarms off the
 // front of the list until we find one that is in the future.
-while( *alarm_list_ptr != NULL )
+while( !alarm_list_ptr->empty() )
 {
-Cyg_Alarm *alarm = *alarm_list_ptr;
+Cyg_Alarm *alarm = alarm_list_ptr->get_head();
 CYG_ASSERTCLASS(alarm, "Bad alarm in counter list" );
 if( alarm->trigger <= counter )
 {
 // remove alarm from list
-*alarm_list_ptr = alarm->next;
+alarm_list_ptr->rem_head();
 if( alarm->interval != 0 )
 {
 // The alarm has a retrigger interval.
 // Reset the trigger time and requeue
 alarm->alarm(alarm, alarm->data);
 // all done, loop
 }
 else break;
-}
+}
 #else
 // With an unsorted list, we must scan the whole list for
 // candidates. We move the whole list to a temporary location
 // before doing this so that we are not disturbed by new
 // alarms being added to the list. As we consider and
 // eliminate alarms we put them onto the done_list and at the
 // end we then move it back to where it belongs.
-Cyg_Alarm *done_list = NULL;
+Cyg_Alarm_List done_list;
-Cyg_Alarm *alarm_list = *alarm_list_ptr;
+Cyg_Alarm_List alarm_list;
-*alarm_list_ptr = NULL;
+alarm_list.merge( *alarm_list_ptr );
-while( alarm_list != NULL )
+while( !alarm_list.empty() )
 {
-Cyg_Alarm *alarm = alarm_list;
+Cyg_Alarm *alarm = alarm_list.rem_head();
 CYG_ASSERTCLASS(alarm, "Bad alarm in counter list" );
-// remove alarm from list
-alarm_list = alarm->next;
 if( alarm->trigger <= counter )
 {
 if( alarm->interval != 0 )
 {
 // The alarm has a retrigger interval.
 // all done, loop
 }
 else
 {
 // add unused alarm to done list.
-alarm->next = done_list;
+done_list.add_tail(alarm);
-done_list = alarm;
 }
 }
-// Transfer any alarms that might have been added to the
+// Return done list to real list. If any alarms have been
-// alarm list by alarm callbacks to the done list. This
+// added to the alarm list while we have been scanning then
-// happens very rarely.
+// the done list will be added behind them.
-while( *alarm_list_ptr != NULL )
-{
+alarm_list_ptr->merge( done_list );
-Cyg_Alarm *alarm = *alarm_list_ptr;
-*alarm_list_ptr = alarm->next;
-alarm->next = done_list;
-done_list = alarm;
-}
-// return done list to real list
-*alarm_list_ptr = done_list;
 #endif
 Cyg_Scheduler::unlock();
 }
 }
 }
 }
 CYG_INSTRUMENT_ALARM( ADD, this, alarm );
-{
+// Find the pointer to the relevant list _after_ a retrigger
-// Find the pointer to the relevant list _after_ a retrigger
+// alarm has been given its new trigger time.
-// alarm has been given its new trigger time.
+Cyg_Alarm_List *alarm_list_ptr;     // pointer to list
-Cyg_Alarm **alarm_list_ptr;     // pointer to list
 #if defined(CYGIMP_KERNEL_COUNTERS_SINGLE_LIST)
 alarm_list_ptr = &alarm_list;
 #elif defined(CYGIMP_KERNEL_COUNTERS_MULTI_LIST)
 // Each alarm must go into the list that covers the tick that is
 // going to happen _after_ the trigger time (or at it if trigger
 // happens to fall on a tick.
 alarm_list_ptr = &(alarm_list[
 ((alarm->trigger+increment-1)/increment) %
 CYGNUM_KERNEL_COUNTERS_MULTI_LIST_SIZE ] );
 #else
 #error "No CYGIMP_KERNEL_COUNTERS_x_LIST config"
 #endif
 #ifdef CYGIMP_KERNEL_COUNTERS_SORT_LIST
 // Now that we have the list pointer, we can use common code for
 // both list oragnizations.
-while( *alarm_list_ptr != NULL )
+Cyg_Alarm *list_alarm = alarm_list_ptr->get_head();
+if( list_alarm != NULL )
+do
 {
-Cyg_Alarm *list_alarm = *alarm_list_ptr;
 CYG_ASSERTCLASS(list_alarm, "Bad alarm in counter list" );
 // The alarms are in ascending trigger order. When we
 // find an alarm that is later than us, we go in front of
 // it.
-if( list_alarm->trigger > alarm->trigger ) break;
+if( list_alarm->trigger > alarm->trigger )
-else alarm_list_ptr = &list_alarm->next;
+{
-}
+alarm_list_ptr->insert( list_alarm, alarm );
-#endif
+break;
-// Insert the new alarm at *alarm_list_ptr
+}
-alarm->next = *alarm_list_ptr;
+list_alarm = list_alarm->get_next();
-*alarm_list_ptr = alarm;
+} while( list_alarm != alarm_list_ptr->get_head() );
-Cyg_Scheduler::unlock();
-}
+else
+alarm_list_ptr->add_tail( alarm );
+#else
+alarm_list_ptr->add_tail( alarm );
+#endif
+Cyg_Scheduler::unlock();
 }
 // -------------------------------------------------------------------------
 // Remove an alarm from this counter
 CYG_REPORT_FUNCTION();
 CYG_ASSERTCLASS( this, "Bad counter object" );
 CYG_ASSERTCLASS( alarm, "Bad alarm passed" );
-Cyg_Alarm **alarm_list_ptr;     // pointer to list
+Cyg_Alarm_List *alarm_list_ptr;     // pointer to list
 #if defined(CYGIMP_KERNEL_COUNTERS_SINGLE_LIST)
 alarm_list_ptr = &alarm_list;
 // both list organizations.
 Cyg_Scheduler::lock();
 CYG_INSTRUMENT_ALARM( REM, this, alarm );
-while( *alarm_list_ptr != NULL )
+alarm_list_ptr->remove( alarm );
-{
-Cyg_Alarm *list_alarm = *alarm_list_ptr;
-CYG_ASSERTCLASS(list_alarm, "Bad alarm in counter list" );
-if( list_alarm == alarm ) break;
-else alarm_list_ptr = &list_alarm->next;
-}
-// If the alarm was found, remove it from the list.
-if( *alarm_list_ptr != NULL )
-{
-*alarm_list_ptr = alarm->next;
-alarm->enabled = false;
-}
 Cyg_Scheduler::unlock();
 }
 //==========================================================================
 // Constructor for clock object
 data        = d;
 trigger     = 0;
 interval    = 0;
 enabled     = false;
-#if defined(CYGIMP_KERNEL_COUNTERS_SINGLE_LIST) || defined(CYGIMP_KERNEL_COUNTERS_MULTI_LIST)
-next        = NULL;
-#endif
 }
 Cyg_Alarm::Cyg_Alarm(){}
 // -------------------------------------------------------------------------

Mercurial > flash_v2

comparison packages/kernel/current/src/common/clock.cxx @ 148:8f2f7615e727