X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=apps%2Ftosthreads%2Fapps%2FTestJoin%2FTestJoinC.nc;h=13a2c2a5bb274a86cdabdbf1b3918aeeca16037b;hb=82b0ae40259e7b3a31b13b9a379d82c2011fd4c4;hp=fa8c9753fbf29973e650a965c2f776fa4f76a606;hpb=8b80d9d0c58ecf3012efb74ec3d4d1f5e599ccda;p=tinyos-2.x.git

diff --git a/apps/tosthreads/apps/TestJoin/TestJoinC.nc b/apps/tosthreads/apps/TestJoin/TestJoinC.nc
index fa8c9753..13a2c2a5 100644
--- a/apps/tosthreads/apps/TestJoin/TestJoinC.nc
+++ b/apps/tosthreads/apps/TestJoin/TestJoinC.nc
@@ -30,6 +30,14 @@
  */
  
 /**
+ * TestJoin is a simple application used to test the basic functionality of
+ * the join() system call for waiting on a set of threads in a TOSThreads 
+ * based application.
+ * 
+ * Upon a successful burn, you should first see LED0 flash twice with a period of
+ * 1s and LED1 flash 4 times with a period of 1s. After these are done,
+ * LED2 should come on and stay on.
+ *
  * @author Kevin Klues (klueska@cs.stanford.edu)
  */
 
@@ -39,7 +47,6 @@ module TestJoinC {
     interface Thread as NullThread;
     interface Thread as TinyThread0;
     interface Thread as TinyThread1;
-    interface Thread as TinyThread2;
     interface Leds;
   }
 }
@@ -53,10 +60,9 @@ implementation {
     for(;;){
       call TinyThread0.start(NULL);
       call TinyThread1.start(NULL);
-      call TinyThread2.start(NULL);
-      call TinyThread1.join();
       call TinyThread0.join();
-      call TinyThread2.join();
+      call TinyThread1.join();
+      call Leds.led2Toggle();
     }
   }  
   event void TinyThread0.run(void* arg) {
@@ -73,11 +79,4 @@ implementation {
       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);
-    }
-  }
 }