From 730882d6153a57265ebb03c0304e54b94658cf1f Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Thu, 5 Dec 2013 23:13:30 +0100 Subject: [PATCH] kernel: Remove RunQueueLink.h --- headers/private/kernel/RunQueueLink.h | 56 -------------------------- src/system/kernel/scheduler/RunQueue.h | 43 +++++++++++++++++++- 2 files changed, 42 insertions(+), 57 deletions(-) delete mode 100644 headers/private/kernel/RunQueueLink.h diff --git a/headers/private/kernel/RunQueueLink.h b/headers/private/kernel/RunQueueLink.h deleted file mode 100644 index 79fdc60a1f..0000000000 --- a/headers/private/kernel/RunQueueLink.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2013 Haiku, Inc. All rights reserved. - * Distributed under the terms of the MIT License. - * - * Authors: - * Paweł Dziepak, pdziepak@quarnos.org - */ -#ifndef RUN_QUEUE_LINK_H -#define RUN_QUEUE_LINK_H - - -template -struct RunQueueLink { - RunQueueLink(); - - unsigned int fPriority; - Element* fPrevious; - Element* fNext; -}; - -template -class RunQueueLinkImpl { -public: - inline RunQueueLink* GetRunQueueLink(); - -private: - RunQueueLink fRunQueueLink; -}; - - -#if KDEBUG -template -RunQueueLink::RunQueueLink() - : - fPrevious(NULL), - fNext(NULL) -{ -} -#else -template -RunQueueLink::RunQueueLink() -{ -} -#endif - - -template -RunQueueLink* -RunQueueLinkImpl::GetRunQueueLink() -{ - return &fRunQueueLink; -} - - -#endif // RUN_QUEUE_LINK_H - diff --git a/src/system/kernel/scheduler/RunQueue.h b/src/system/kernel/scheduler/RunQueue.h index a38fb32f5d..4ecda7227a 100644 --- a/src/system/kernel/scheduler/RunQueue.h +++ b/src/system/kernel/scheduler/RunQueue.h @@ -9,10 +9,27 @@ #define RUN_QUEUE_H -#include #include +template +struct RunQueueLink { + RunQueueLink(); + + unsigned int fPriority; + Element* fPrevious; + Element* fNext; +}; + +template +class RunQueueLinkImpl { +public: + inline RunQueueLink* GetRunQueueLink(); + +private: + RunQueueLink fRunQueueLink; +}; + template class RunQueueStandardGetLink { private: @@ -90,6 +107,30 @@ private: }; +#if KDEBUG +template +RunQueueLink::RunQueueLink() + : + fPrevious(NULL), + fNext(NULL) +{ +} +#else +template +RunQueueLink::RunQueueLink() +{ +} +#endif + + +template +RunQueueLink* +RunQueueLinkImpl::GetRunQueueLink() +{ + return &fRunQueueLink; +} + + template RunQueueLink* RunQueueStandardGetLink::operator()(Element* element) const