score: Merge threadmp implementation into one file

This commit is contained in:
Sebastian Huber
2013-07-26 11:55:45 +02:00
parent fe6c170cf5
commit 62590a7331
4 changed files with 35 additions and 78 deletions
-1
View File
@@ -109,7 +109,6 @@ if HAS_MP
## We only build multiprocessing related files if HAS_MP was defined
include_rtems_score_HEADERS += inline/rtems/score/mppkt.inl
include_rtems_score_HEADERS += inline/rtems/score/objectmp.inl
include_rtems_score_HEADERS += inline/rtems/score/threadmp.inl
endif
## src
+35 -9
View File
@@ -23,6 +23,12 @@
# error "Never use <rtems/score/threadmp.h> directly; include <rtems/score/threadimpl.h> instead."
#endif
#include <rtems/score/mpci.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* @defgroup ScoreThreadMP Thread Handler Multiprocessing Support
*
@@ -35,10 +41,6 @@
*/
/**@{*/
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Initialize MP thread handler.
*
@@ -87,15 +89,39 @@ SCORE_EXTERN Chain_Control _Thread_MP_Active_proxies;
*/
SCORE_EXTERN Chain_Control _Thread_MP_Inactive_proxies;
#ifndef __RTEMS_APPLICATION__
#include <rtems/score/threadmp.inl>
#endif
/**
* This function returns true if the thread in question is the
* multiprocessing receive thread.
*
* @note This is a macro to avoid needing a prototype for
* _MPCI_Receive_server_tcb until it is used.
*/
#define _Thread_MP_Is_receive(_the_thread) \
((_the_thread) == _MPCI_Receive_server_tcb)
/**
* This routine frees a proxy control block to the
* inactive chain of free proxy control blocks.
*/
RTEMS_INLINE_ROUTINE void _Thread_MP_Free_proxy (
Thread_Control *the_thread
)
{
Thread_Proxy_control *the_proxy;
the_proxy = (Thread_Proxy_control *) the_thread;
_Chain_Extract( &the_proxy->Active );
_Chain_Append( &_Thread_MP_Inactive_proxies, &the_thread->Object.Node );
}
/**@}*/
#ifdef __cplusplus
}
#endif
/**@}*/
#endif
/* end of include file */
@@ -1,64 +0,0 @@
/**
* @file
*
* @brief Inlined Routines for the Multiprocessing part of Thread Package
*
* This include file contains the bodies of all inlined routines
* for the multiprocessing part of thread package.
*/
/*
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*/
#ifndef _RTEMS_SCORE_THREADMP_H
# error "Never use <rtems/score/threadmp.inl> directly; include <rtems/score/threadmp.h> instead."
#endif
#include <rtems/score/mpci.h>
#ifndef _RTEMS_SCORE_THREADMP_INL
#define _RTEMS_SCORE_THREADMP_INL
/**
* @addtogroup ScoreThreadMP
*/
/**@{**/
/**
* This function returns true if the thread in question is the
* multiprocessing receive thread.
*
* @note This is a macro to avoid needing a prototype for
* _MPCI_Receive_server_tcb until it is used.
*/
#define _Thread_MP_Is_receive(_the_thread) \
((_the_thread) == _MPCI_Receive_server_tcb)
/**
* This routine frees a proxy control block to the
* inactive chain of free proxy control blocks.
*/
RTEMS_INLINE_ROUTINE void _Thread_MP_Free_proxy (
Thread_Control *the_thread
)
{
Thread_Proxy_control *the_proxy;
the_proxy = (Thread_Proxy_control *) the_thread;
_Chain_Extract( &the_proxy->Active );
_Chain_Append( &_Thread_MP_Inactive_proxies, &the_thread->Object.Node );
}
/** @} */
#endif
/* end of include file */
-4
View File
@@ -355,8 +355,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mppkt.inl
$(PROJECT_INCLUDE)/rtems/score/objectmp.inl: inline/rtems/score/objectmp.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/objectmp.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/objectmp.inl
$(PROJECT_INCLUDE)/rtems/score/threadmp.inl: inline/rtems/score/threadmp.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
endif