[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosthreads/lib/net/lqi ccollection.h, NONE, 1.1 CCollectionC.nc, 1.1, 1.2

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/lib/net/lqi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26882/net/lqi

Modified Files:
	CCollectionC.nc 
Added Files:
	ccollection.h 
Log Message:
Change to get rid of statically allocating space in collection queue

--- NEW FILE: ccollection.h ---
/*
 * 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 at cs.stanford.edu>
 */
 
#ifndef CCOLLECTION_H
#define CCOLLECTION_H

#include "message.h"
#include "TinyError.h"
#include "Collection.h"
#include "MultiHopLqi.h"

#define  NEW_COLLECTION_ID() ((collection_id_t)unique(UQ_LQI_CLIENT))

#endif //CCOLLECTION_H

Index: CCollectionC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CCollectionC.nc	17 Jun 2008 19:19:14 -0000	1.1
--- CCollectionC.nc	21 Aug 2008 04:23:00 -0000	1.2
***************
*** 46,59 ****
    components BlockingCollectionControlC;
    
-   //Allocate enough room in the message queue for all message types.
-   //This number needs to be 255-1-12 because 
-   //(1) The max number that can be provided to the Queue underneath for its size is 255
-   //(2) uniqueN() will give you values from 0..N constituting N+1 unique numbers
-   //(3) there are 12 spaces reserved in the send queue in CtpP for forwarding messages.
-   //I don't like this implementation, but it will do for now....
-   enum {
-    FIRST_CLIENT = uniqueN(UQ_LQI_CLIENT, 255-1-12),
-   };
-   
    CCP.BlockingReceive -> BlockingCollectionReceiverP;
    CCP.BlockingSnoop -> BlockingCollectionSnooperP;
--- 46,49 ----
***************
*** 65,68 ****
    CCP.CollectionPacket -> CollectionC;
    CCP.RootControl -> CollectionC;
-   CollectionC.CollectionId -> CCP;
  }
--- 55,57 ----