From f326bacde611fa5eeb5fc994137dd246f9ef94bf Mon Sep 17 00:00:00 2001 From: sangorrin Date: Thu, 15 Nov 2007 19:04:56 +0000 Subject: [PATCH] FOSA_ABSOLITE git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@859 35b4ef3e-fd22-0410-ab77-dab3279adceb --- src_marte/fosa_mutexes_and_condvars.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src_marte/fosa_mutexes_and_condvars.c b/src_marte/fosa_mutexes_and_condvars.c index 58f8a4b..27d5e22 100644 --- a/src_marte/fosa_mutexes_and_condvars.c +++ b/src_marte/fosa_mutexes_and_condvars.c @@ -58,7 +58,7 @@ // **//// /** ** ////////** /**//////** // ** /** ** /** /** /** // ** /** ** ******** /** /** -// // /******/ //////// // // +// // /******/ //////// // // // // FOSA(Frescor Operating System Adaptation layer) //================================================ @@ -81,10 +81,10 @@ * * Initialize a frsh mutex * - * The mutex pointed to by mutex is initialized as a mutex using + * The mutex pointed to by mutex is initialized as a mutex using * the priority ceiling protocol. A priority ceiling of prioceiling * is assigned to this mutex. - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of prioceiling is invalid * EAGAIN: the system lacked the necessary resources to create the mutex @@ -100,7 +100,7 @@ int fosa_mutex_init(frsh_mutex_t *mutex, int prioceiling) pthread_mutexattr_t attr; int ret_value; - // create the attributes object and set the mutex to use the + // create the attributes object and set the mutex to use the // priority ceiling protocol and the desired priority ceiling ret_value=pthread_mutexattr_init(&attr); if (ret_value!=0) return ret_value; @@ -108,7 +108,7 @@ int fosa_mutex_init(frsh_mutex_t *mutex, int prioceiling) CHK(pthread_mutexattr_setprotocol(&attr,PTHREAD_PRIO_PROTECT)); ret_value=pthread_mutexattr_setprioceiling(&attr,prioceiling); - if (ret_value==0) { + if (ret_value==0) { // create the mutex ret_value=pthread_mutex_init(mutex,&attr); } @@ -122,12 +122,12 @@ int fosa_mutex_init(frsh_mutex_t *mutex, int prioceiling) * fosa_mutex_destroy() * * Destroy a frsh mutex - * + * * The mutex pointed to by mutex is destroyed - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of mutex is invalid - * EBUSY: The mutex is in use (is locked) + * EBUSY: The mutex is in use (is locked) * * Alternatively, in case of error the implementation is allowed to * notify it to the system console and then terminate the FRSH @@ -142,13 +142,13 @@ int fosa_mutex_destroy(frsh_mutex_t *mutex) * fosa_mutex_set_prioceiling() * * Dynamically set the priority ceiling of a mutex - * + * * This function locks the mutex (blocking the calling thread if * necessary) and after it is locked it changes its priority ceiling * to the value specified by new_ceiling, and then it unlocks the * mutex. The previous value of the ceiling is returned in * old_ceiling. - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of mutex or prioceiling is invalid * @@ -165,11 +165,11 @@ int fosa_mutex_set_prioceiling /** * fosa_mutex_get_prioceiling() * - * Dynamically get the priority ceiling of a mutex + * Dynamically get the priority ceiling of a mutex * * This function copies into the variable pointed to by ceiling the * current priority ceiling of the mutex referenced by mutex - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of mutex is invalid * @@ -186,12 +186,12 @@ int fosa_mutex_get_prioceiling(const frsh_mutex_t *mutex, int *ceiling) * fosa_mutex_lock() * * Lock a mutex - * + * * This function locks the mutex specified by mutex. If it is already * locked, the calling thread blocks until the mutex becomes * available. The operation returns with the mutex in the locked * state, with the calling thread as its owner. - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of mutex is invalid, or the priority of the * calling thread is higher than the priority ceiling of the mutex @@ -233,19 +233,19 @@ int fosa_mutex_trylock(frsh_mutex_t *mutex) * fosa_mutex_unlock() * * Unlock a mutex - * + * * This function must be called by the owner of the mutex referenced * by mutex, to unlock it. If there are threads blocked on the mutex * the mutex becomes available and the highest priority thread is * awakened to acquire the mutex. - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of mutex is invalid * EPERM: the calling thread is not the owner of the mutex * * Alternatively, except for EBUSY, in case of error the * implementation is allowed to notify it to the system console and - * then terminate the FRSH implementation and dependant applications + * then terminate the FRSH implementation and dependant applications **/ int fosa_mutex_unlock(frsh_mutex_t *mutex) { @@ -261,7 +261,7 @@ int fosa_mutex_unlock(frsh_mutex_t *mutex) * fosa_cond_init() * * Initiatize a condition variable - * + * * The condition variable referenced by cond is initialized with * the attributes required by the FOSA implementation. * @@ -269,7 +269,7 @@ int fosa_mutex_unlock(frsh_mutex_t *mutex) * EAGAIN: the system lacked the necessary resources to create the * condition variable * ENOMEM: Insufficient memory exists to initialize the condition variable - * EBUSY: The system has detected an attempt to reinitialize the + * EBUSY: The system has detected an attempt to reinitialize the * condition variable * * Alternatively, in case of error the implementation is allowed to @@ -288,10 +288,10 @@ int fosa_cond_init(fosa_cond_t *cond) * Destroy a condition variable * * The condition variable pointed to by cond is destroyed - * + * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of cond is invalid - * EBUSY: The condition variable is in use (a thread is waiting on it) + * EBUSY: The condition variable is in use (a thread is waiting on it) * * Alternatively, in case of error the implementation is allowed to * notify it to the system console and then terminate the FRSH @@ -374,10 +374,10 @@ int fosa_cond_wait(fosa_cond_t *cond, frsh_mutex_t *mutex) * fosa_cond_timedwait() * * Wait at a condition variable, with a timeout - * + * * This function is equal to fosa_cond_wait(), except that the maximum * wait time is limited to the absolute time referenced by abstime, as - * measured by the FOSA_CLOCK_REALTIME clock. + * measured by the FOSA_CLOCK_ABSOLUTE clock. * * Returns 0 if successful; otherwise it returns an error code: * EINVAL: the value of cond or mutex or abstime is invalid, or different @@ -389,7 +389,7 @@ int fosa_cond_wait(fosa_cond_t *cond, frsh_mutex_t *mutex) * implementation is allowed to notify it to the system console and * then terminate the FRSH implementation and dependant applications **/ -int fosa_cond_timedwait(fosa_cond_t *cond, frsh_mutex_t *mutex, +int fosa_cond_timedwait(fosa_cond_t *cond, frsh_mutex_t *mutex, const struct timespec *abstime) { return pthread_cond_timedwait(cond,mutex,abstime); -- 2.39.2