[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestArbiter/TestFcfsArbiter TestFcfsArbiterAppC.nc, NONE, 1.1.2.1 TestFcfsArbiterC.nc, NONE, 1.1.2.1 Makefile, 1.1.2.1, 1.1.2.2 README.txt, 1.1.2.1, 1.1.2.2 TestArbiterAppC.nc, 1.1.2.3, NONE TestArbiterC.nc, 1.1.2.3, NONE

Mon Oct 30 08:47:53 PST 2006

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestArbiter/TestFcfsArbiter
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3019/TestArbiter/TestFcfsArbiter

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile README.txt 
Added Files:
      Tag: tinyos-2_0_devel-BRANCH
	TestFcfsArbiterAppC.nc TestFcfsArbiterC.nc 
Removed Files:
      Tag: tinyos-2_0_devel-BRANCH
	TestArbiterAppC.nc TestArbiterC.nc 
Log Message:
Addition of Files to TestArbiter and TestAM directories

--- NEW FILE: TestFcfsArbiterAppC.nc ---
/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * 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 Technische Universitat Berlin 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 THE COPYRIGHT
 * OWNER OR 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.
 */

/**
 * Please refer to TEP 108 for more information about the components
 * this application is used to test. 
 *
 * This application is used to test the functionality of the
 * FcfsArbiter component developed using the Resource
 * interface. Three Resource users are created and all three request
 * control of the resource before any one of them is granted it.
 * Once the first user is granted control of the resource, a timer
 * is set to allow this user to have control of it for a specific
 * amount of time. Once this timer expires, the resource is released
 * and then immediately requested again. Upon releasing the resource
 * control will be granted to the next user that has
 * requested it in FCFS order. Initial requests are made
 * by the three resource users in the following order 
 * <li> Resource 0
 * <li> Resource 2
 * <li> Resource 1
 * 
 * It is expected then that using a first-come-first-serve policy, control of the
 * resource will be granted in the order of 0,2,1 and the Leds
 * corresponding to each resource will flash whenever this occurs. 
 * <li> Led 0 -> Resource 0
 * <li> Led 1 -> Resource 1
 * <li> Led 2 -> Resource 2
 * 
 *
 * @author Kevin Klues <klues at tkn.tu-berlin.de>
 * @version $Revision: 1.1.2.1 $
 * @date $Date: 2006/10/30 16:47:51 $
 */

#define TEST_ARBITER_RESOURCE   "Test.Arbiter.Resource"
configuration TestFcfsArbiterAppC{
}
implementation {
  components MainC, TestFcfsArbiterC as App,LedsC,
     new TimerMilliC() as Timer0,
     new TimerMilliC() as Timer1,
     new TimerMilliC() as Timer2,
     new FcfsArbiterC(TEST_ARBITER_RESOURCE) as Arbiter;

  enum {
    RESOURCE0_ID = unique(TEST_ARBITER_RESOURCE),
    RESOURCE1_ID = unique(TEST_ARBITER_RESOURCE),
    RESOURCE2_ID = unique(TEST_ARBITER_RESOURCE),
  };

  App -> MainC.Boot;

  App.Resource0 -> Arbiter.Resource[RESOURCE0_ID];
  App.Resource1 -> Arbiter.Resource[RESOURCE1_ID];
  App.Resource2 -> Arbiter.Resource[RESOURCE2_ID];
  App.Timer0 -> Timer0;
  App.Timer1 -> Timer1;
  App.Timer2 -> Timer2;

  App.Leds -> LedsC;
}

--- NEW FILE: TestFcfsArbiterC.nc ---
/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * 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 Technische Universitat Berlin 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 THE COPYRIGHT
 * OWNER OR 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.
 */

/**
 * Please refer to TEP 108 for more information about the components
 * this application is used to test
 *
 * This application is used to test the functionality of the
 * FcfsArbiter component developed using the Resource
 * interface. Three Resource users are created and all three request
 * control of the resource before any one of them is granted it.
 * Once the first user is granted control of the resource, a timer
 * is set to allow this user to have control of it for a specific
 * amount of time. Once this timer expires, the resource is released
 * and then immediately requested again. Upon releasing the resource
 * control will be granted to the next user that has
 * requested it in FCFS order. Initial requests are made
 * by the three resource users in the following order 
 * <li> Resource 0
 * <li> Resource 2
 * <li> Resource 1
 * 
 * It is expected then that using a first-come-first-serve policy, control of the
 * resource will be granted in the order of 0,2,1 and the Leds
 * corresponding to each resource will flash whenever this occurs. 
 * <li> Led 0 -> Resource 0
 * <li> Led 1 -> Resource 1
 * <li> Led 2 -> Resource 2
 * 
 *
 * @author Kevin Klues <klues at tkn.tu-berlin.de>
 * @version $Revision: 1.1.2.1 $
 * @date $Date: 2006/10/30 16:47:51 $
 */

#include "Timer.h"

module TestFcfsArbiterC {
  uses {
    interface Boot;  
    interface Leds;
    interface Resource as Resource0;
    interface Resource as Resource1;
    interface Resource as Resource2;
    interface Timer<TMilli> as Timer0;
    interface Timer<TMilli> as Timer1;
    interface Timer<TMilli> as Timer2;
  }
}
implementation {

  #define HOLD_PERIOD 250

  //All resources try to gain access
  event void Boot.booted() {
    call Resource0.request();
    call Resource2.request();
    call Resource1.request();
  }

  //If granted the resource, turn on an LED  
  event void Resource0.granted() {
    call Timer0.startOneShot(HOLD_PERIOD);
    call Leds.led0Toggle();      
  }  
  event void Resource1.granted() {
    call Timer1.startOneShot(HOLD_PERIOD);
    call Leds.led1Toggle();     
  }  
  event void Resource2.granted() {
    call Timer2.startOneShot(HOLD_PERIOD);
    call Leds.led2Toggle();  
  }  

  //After the hold period release the resource
  event void Timer0.fired() {
    call Resource0.release();
    call Resource0.request();
  }
  event void Timer1.fired() {
    call Resource1.release();
    call Resource1.request();
  }
  event void Timer2.fired() {
    call Resource2.release();
    call Resource2.request();
  }
}

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestArbiter/TestFcfsArbiter/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile	30 Jan 2006 17:46:59 -0000	1.1.2.1
--- Makefile	30 Oct 2006 16:47:51 -0000	1.1.2.2
***************
*** 1,4 ****
! COMPONENT=TestArbiterAppC
! CFLAGS += -I%T/lib/oski
  OPTFLAGS = -O0
  include $(MAKERULES)
--- 1,3 ----
! COMPONENT=TestFcfsArbiterAppC
  OPTFLAGS = -O0
  include $(MAKERULES)

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestArbiter/TestFcfsArbiter/README.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** README.txt	30 Jan 2006 17:46:59 -0000	1.1.2.1
--- README.txt	30 Oct 2006 16:47:51 -0000	1.1.2.2
***************
*** 22,26 ****
    -- Resource 2
    -- Resource 1
! It is expected then that using a round robin policy, control of the
  resource will be granted in the order of 0,2,1 and the Leds
  corresponding to each resource will flash whenever this occurs.
--- 22,26 ----
    -- Resource 2
    -- Resource 1
! It is expected then that using a first-come-first-serve policy, control of the
  resource will be granted in the order of 0,2,1 and the Leds
  corresponding to each resource will flash whenever this occurs.

--- TestArbiterAppC.nc DELETED ---

--- TestArbiterC.nc DELETED ---