[Xenomai-git] Gilles Chanteperdrix : cobalt: move cond_attr system calls to cond_attr.c

2011-12-11 Thread GIT version control 
Module: xenomai-gch
Branch: for-forge
Commit: 9cf6dd92acb501313dc2425f84123981cac0eec9
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=9cf6dd92acb501313dc2425f84123981cac0eec9

Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org
Date:   Sun Dec 11 17:46:32 2011 +0100

cobalt: move cond_attr system calls to cond_attr.c

---

 include/cobalt/pthread.h  |   93 -
 kernel/cobalt/cond.c  |5 +--
 kernel/cobalt/cond.h  |   16 ++
 kernel/cobalt/cond_attr.c |  124 ++---
 kernel/cobalt/syscall.c   |  104 ++---
 5 files changed, 129 insertions(+), 213 deletions(-)

diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h
index 62a7134..139802f 100644
--- a/include/cobalt/pthread.h
+++ b/include/cobalt/pthread.h
@@ -198,99 +198,6 @@ struct cobalt_monitor_shadow {
 typedef struct cobalt_mutexattr pthread_mutexattr_t;
 
 typedef struct cobalt_condattr pthread_condattr_t;
-
-#ifdef __cplusplus
-extern C {
-#endif
-
-int pthread_attr_init(pthread_attr_t *attr);
-
-int pthread_attr_destroy(pthread_attr_t *attr);
-
-int pthread_attr_getdetachstate(const pthread_attr_t *attr,
-   int *detachstate);
-
-int pthread_attr_setdetachstate(pthread_attr_t *attr,
-   int detachstate);
-
-int pthread_attr_getstackaddr(const pthread_attr_t *attr,
- void **stackaddr);
-
-int pthread_attr_setstackaddr(pthread_attr_t *attr,
- void *stackaddr);
-
-int pthread_attr_getstacksize(const pthread_attr_t *attr,
- size_t *stacksize);
-
-int pthread_attr_setstacksize(pthread_attr_t *attr,
- size_t stacksize);
-
-int pthread_attr_getinheritsched(const pthread_attr_t *attr,
-int *inheritsched);
-
-int pthread_attr_setinheritsched(pthread_attr_t *attr,
-int inheritsched);
-
-int pthread_attr_getschedpolicy(const pthread_attr_t *attr,
-   int *policy);
-
-int pthread_attr_setschedpolicy(pthread_attr_t *attr,
-   int policy);
-
-int pthread_attr_getschedparam(const pthread_attr_t *attr,
-  struct sched_param *par);
-
-int pthread_attr_getschedparam_ex(const pthread_attr_t *attr,
- struct sched_param_ex *par);
-
-int pthread_attr_setschedparam(pthread_attr_t *attr,
-  const struct sched_param *par);
-
-int pthread_attr_setschedparam_ex(pthread_attr_t *attr,
- const struct sched_param_ex *par);
-
-int pthread_attr_getscope(const pthread_attr_t *attr,
- int *scope);
-
-int pthread_attr_setscope(pthread_attr_t *attr,
- int scope);
-
-int pthread_attr_getname_np(const pthread_attr_t *attr,
-   const char **name);
-
-int pthread_attr_setname_np(pthread_attr_t *attr,
-   const char *name);
-
-int pthread_attr_getfp_np(const pthread_attr_t *attr,
- int *use_fp);
-
-int pthread_attr_setfp_np(pthread_attr_t *attr,
- int use_fp);
-
-int pthread_attr_getaffinity_np(const pthread_attr_t *attr,
-   xnarch_cpumask_t *mask);
-
-int pthread_attr_setaffinity_np(pthread_attr_t *attr,
-   xnarch_cpumask_t mask);
-
-int pthread_condattr_init(pthread_condattr_t *attr);
-
-int pthread_condattr_destroy(pthread_condattr_t *attr);
-
-int pthread_condattr_getclock(const pthread_condattr_t *attr,
- clockid_t *clk_id);
-
-int pthread_condattr_setclock(pthread_condattr_t *attr,
- clockid_t clk_id);
-
-int pthread_condattr_getpshared(const pthread_condattr_t *attr, int *pshared);
-
-int pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared);
-
-#ifdef __cplusplus
-}
-#endif
-
 #else /* !(__KERNEL__ || __XENO_SIM__) */
 
 typedef struct {
diff --git a/kernel/cobalt/cond.c b/kernel/cobalt/cond.c
index c19643c..cfe5201 100644
--- a/kernel/cobalt/cond.c
+++ b/kernel/cobalt/cond.c
@@ -51,8 +51,6 @@
 #include mutex.h
 #include cond.h
 
-static pthread_condattr_t default_cond_attr;
-
 static inline void
 cond_destroy_internal(cobalt_cond_t *cond, cobalt_kqueues_t *q)
 {
@@ -106,7 +104,7 @@ pthread_cond_init(struct __shadow_cond *cnd, const 
pthread_condattr_t *attr)
int err;
 
if (!attr)
-   attr = default_cond_attr;
+   attr = cobalt_default_cond_attr;
 
cond = (cobalt_cond_t *)xnmalloc(sizeof(*cond));
if (!cond)
@@ -491,7 +489,6 @@ void cobalt_condq_cleanup(cobalt_kqueues_t *q)
 void cobalt_cond_pkg_init(void)
 {
initq(cobalt_global_kqueues.condq);
-   pthread_condattr_init(default_cond_attr);
 }
 
 void

[Xenomai-git] Gilles Chanteperdrix : cobalt: move cond_attr system calls to cond_attr.c

2011-12-11 Thread GIT version control 
Module: xenomai-forge
Branch: master
Commit: 9cf6dd92acb501313dc2425f84123981cac0eec9
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=9cf6dd92acb501313dc2425f84123981cac0eec9

Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org
Date:   Sun Dec 11 17:46:32 2011 +0100

cobalt: move cond_attr system calls to cond_attr.c

---

 include/cobalt/pthread.h  |   93 -
 kernel/cobalt/cond.c  |5 +--
 kernel/cobalt/cond.h  |   16 ++
 kernel/cobalt/cond_attr.c |  124 ++---
 kernel/cobalt/syscall.c   |  104 ++---
 5 files changed, 129 insertions(+), 213 deletions(-)

diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h
index 62a7134..139802f 100644
--- a/include/cobalt/pthread.h
+++ b/include/cobalt/pthread.h
@@ -198,99 +198,6 @@ struct cobalt_monitor_shadow {
 typedef struct cobalt_mutexattr pthread_mutexattr_t;
 
 typedef struct cobalt_condattr pthread_condattr_t;
-
-#ifdef __cplusplus
-extern C {
-#endif
-
-int pthread_attr_init(pthread_attr_t *attr);
-
-int pthread_attr_destroy(pthread_attr_t *attr);
-
-int pthread_attr_getdetachstate(const pthread_attr_t *attr,
-   int *detachstate);
-
-int pthread_attr_setdetachstate(pthread_attr_t *attr,
-   int detachstate);
-
-int pthread_attr_getstackaddr(const pthread_attr_t *attr,
- void **stackaddr);
-
-int pthread_attr_setstackaddr(pthread_attr_t *attr,
- void *stackaddr);
-
-int pthread_attr_getstacksize(const pthread_attr_t *attr,
- size_t *stacksize);
-
-int pthread_attr_setstacksize(pthread_attr_t *attr,
- size_t stacksize);
-
-int pthread_attr_getinheritsched(const pthread_attr_t *attr,
-int *inheritsched);
-
-int pthread_attr_setinheritsched(pthread_attr_t *attr,
-int inheritsched);
-
-int pthread_attr_getschedpolicy(const pthread_attr_t *attr,
-   int *policy);
-
-int pthread_attr_setschedpolicy(pthread_attr_t *attr,
-   int policy);
-
-int pthread_attr_getschedparam(const pthread_attr_t *attr,
-  struct sched_param *par);
-
-int pthread_attr_getschedparam_ex(const pthread_attr_t *attr,
- struct sched_param_ex *par);
-
-int pthread_attr_setschedparam(pthread_attr_t *attr,
-  const struct sched_param *par);
-
-int pthread_attr_setschedparam_ex(pthread_attr_t *attr,
- const struct sched_param_ex *par);
-
-int pthread_attr_getscope(const pthread_attr_t *attr,
- int *scope);
-
-int pthread_attr_setscope(pthread_attr_t *attr,
- int scope);
-
-int pthread_attr_getname_np(const pthread_attr_t *attr,
-   const char **name);
-
-int pthread_attr_setname_np(pthread_attr_t *attr,
-   const char *name);
-
-int pthread_attr_getfp_np(const pthread_attr_t *attr,
- int *use_fp);
-
-int pthread_attr_setfp_np(pthread_attr_t *attr,
- int use_fp);
-
-int pthread_attr_getaffinity_np(const pthread_attr_t *attr,
-   xnarch_cpumask_t *mask);
-
-int pthread_attr_setaffinity_np(pthread_attr_t *attr,
-   xnarch_cpumask_t mask);
-
-int pthread_condattr_init(pthread_condattr_t *attr);
-
-int pthread_condattr_destroy(pthread_condattr_t *attr);
-
-int pthread_condattr_getclock(const pthread_condattr_t *attr,
- clockid_t *clk_id);
-
-int pthread_condattr_setclock(pthread_condattr_t *attr,
- clockid_t clk_id);
-
-int pthread_condattr_getpshared(const pthread_condattr_t *attr, int *pshared);
-
-int pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared);
-
-#ifdef __cplusplus
-}
-#endif
-
 #else /* !(__KERNEL__ || __XENO_SIM__) */
 
 typedef struct {
diff --git a/kernel/cobalt/cond.c b/kernel/cobalt/cond.c
index c19643c..cfe5201 100644
--- a/kernel/cobalt/cond.c
+++ b/kernel/cobalt/cond.c
@@ -51,8 +51,6 @@
 #include mutex.h
 #include cond.h
 
-static pthread_condattr_t default_cond_attr;
-
 static inline void
 cond_destroy_internal(cobalt_cond_t *cond, cobalt_kqueues_t *q)
 {
@@ -106,7 +104,7 @@ pthread_cond_init(struct __shadow_cond *cnd, const 
pthread_condattr_t *attr)
int err;
 
if (!attr)
-   attr = default_cond_attr;
+   attr = cobalt_default_cond_attr;
 
cond = (cobalt_cond_t *)xnmalloc(sizeof(*cond));
if (!cond)
@@ -491,7 +489,6 @@ void cobalt_condq_cleanup(cobalt_kqueues_t *q)
 void cobalt_cond_pkg_init(void)
 {
initq(cobalt_global_kqueues.condq);
-   pthread_condattr_init(default_cond_attr);
 }
 
 void