[Xenomai-git] Philippe Gerum : alchemy/alarm: oops, general fixage

[GIT version control]

Module: xenomai-forge
Branch: master
Commit: 18c69c4b668f12a1f4e3d4446b6b7f48611f67f2
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=18c69c4b668f12a1f4e3d4446b6b7f48611f67f2

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Nov 13 16:19:25 2011 +0100

alchemy/alarm: oops, general fixage

---

 lib/alchemy/alarm.c |   10 ++++++----
 lib/alchemy/alarm.h |    4 ++--
 lib/alchemy/init.c  |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/alchemy/alarm.c b/lib/alchemy/alarm.c
index 6a6720d..aaf28bc 100644
--- a/lib/alchemy/alarm.c
+++ b/lib/alchemy/alarm.c
@@ -25,7 +25,7 @@
 #include "alarm.h"
 #include "timer.h"
 
-struct cluster alchemy_alarm_table;
+struct pvcluster alchemy_alarm_table;
 
 static struct alchemy_namegen alarm_namegen = {
        .prefix = "alarm",
@@ -98,7 +98,7 @@ int rt_alarm_create(RT_ALARM *alarm, const char *name,
 
        alchemy_build_name(acb->name, name, &alarm_namegen);
 
-       if (cluster_addobj(&alchemy_alarm_table, acb->name, &acb->cobj)) {
+       if (pvcluster_addobj(&alchemy_alarm_table, acb->name, &acb->cobj)) {
                ret = -EEXIST;
                goto fail_cluster;
        }
@@ -109,13 +109,15 @@ int rt_alarm_create(RT_ALARM *alarm, const char *name,
 
        acb->handler = handler;
        acb->arg = arg;
+       acb->expiries = 0;
        acb->magic = alarm_magic;
+       alarm->handle = (uintptr_t)acb;
 
        COPPERPLATE_UNPROTECT(svc);
 
        return 0;
 fail_timer:
-       cluster_delobj(&alchemy_alarm_table, &acb->cobj);
+       pvcluster_delobj(&alchemy_alarm_table, &acb->cobj);
 fail_cluster:
        pvfree(acb);
 out:
@@ -137,7 +139,7 @@ int rt_alarm_delete(RT_ALARM *alarm)
                goto out;
 
        timerobj_destroy(&acb->tmobj);
-       cluster_delobj(&alchemy_alarm_table, &acb->cobj);
+       pvcluster_delobj(&alchemy_alarm_table, &acb->cobj);
        acb->magic = ~alarm_magic;
 out:
        COPPERPLATE_UNPROTECT(svc);
diff --git a/lib/alchemy/alarm.h b/lib/alchemy/alarm.h
index d5df27c..58adefa 100644
--- a/lib/alchemy/alarm.h
+++ b/lib/alchemy/alarm.h
@@ -27,7 +27,7 @@ struct alchemy_alarm {
        unsigned int magic;     /* Must be first. */
        char name[32];
        struct timerobj tmobj;
-       struct clusterobj cobj;
+       struct pvclusterobj cobj;
        void (*handler)(void *arg);
        void *arg;
        unsigned long expiries;
@@ -35,6 +35,6 @@ struct alchemy_alarm {
 
 #define alarm_magic    0x8888ebeb
 
-extern struct cluster alchemy_alarm_table;
+extern struct pvcluster alchemy_alarm_table;
 
 #endif /* _ALCHEMY_ALARM_H */
diff --git a/lib/alchemy/init.c b/lib/alchemy/init.c
index 4ae4b66..3130e4a 100644
--- a/lib/alchemy/init.c
+++ b/lib/alchemy/init.c
@@ -77,7 +77,7 @@ static int alchemy_init(int argc, char *const argv[])
        syncluster_init(&alchemy_queue_table, "alchemy.queue");
        syncluster_init(&alchemy_buffer_table, "alchemy.buffer");
        syncluster_init(&alchemy_buffer_table, "alchemy.heap");
-       cluster_init(&alchemy_alarm_table, "alchemy.alarm");
+       pvcluster_init(&alchemy_alarm_table, "alchemy.alarm");
 
        ret = clockobj_init(&alchemy_clock, "alchemy", clock_resolution);
        if (ret) {


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git