From c6241db61541a4b5d364f86628c87035d586042d Mon Sep 17 00:00:00 2001 From: telleriam Date: Fri, 7 Nov 2008 10:53:46 +0000 Subject: [PATCH] finishing renaming thread_group to thread_set git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@1390 35b4ef3e-fd22-0410-ab77-dab3279adceb --- ...sa_thread_groups.c => fosa_group_clocks.c} | 79 +++++++++---------- .../Makefile | 0 .../test_thread_groups.c | 0 3 files changed, 39 insertions(+), 40 deletions(-) rename src_marte_os/{fosa_thread_groups.c => fosa_group_clocks.c} (77%) rename src_marte_os/tests/{test_thread_groups => test_group_clocks}/Makefile (100%) rename src_marte_os/tests/{test_thread_groups => test_group_clocks}/test_thread_groups.c (100%) diff --git a/src_marte_os/fosa_thread_groups.c b/src_marte_os/fosa_group_clocks.c similarity index 77% rename from src_marte_os/fosa_thread_groups.c rename to src_marte_os/fosa_group_clocks.c index 68b300a..398689a 100644 --- a/src_marte_os/fosa_thread_groups.c +++ b/src_marte_os/fosa_group_clocks.c @@ -52,7 +52,7 @@ // however invalidate any other reasons why the executable file might be // covered by the GNU Public License. // ----------------------------------------------------------------------- -//fosa_thread_groups.c +//fosa_group_clocks.c //============================================== // ******** ****** ******** ********** // **///// /** ** **////// /** /** @@ -69,73 +69,73 @@ #include -#include "fosa_thread_groups.h" +#include "fosa_group_clocks.h" /** - * 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) { int error; - error = marte_threadset_create( (marte_thread_set_t *) group); + error = marte_threadset_create( (marte_thread_set_t *) set); return error; } /** - * 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) { int error; - error = marte_threadset_destroy(group); + error = marte_threadset_destroy(set); return error; } - + + /** - * 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 * @@ -143,42 +143,41 @@ 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) { int error; - error = marte_threadset_add(group, thread_id); + error = marte_threadset_add(set, thread_id); return error; } - /** - * 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 * notify it to the system console and then terminate the FRSH * 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) { int error; - error = marte_threadset_del(group, thread_id); + error = marte_threadset_del(set, thread_id); return error; } @@ -188,26 +187,26 @@ int fosa_thread_group_del(fosa_thread_group_id_t group, * fosa_get_groupcpu_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 * notify it to the system console and then terminate the FRSH * 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) { int error; - error = marte_getgroupcpuclockid(group, clock_id); + error = marte_getgroupcpuclockid(set, clock_id); return error; } diff --git a/src_marte_os/tests/test_thread_groups/Makefile b/src_marte_os/tests/test_group_clocks/Makefile similarity index 100% rename from src_marte_os/tests/test_thread_groups/Makefile rename to src_marte_os/tests/test_group_clocks/Makefile diff --git a/src_marte_os/tests/test_thread_groups/test_thread_groups.c b/src_marte_os/tests/test_group_clocks/test_thread_groups.c similarity index 100% rename from src_marte_os/tests/test_thread_groups/test_thread_groups.c rename to src_marte_os/tests/test_group_clocks/test_thread_groups.c -- 2.39.2