From: klueska Date: Mon, 6 Oct 2008 04:42:00 +0000 (+0000) Subject: Added applications to test the join functionality for tosthreads X-Git-Tag: rc_6_tinyos_2_1_1~594 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=aeb53ad40af4c64b2e690ca68627f596587be971 Added applications to test the join functionality for tosthreads --- diff --git a/apps/tosthreads/apps/TestJoin/Makefile b/apps/tosthreads/apps/TestJoin/Makefile new file mode 100644 index 00000000..3cb12126 --- /dev/null +++ b/apps/tosthreads/apps/TestJoin/Makefile @@ -0,0 +1,3 @@ +COMPONENT=TestJoinAppC + +include $(MAKERULES) diff --git a/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc b/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc new file mode 100644 index 00000000..4a8e0862 --- /dev/null +++ b/apps/tosthreads/apps/TestJoin/TestJoinAppC.nc @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008 Stanford University. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * - Neither the name of the Stanford University nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STANFORD + * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Kevin Klues (klueska@cs.stanford.edu) + */ + +configuration TestJoinAppC { +} +implementation { + components MainC, TestJoinC, LedsC; + components new ThreadC(100) as NullThread; + components new ThreadC(100) as TinyThread0; + components new ThreadC(100) as TinyThread1; + components new ThreadC(100) as TinyThread2; + + MainC.Boot <- TestJoinC; + TestJoinC.NullThread -> NullThread; + TestJoinC.TinyThread0 -> TinyThread0; + TestJoinC.TinyThread1 -> TinyThread1; + TestJoinC.TinyThread2 -> TinyThread2; + + TestJoinC.Leds -> LedsC; +} + diff --git a/apps/tosthreads/apps/TestJoin/TestJoinC.nc b/apps/tosthreads/apps/TestJoin/TestJoinC.nc new file mode 100644 index 00000000..fa8c9753 --- /dev/null +++ b/apps/tosthreads/apps/TestJoin/TestJoinC.nc @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2008 Stanford University. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * - Neither the name of the Stanford University nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STANFORD + * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Kevin Klues (klueska@cs.stanford.edu) + */ + +module TestJoinC { + uses { + interface Boot; + interface Thread as NullThread; + interface Thread as TinyThread0; + interface Thread as TinyThread1; + interface Thread as TinyThread2; + interface Leds; + } +} + +implementation { + event void Boot.booted() { + call NullThread.start(NULL); + } + + event void NullThread.run(void* arg) { + for(;;){ + call TinyThread0.start(NULL); + call TinyThread1.start(NULL); + call TinyThread2.start(NULL); + call TinyThread1.join(); + call TinyThread0.join(); + call TinyThread2.join(); + } + } + event void TinyThread0.run(void* arg) { + int i; + for(i=0; i<2; i++){ + call Leds.led0Toggle(); + call TinyThread0.sleep(1000); + } + } + event void TinyThread1.run(void* arg) { + int i; + for(i=0; i<4; i++){ + call Leds.led1Toggle(); + call TinyThread1.sleep(1000); + } + } + event void TinyThread2.run(void* arg) { + int i; + for(i=0; i<6; i++){ + call Leds.led2Toggle(); + call TinyThread2.sleep(1000); + } + } +} diff --git a/apps/tosthreads/capps/TestJoin/Makefile b/apps/tosthreads/capps/TestJoin/Makefile new file mode 100644 index 00000000..37ac73cf --- /dev/null +++ b/apps/tosthreads/capps/TestJoin/Makefile @@ -0,0 +1,3 @@ +TOSTHREAD_MAIN=TestJoin.c + +include $(MAKERULES) diff --git a/apps/tosthreads/capps/TestJoin/TestJoin.c b/apps/tosthreads/capps/TestJoin/TestJoin.c new file mode 100644 index 00000000..0470c414 --- /dev/null +++ b/apps/tosthreads/capps/TestJoin/TestJoin.c @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2008 Stanford University. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * - Neither the name of the Stanford University nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STANFORD + * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Kevin Klues (klueska@cs.stanford.edu) + */ + +#include "stack.h" +#include "tosthread.h" +#include "tosthread_leds.h" + +//Initialize variables associated with each thread +tosthread_t init; +tosthread_t blink0; +tosthread_t blink1; +tosthread_t blink2; + +void init_thread(void* arg); +void blink0_thread(void* arg); +void blink1_thread(void* arg); +void blink2_thread(void* arg); + +void tosthread_main(void* arg) { + //Use stack estimator to calculate maximum stack size + // on a thread by thread basis + tosthread_create(&init, init_thread, NULL, INIT_STACK_SIZE); +} + +void init_thread(void* arg) { + for(;;) { + tosthread_create(&blink0, blink0_thread, NULL, BLINK0_STACK_SIZE); + tosthread_create(&blink1, blink1_thread, NULL, BLINK1_STACK_SIZE); + tosthread_create(&blink2, blink2_thread, NULL, BLINK2_STACK_SIZE); + tosthread_join(&blink2); + tosthread_join(&blink0); + tosthread_join(&blink1); + } +} + +void blink0_thread(void* arg) { + int i; + for(i=0; i<2; i++) { + led0Toggle(); + tosthread_sleep(1000); + } +} + +void blink1_thread(void* arg) { + int i; + for(i=0; i<4; i++) { + led1Toggle(); + tosthread_sleep(1000); + } +} + +void blink2_thread(void* arg) { + int i; + for(i=0; i<6; i++) { + led2Toggle(); + tosthread_sleep(1000); + } +} diff --git a/apps/tosthreads/capps/TestJoin/stack.h b/apps/tosthreads/capps/TestJoin/stack.h new file mode 100644 index 00000000..392794ad --- /dev/null +++ b/apps/tosthreads/capps/TestJoin/stack.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2008 Stanford University. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * - Neither the name of the Stanford University nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STANFORD + * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Kevin Klues + */ + +enum { + INIT_STACK_SIZE = 50, + BLINK0_STACK_SIZE = 200, + BLINK1_STACK_SIZE = 200, + BLINK2_STACK_SIZE = 200, +};