From 3ae2f0bb8c2a141bebc0a47067a444e5d4faaf09 Mon Sep 17 00:00:00 2001 From: telleriam Date: Fri, 7 Nov 2008 10:53:22 +0000 Subject: [PATCH 1/1] Finishing renaming thread_group to thread_set. Integrating Michal's AQuoSA define. git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@1389 35b4ef3e-fd22-0410-ab77-dab3279adceb --- include/fosa.h | 2 +- ...sa_thread_groups.h => fosa_group_clocks.h} | 73 +++++++++---------- include/fosa_opaque_types.h | 14 ++-- include/fosa_types.h | 6 +- 4 files changed, 46 insertions(+), 49 deletions(-) rename include/{fosa_thread_groups.h => fosa_group_clocks.h} (79%) diff --git a/include/fosa.h b/include/fosa.h index 418bad6..df2ff88 100644 --- a/include/fosa.h +++ b/include/fosa.h @@ -81,7 +81,7 @@ #include "fosa_long_jump.h" #include "fosa_time.h" #include "fosa_platform_values.h" -#include "fosa_thread_groups.h" +#include "fosa_group_clocks.h" /** * @defgroup fosa FOSA Private Interfaces diff --git a/include/fosa_thread_groups.h b/include/fosa_group_clocks.h similarity index 79% rename from include/fosa_thread_groups.h rename to include/fosa_group_clocks.h index 05a233b..5b032f3 100644 --- a/include/fosa_thread_groups.h +++ b/include/fosa_group_clocks.h @@ -52,7 +52,7 @@ // however invalidate any other reasons why the executable file might be // covered by the GNU Public License. // ----------------------------------------------------------------------- -//fosa_thread_groups.h +//fosa_group_clocks.h //============================================== // ******** ****** ******** ********** // **///// /** ** **////// /** /** @@ -66,8 +66,8 @@ // FOSA(Frescor Operating System Adaptation layer) //================================================ -#ifndef _FOSA_THREAD_GROUPS_H -#define _FOSA_THREAD_GROUPS_H +#ifndef _FOSA_GROUP_CLOCKS_H +#define _FOSA_GROUP_CLOCKS_H #include "fosa_types.h" #include "fosa_configuration_parameters.h" @@ -75,10 +75,10 @@ FOSA_CPP_BEGIN_DECLS /** - * @defgroup threadgroups Thread Groups + * @defgroup groupclockss Group Clocks * @ingroup fosa * - * This module defines the types and functions to manage thread groups + * This module defines the types and functions to manage thread sets * and execution clocks attached to them. These functions are used * for the hierarchical scheduling module of FRSH * @@ -88,58 +88,56 @@ FOSA_CPP_BEGIN_DECLS /** - * fosa_thread_group_create() + * fosa_thread_set_create() * - * Create an empty thread group and return an identifier + * Create an empty thread set and return an identifier * - * This function stores in the variable pointed to by group the - * identifier of a thread group that is created by the function. + * This function stores in the variable pointed to by set the + * identifier of a thread set that is created by the function. * * Returns 0 if successful; otherwise it returns an error code: * FOSA_EAGAIN: no resources are currently available to create the - * thread group + * thread set * * Alternatively, in case of error the implementation is allowed to * notify it to the system console and then terminate the FRSH * implementation and dependant applications **/ - -int fosa_thread_group_create(fosa_thread_group_id_t *group); +int fosa_thread_set_create(fosa_thread_set_id_t *set); /** - * fosa_thread_group_destroy() + * fosa_thread_set_destroy() * - * Destroy a thread group + * Destroy a thread set * - * This function destroys the thread group identified by group. The - * threads that were in the group are detached from the group. It is + * This function destroys the thread set identified by set. The + * threads that were in the set are detached from the set. It is * an error to use the identifier after this call. The effects of * using a CPU-time clock associated with the destroyed thread are * undefined. * * Returns 0 if successful; otherwise it returns an error code: - * FOSA_EINVAL: group is invalid + * FOSA_EINVAL: set is invalid * * Alternatively, in case of error the implementation is allowed to * notify it to the system console and then terminate the FRSH * implementation and dependant applications **/ - -int fosa_thread_group_destroy(fosa_thread_group_id_t group); +int fosa_thread_set_destroy(fosa_thread_set_id_t set); /** - * fosa_thread_group_add() + * fosa_thread_set_add() * - * Add a thread to a thread group + * Add a thread to a thread set * * This function adds the thread identified with thread_id to the - * thread group identified by group. + * thread set identified by set. * * Returns 0 if successful; otherwise it returns an error code: - * FOSA_EINVAL: group is invalid - * FOSA_ENOTSUP: thread already a member of some other group + * FOSA_EINVAL: set is invalid + * FOSA_ENOTSUP: thread already a member of some other set * FOSA_EAGAIN: no resources available to add the new thread * FOSA_ESRCH: thread_id doesn't identify a valid thread * @@ -147,22 +145,21 @@ int fosa_thread_group_destroy(fosa_thread_group_id_t group); * notify it to the system console and then terminate the FRSH * implementation and dependant applications **/ - -int fosa_thread_group_add(fosa_thread_group_id_t group, +int fosa_thread_set_add(fosa_thread_set_id_t set, fosa_thread_id_t thread_id); /** - * fosa_thread_group_del() + * fosa_thread_set_del() * - * Delete a thread from a thread group + * Delete a thread from a thread set * * This function deletes the thread identified with thread_id from - * the thread group identified by group. + * the thread set identified by set. * * Returns 0 if successful; otherwise it returns an error code: - * FOSA_EINVAL: group is invalid - * FOSA_EINVAL: thread is not a member of the group + * FOSA_EINVAL: set is invalid + * FOSA_EINVAL: thread is not a member of the set * FOSA_ESRCH: thread_id doesn't identify a valid thread * * Alternatively, in case of error the implementation is allowed to @@ -170,22 +167,22 @@ int fosa_thread_group_add(fosa_thread_group_id_t group, * implementation and dependant applications **/ -int fosa_thread_group_del(fosa_thread_group_id_t group, +int fosa_thread_set_del(fosa_thread_set_id_t set, fosa_thread_id_t thread_id); /** - * fosa_get_groupcpu_clock() + * fosa_get_setcpu_clock() * * Get the identifier of a cpu-time clock associated to a thread - * group + * set * * This function stores in the variable pointed to by clockid the - * identifier of a cpu-time clock for the thread group specified - * by group. + * identifier of a cpu-time clock for the thread set specified + * by set. * * Returns 0 if successful; otherwise it returns an error code: - * FOSA_EINVAL: the group is invalid + * FOSA_EINVAL: the set is invalid * FOSA_EINVAL: clock_id is a null pointer * * Alternatively, in case of error the implementation is allowed to @@ -193,7 +190,7 @@ int fosa_thread_group_del(fosa_thread_group_id_t group, * implementation and dependant applications **/ -int fosa_get_groupcpu_clock(const fosa_thread_group_id_t group, +int fosa_get_groupcpu_clock(const fosa_thread_set_id_t set, fosa_clock_id_t *clock_id); diff --git a/include/fosa_opaque_types.h b/include/fosa_opaque_types.h index 8f05443..14d9339 100644 --- a/include/fosa_opaque_types.h +++ b/include/fosa_opaque_types.h @@ -138,11 +138,11 @@ typedef pthread_cond_t FOSA_COND_T_OPAQUE; } -/* Thread groups */ -/*****************/ -typedef marte_thread_set_t FOSA_THREAD_GROUP_ID_T_OPAQUE; +/* Group clocks */ +/****************/ +typedef marte_thread_set_t FOSA_THREAD_SET_ID_T_OPAQUE; -#define FOSA_NULL_THREAD_GROUP_ID_OPAQUE 0 /* In MaRTE-OS thread_set_t are +#define FOSA_NULL_THREAD_SET_ID_OPAQUE 0 /* In MaRTE-OS thread_set_t are * pointers */ /* FOSA errors */ @@ -167,7 +167,7 @@ typedef marte_thread_set_t FOSA_THREAD_GROUP_ID_T_OPAQUE; #define FOSA_ETIMEDOUT ETIMEDOUT -/* Not found in search (non existing thread, thread_group...) */ +/* Not found in search (non existing thread, thread_set...) */ #define FOSA_ESRCH ESRCH #define FOSA_ENOTSUP ENOTSUP @@ -217,7 +217,7 @@ typedef pthread_mutex_t FOSA_MUTEX_T_OPAQUE; /* Thread groups */ /*****************/ -typedef int FOSA_THREAD_GROUP_ID_T_OPAQUE +typedef int FOSA_THREAD_SET_ID_T_OPAQUE /* FOSA Errors */ /***************/ @@ -296,7 +296,7 @@ typedef int FOSA_SIGNAL_T_OPAQUE; /* Thread groups */ /*****************/ -typedef int FOSA_THREAD_GROUP_ID_T_OPAQUE; +typedef int FOSA_THREAD_SET_ID_T_OPAQUE; /* Clocks and signals */ /**********************/ diff --git a/include/fosa_types.h b/include/fosa_types.h index cb7a599..ba2b8b6 100644 --- a/include/fosa_types.h +++ b/include/fosa_types.h @@ -414,16 +414,16 @@ typedef FOSA_LONG_JUMP_CONTEXT_T_OPAQUE fosa_long_jump_context_t; /********************* - * THREAD GROUPS + * GROUP CLOCKS *********************/ /** * @addtogroup threadgroups * * @{ **/ -typedef FOSA_THREAD_GROUP_ID_T_OPAQUE fosa_thread_group_id_t; +typedef FOSA_THREAD_SET_ID_T_OPAQUE fosa_thread_set_id_t; -//#define FOSA_NULL_THREAD_GROUP_ID FOSA_NULL_THREAD_GROUP_ID_OPAQUE +//#define FOSA_NULL_THREAD_SET_ID FOSA_NULL_THREAD_SET_ID_OPAQUE /*@}*/ -- 2.39.2