Module: xenomai-forge
Branch: master
Commit: 1b4cff66bf016be722f68ee0e0220f68abcc9894
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=1b4cff66bf016be722f68ee0e0220f68abcc9894
Author: Philippe Gerum <r...@xenomai.org>
Date: Wed Dec 14 14:11:02 2011 +0100
alchemy/testsuite: prevent 32bit overflow with time constants
---
lib/alchemy/testsuite/alarm-1.c | 4 ++--
lib/alchemy/testsuite/buffer-1.c | 2 +-
lib/alchemy/testsuite/event-1.c | 2 +-
lib/alchemy/testsuite/heap-1.c | 2 +-
lib/alchemy/testsuite/mq-1.c | 2 +-
lib/alchemy/testsuite/mq-2.c | 2 +-
lib/alchemy/testsuite/mq-3.c | 4 ++--
lib/alchemy/testsuite/mutex-1.c | 2 +-
lib/alchemy/testsuite/sem-1.c | 4 ++--
lib/alchemy/testsuite/task-2.c | 2 +-
lib/alchemy/testsuite/task-4.c | 2 +-
lib/alchemy/testsuite/task-6.c | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lib/alchemy/testsuite/alarm-1.c b/lib/alchemy/testsuite/alarm-1.c
index e29ed4d..83d236d 100644
--- a/lib/alchemy/testsuite/alarm-1.c
+++ b/lib/alchemy/testsuite/alarm-1.c
@@ -37,7 +37,7 @@ static void alarm_handler(void *arg)
}
traceobj_mark(&trobj, 4);
- ret = rt_alarm_start(&alrm, 200000000, 200000000);
+ ret = rt_alarm_start(&alrm, 200000000ULL, 200000000ULL);
traceobj_assert(&trobj, ret == 0);
}
@@ -56,7 +56,7 @@ static void main_task(void *arg)
ret = rt_alarm_create(&alrm, "ALARM", alarm_handler, &alrm);
traceobj_assert(&trobj, ret == 0);
- ret = rt_alarm_start(&alrm, 200000000, 200000000);
+ ret = rt_alarm_start(&alrm, 200000000ULL, 200000000ULL);
traceobj_assert(&trobj, ret == 0);
traceobj_mark(&trobj, 6);
diff --git a/lib/alchemy/testsuite/buffer-1.c b/lib/alchemy/testsuite/buffer-1.c
index 8d46d8a..f0997bd 100644
--- a/lib/alchemy/testsuite/buffer-1.c
+++ b/lib/alchemy/testsuite/buffer-1.c
@@ -92,7 +92,7 @@ int main(int argc, char *const argv[])
ret = rt_task_start(&t_bgnd, background_task, NULL);
traceobj_assert(&trobj, ret == 0);
- ret = rt_task_sleep(1500000000);
+ ret = rt_task_sleep(1500000000ULL);
traceobj_assert(&trobj, ret == 0);
ret = rt_task_delete(&t_bgnd);
diff --git a/lib/alchemy/testsuite/event-1.c b/lib/alchemy/testsuite/event-1.c
index 63a0e73..6850f9a 100644
--- a/lib/alchemy/testsuite/event-1.c
+++ b/lib/alchemy/testsuite/event-1.c
@@ -53,7 +53,7 @@ static void foreground_task(void *arg)
traceobj_assert(&trobj, flags == 2 << n * 2);
}
- rt_task_sleep(1000000);
+ rt_task_sleep(1000000ULL);
ret = rt_event_delete(&event);
traceobj_assert(&trobj, ret == 0);
diff --git a/lib/alchemy/testsuite/heap-1.c b/lib/alchemy/testsuite/heap-1.c
index 008f73f..c626d5d 100644
--- a/lib/alchemy/testsuite/heap-1.c
+++ b/lib/alchemy/testsuite/heap-1.c
@@ -58,7 +58,7 @@ static void foreground_task(void *arg)
ret = rt_heap_free(&heap, p2);
traceobj_assert(&trobj, ret == 0);
- rt_task_sleep(1000000);
+ rt_task_sleep(1000000ULL);
ret = rt_heap_delete(&heap);
traceobj_assert(&trobj, ret == 0);
diff --git a/lib/alchemy/testsuite/mq-1.c b/lib/alchemy/testsuite/mq-1.c
index 41b4fc0..4a418b9 100644
--- a/lib/alchemy/testsuite/mq-1.c
+++ b/lib/alchemy/testsuite/mq-1.c
@@ -79,7 +79,7 @@ static void main_task(void *arg)
traceobj_assert(&trobj, ret == 0);
traceobj_assert(&trobj, info.nmessages == 0);
- ret = rt_queue_read(&q, &msg, sizeof(msg), 1000000);
+ ret = rt_queue_read(&q, &msg, sizeof(msg), 1000000ULL);
traceobj_assert(&trobj, ret == -ETIMEDOUT);
ret = rt_queue_delete(&q);
diff --git a/lib/alchemy/testsuite/mq-2.c b/lib/alchemy/testsuite/mq-2.c
index 7810275..1b3fce8 100644
--- a/lib/alchemy/testsuite/mq-2.c
+++ b/lib/alchemy/testsuite/mq-2.c
@@ -81,7 +81,7 @@ static void main_task(void *arg)
traceobj_mark(&trobj, 6);
- rt_task_sleep(10000000);
+ rt_task_sleep(10000000ULL);
traceobj_mark(&trobj, 7);
diff --git a/lib/alchemy/testsuite/mq-3.c b/lib/alchemy/testsuite/mq-3.c
index a31e4d8..d4c6a78 100644
--- a/lib/alchemy/testsuite/mq-3.c
+++ b/lib/alchemy/testsuite/mq-3.c
@@ -39,7 +39,7 @@ static void main_task(void *arg)
ret = rt_queue_write(&q, &msg, sizeof(int), Q_URGENT);
traceobj_assert(&trobj, ret == -ENOMEM);
- rt_task_sleep(100000000);
+ rt_task_sleep(100000000ULL);
ret = rt_queue_write(&q, &msg, sizeof(int), Q_URGENT);
traceobj_assert(&trobj, ret == 0);
@@ -79,7 +79,7 @@ static void peer_task(void *arg)
traceobj_mark(&trobj, 14);
- rt_task_sleep(100000000);
+ rt_task_sleep(100000000ULL);
traceobj_mark(&trobj, 9);
diff --git a/lib/alchemy/testsuite/mutex-1.c b/lib/alchemy/testsuite/mutex-1.c
index 2378909..8b9fc22 100644
--- a/lib/alchemy/testsuite/mutex-1.c
+++ b/lib/alchemy/testsuite/mutex-1.c
@@ -35,7 +35,7 @@ static void task_a(void *arg)
traceobj_mark(&trobj, 3);
- ret = rt_mutex_acquire(&mutex, 100000000);
+ ret = rt_mutex_acquire(&mutex, 100000000ULL);
traceobj_assert(&trobj, ret == -ETIMEDOUT);
traceobj_mark(&trobj, 4);
diff --git a/lib/alchemy/testsuite/sem-1.c b/lib/alchemy/testsuite/sem-1.c
index 06e042d..4ba2e98 100644
--- a/lib/alchemy/testsuite/sem-1.c
+++ b/lib/alchemy/testsuite/sem-1.c
@@ -105,7 +105,7 @@ static void task_b(void *arg)
traceobj_mark(&trobj, 16);
- ret = rt_sem_p(&sem, 10000000);
+ ret = rt_sem_p(&sem, 10000000ULL);
traceobj_assert(&trobj, ret == 0);
traceobj_mark(&trobj, 17);
@@ -115,7 +115,7 @@ static void task_b(void *arg)
traceobj_mark(&trobj, 18);
- ret = rt_sem_p(&sem, 100000000);
+ ret = rt_sem_p(&sem, 100000000ULL);
traceobj_assert(&trobj, ret == -ETIMEDOUT);
traceobj_mark(&trobj, 19);
diff --git a/lib/alchemy/testsuite/task-2.c b/lib/alchemy/testsuite/task-2.c
index 52d5289..8f2297b 100644
--- a/lib/alchemy/testsuite/task-2.c
+++ b/lib/alchemy/testsuite/task-2.c
@@ -50,7 +50,7 @@ static void foreground_task(void *arg)
traceobj_mark(&trobj, 5);
- rt_task_sleep(20000000);
+ rt_task_sleep(20000000ULL);
traceobj_mark(&trobj, 6);
diff --git a/lib/alchemy/testsuite/task-4.c b/lib/alchemy/testsuite/task-4.c
index 907c39b..d1cc2ff 100644
--- a/lib/alchemy/testsuite/task-4.c
+++ b/lib/alchemy/testsuite/task-4.c
@@ -31,7 +31,7 @@ static void background_task(void *arg)
ret = rt_task_suspend(&t_fgnd);
traceobj_assert(&trobj, ret == 0);
- rt_task_sleep(20000000);
+ rt_task_sleep(20000000ULL);
traceobj_mark(&trobj, 3);
diff --git a/lib/alchemy/testsuite/task-6.c b/lib/alchemy/testsuite/task-6.c
index a4afaac..27589ba 100644
--- a/lib/alchemy/testsuite/task-6.c
+++ b/lib/alchemy/testsuite/task-6.c
@@ -39,7 +39,7 @@ static void foreground_task(void *arg)
traceobj_enter(&trobj);
for (msg = 0; msg < 10; msg++) {
- rt_task_sleep(1000000);
+ rt_task_sleep(1000000ULL);
mcb.opcode = 0x77;
mcb.data = &msg;
mcb.size = sizeof(msg);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
