Module: xenomai-forge
Branch: next
Commit: 0488b2f1ffc9cb94c9c511ee01e6cdc6ecc052b1
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=0488b2f1ffc9cb94c9c511ee01e6cdc6ecc052b1
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Feb 20 17:06:14 2014 +0100
lib/cobalt: drop double-underscore prefix from API calls
---
include/copperplate/threadobj.h | 2 +-
lib/cobalt/assert_context.c | 4 ++--
lib/cobalt/internal.c | 8 ++++----
lib/cobalt/internal.h | 10 +++++-----
lib/cobalt/thread.c | 8 ++++----
lib/copperplate/eventobj.c | 2 +-
lib/copperplate/internal.c | 2 +-
lib/copperplate/semobj.c | 2 +-
lib/copperplate/threadobj.c | 4 ++--
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h
index 8a8942d..d5e4591 100644
--- a/include/copperplate/threadobj.h
+++ b/include/copperplate/threadobj.h
@@ -69,7 +69,7 @@ void threadobj_save_timeout(struct threadobj_corespec
*corespec,
{
/*
* We retrieve this information from the nucleus directly via
- * __cobalt_thread_stat().
+ * cobalt_thread_stat().
*/
}
diff --git a/lib/cobalt/assert_context.c b/lib/cobalt/assert_context.c
index 1332bb2..4e1adc1 100644
--- a/lib/cobalt/assert_context.c
+++ b/lib/cobalt/assert_context.c
@@ -33,9 +33,9 @@ static void assert_nrt_inner(void)
struct cobalt_threadstat stat;
int ret;
- ret = __cobalt_thread_stat(0, &stat);
+ ret = cobalt_thread_stat(0, &stat);
if (ret) {
- report_error("__cobalt_thread_stat() failed: %s",
+ report_error("cobalt_thread_stat() failed: %s",
strerror(-ret));
return;
}
diff --git a/lib/cobalt/internal.c b/lib/cobalt/internal.c
index 6d2b603..20b214f 100644
--- a/lib/cobalt/internal.c
+++ b/lib/cobalt/internal.c
@@ -34,7 +34,7 @@
#include "current.h"
#include "internal.h"
-void __cobalt_thread_harden(void)
+void cobalt_thread_harden(void)
{
unsigned long status = cobalt_get_current_mode();
@@ -43,13 +43,13 @@ void __cobalt_thread_harden(void)
XENOMAI_SYSCALL1(sc_nucleus_migrate, XENOMAI_XENO_DOMAIN);
}
-int __cobalt_thread_stat(pid_t pid, struct cobalt_threadstat *stat)
+int cobalt_thread_stat(pid_t pid, struct cobalt_threadstat *stat)
{
return XENOMAI_SKINCALL2(__cobalt_muxid,
sc_cobalt_thread_getstat, pid, stat);
}
-int __cobalt_thread_join(pthread_t thread)
+int cobalt_thread_join(pthread_t thread)
{
int ret, oldtype;
@@ -104,7 +104,7 @@ void ___cobalt_prefault(void *p, size_t len)
} while (_p < end);
}
-int __cobalt_serial_debug(const char *fmt, ...)
+int cobalt_serial_debug(const char *fmt, ...)
{
char msg[128];
va_list ap;
diff --git a/lib/cobalt/internal.h b/lib/cobalt/internal.h
index da7efa8..2589ef7 100644
--- a/lib/cobalt/internal.h
+++ b/lib/cobalt/internal.h
@@ -63,14 +63,14 @@ size_t cobalt_get_stacksize(size_t size);
void ___cobalt_prefault(void *p, size_t len);
#define __cobalt_prefault(p) ___cobalt_prefault(p, sizeof(*p))
-void __cobalt_thread_harden(void);
+void cobalt_thread_harden(void);
-int __cobalt_thread_stat(pid_t pid,
- struct cobalt_threadstat *stat);
+int cobalt_thread_stat(pid_t pid,
+ struct cobalt_threadstat *stat);
-int __cobalt_thread_join(pthread_t thread);
+int cobalt_thread_join(pthread_t thread);
-int __cobalt_serial_debug(const char *fmt, ...);
+int cobalt_serial_debug(const char *fmt, ...);
int cobalt_monitor_init(cobalt_monitor_t *mon,
clockid_t clk_id, int flags);
diff --git a/lib/cobalt/thread.c b/lib/cobalt/thread.c
index 699c85f..51c8a9c 100644
--- a/lib/cobalt/thread.c
+++ b/lib/cobalt/thread.c
@@ -119,7 +119,7 @@ int pthread_setschedparam_ex(pthread_t thread,
cobalt_sigshadow_install_once();
cobalt_set_current();
cobalt_set_current_window(u_winoff);
- __cobalt_thread_harden();
+ cobalt_thread_harden();
}
return ret;
@@ -283,7 +283,7 @@ sync_with_creator:
if (param_ex.sched_priority == parent_prio)
__cobalt_sched_yield();
- __cobalt_thread_harden();
+ cobalt_thread_harden();
retval = start(arg);
@@ -365,7 +365,7 @@ int pthread_create_ex(pthread_t *tid,
panic("regular sem_wait() failed with %s", symerror(ret));
}
- __cobalt_thread_harden(); /* May fail if regular thread. */
+ cobalt_thread_harden(); /* May fail if regular thread. */
fail:
__STD(sem_destroy(&iargs.sync));
@@ -485,7 +485,7 @@ COBALT_IMPL(int, pthread_join, (pthread_t thread, void
**retval))
if (ret)
return ret;
- ret = __cobalt_thread_join(thread);
+ ret = cobalt_thread_join(thread);
return ret == -EBUSY ? EINVAL : 0;
}
diff --git a/lib/copperplate/eventobj.c b/lib/copperplate/eventobj.c
index 30e7a2c..e0c2e2b 100644
--- a/lib/copperplate/eventobj.c
+++ b/lib/copperplate/eventobj.c
@@ -122,7 +122,7 @@ int eventobj_inquire(struct eventobj *evobj, size_t waitsz,
return nrwait;
for (n = 0; n < nrwait; n++, waitlist++) {
- ret = __cobalt_thread_stat(pidlist[n], &stat);
+ ret = cobalt_thread_stat(pidlist[n], &stat);
/* If waiter disappeared, fill in a dummy entry. */
if (ret) {
waitlist->pid = -1;
diff --git a/lib/copperplate/internal.c b/lib/copperplate/internal.c
index c110c0f..a7f86e7 100644
--- a/lib/copperplate/internal.c
+++ b/lib/copperplate/internal.c
@@ -117,7 +117,7 @@ static inline void prepare_wait_corespec(void)
* thread enters the run() handler over the Xenomai domain,
* which is a basic assumption for all clients.
*/
- __cobalt_thread_harden();
+ cobalt_thread_harden();
}
#else /* CONFIG_XENO_MERCURY */
diff --git a/lib/copperplate/semobj.c b/lib/copperplate/semobj.c
index 23e07a2..97338e2 100644
--- a/lib/copperplate/semobj.c
+++ b/lib/copperplate/semobj.c
@@ -149,7 +149,7 @@ int semobj_inquire(struct semobj *smobj, size_t waitsz,
return nrwait;
for (n = 0; n < nrwait; n++, waitlist++) {
- ret = __cobalt_thread_stat(pidlist[n], &stat);
+ ret = cobalt_thread_stat(pidlist[n], &stat);
/* If waiter disappeared, fill in a dummy entry. */
if (ret) {
waitlist->pid = -1;
diff --git a/lib/copperplate/threadobj.c b/lib/copperplate/threadobj.c
index e6e599e..b75d331 100644
--- a/lib/copperplate/threadobj.c
+++ b/lib/copperplate/threadobj.c
@@ -114,7 +114,7 @@ static inline void threadobj_cleanup_corespec(struct
threadobj *thobj)
static inline void threadobj_run_corespec(struct threadobj *thobj)
{
- __cobalt_thread_harden();
+ cobalt_thread_harden();
}
static inline void threadobj_cancel_corespec(struct threadobj *thobj) /*
thobj->lock held */
@@ -345,7 +345,7 @@ int threadobj_stat(struct threadobj *thobj, struct
threadobj_stat *p) /* thobj->
__threadobj_check_locked(thobj);
- ret = __cobalt_thread_stat(thobj->pid, &stat);
+ ret = cobalt_thread_stat(thobj->pid, &stat);
if (ret)
return __bt(ret);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
