From 32506647001a815e3c0daf25757d386104a07184 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Jul 2014 12:37:36 -0500 Subject: Thread Queue: Merge discipline subroutines into main methods There was a lot of duplication between the discipline subroutines. With the transition to RBTrees for priority discipline, there were only a few lines of source code manipulating the data structure for FIFO and priority. Thus is made sense to fold these back into the main methods. As part of doing this all of the tests for discipline were changed to be in the same order. --- cpukit/score/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cpukit/score/Makefile.am') diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index e4c373c836..431dade665 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -298,13 +298,9 @@ endif ## THREADQ_C_FILES libscore_a_SOURCES += src/threadq.c src/threadqdequeue.c \ - src/threadqdequeuefifo.c src/threadqdequeuepriority.c \ - src/threadqenqueue.c src/threadqenqueuefifo.c \ - src/threadqenqueuepriority.c src/threadqextract.c \ - src/threadqextractfifo.c src/threadqextractpriority.c \ - src/threadqextractwithproxy.c src/threadqfirst.c src/threadqfirstfifo.c \ - src/threadqfirstpriority.c src/threadqflush.c \ - src/threadqprocesstimeout.c src/threadqtimeout.c + src/threadqenqueue.c src/threadqextract.c src/threadqrequeue.c \ + src/threadqextractwithproxy.c src/threadqfirst.c \ + src/threadqflush.c src/threadqprocesstimeout.c src/threadqtimeout.c ## TIMESPEC_C_FILES libscore_a_SOURCES += src/timespecaddto.c src/timespecfromticks.c \ -- cgit v1.2.3