Mercurial > ecos-v3_0-branch

comparison packages/kernel/current/src/common/thread.cxx @ 132:0ae0bc38e387 ecos-sw-2000-10-31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
author jlarmour
date Tue, 31 Oct 2000 20:53:09 +0000
parents 0ec04793409a
children d397fc472bcf
comparison
equal deleted inserted replaced
131:8461114e4f19 132:0ae0bc38e387
839 } 839 }
840 } 840 }
841 841
842 Cyg_Scheduler::scheduler.deregister_thread(this); 842 Cyg_Scheduler::scheduler.deregister_thread(this);
843 843
844 #if CYG_SCHED_UNIQUE_PRIORITIES 844 #if CYGINT_KERNEL_SCHEDULER_UNIQUE_PRIORITIES
845 845
846 // Check that there are no other threads at this priority. 846 // Check that there are no other threads at this priority.
847 // If so, leave is as it is. 847 // If so, leave is as it is.
848 848
849 CYG_ASSERT( Cyg_Scheduler::scheduler.unique(new_priority), "Priority not unique"); 849 CYG_ASSERT( Cyg_Scheduler::scheduler.unique(new_priority), "Priority not unique");
850 850
851 if( Cyg_Scheduler::scheduler.unique(new_priority) ) 851 if( Cyg_Scheduler::scheduler.unique(new_priority) )
852 priority = new_priority; 852 priority = new_priority;
853 853
854 #else // !CYG_SCHED_UNIQUE_PRIORITIES 854 #else // !CYGINT_KERNEL_SCHEDULER_UNIQUE_PRIORITIES
855 855
856 #ifdef CYGSEM_KERNEL_SYNCH_MUTEX_PRIORITY_INVERSION_PROTOCOL_SIMPLE 856 #ifdef CYGSEM_KERNEL_SYNCH_MUTEX_PRIORITY_INVERSION_PROTOCOL_SIMPLE
857 857
858 // When we have priority inheritance, we must update the original 858 // When we have priority inheritance, we must update the original
859 // priority and not the inherited one. If the new priority is 859 // priority and not the inherited one. If the new priority is
872 872
873 priority = new_priority; 873 priority = new_priority;
874 874
875 #endif 875 #endif
876 876
877 #endif // CYG_SCHED_UNIQUE_PRIORITIES 877 #endif // CYGINT_KERNEL_SCHEDULER_UNIQUE_PRIORITIES
878 878
879 Cyg_Scheduler::scheduler.register_thread(this); 879 Cyg_Scheduler::scheduler.register_thread(this);
880 880
881 // Return thread to scheduler if runnable 881 // Return thread to scheduler if runnable
882 if( state == RUNNING ) 882 if( state == RUNNING )