From 1bcdc760d06541d8a89e58e3e1a970c658db66d7 Mon Sep 17 00:00:00 2001 From: klueska Date: Thu, 21 Aug 2008 04:22:07 +0000 Subject: [PATCH] Change to get rid of statically allocating space in collection queue --- .../TestCollection/MultihopOscilloscope.h | 4 +- .../tosthreads/lib/net/ctp/CCollectionC.nc | 10 ---- tos/lib/tosthreads/lib/net/ctp/ccollection.h | 46 +++++++++++++++++++ .../tosthreads/lib/net/lqi/CCollectionC.nc | 11 ----- tos/lib/tosthreads/lib/net/lqi/ccollection.h | 46 +++++++++++++++++++ .../tosthreads/lib/net/tosthread_collection.h | 4 +- 6 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 tos/lib/tosthreads/lib/net/ctp/ccollection.h create mode 100644 tos/lib/tosthreads/lib/net/lqi/ccollection.h diff --git a/apps/tosthreads/capps/TestCollection/MultihopOscilloscope.h b/apps/tosthreads/capps/TestCollection/MultihopOscilloscope.h index 5f040539..437bd510 100644 --- a/apps/tosthreads/capps/TestCollection/MultihopOscilloscope.h +++ b/apps/tosthreads/capps/TestCollection/MultihopOscilloscope.h @@ -16,13 +16,15 @@ #ifndef MULTIHOP_OSCILLOSCOPE_H #define MULTIHOP_OSCILLOSCOPE_H +#include "Collection.h" + enum { /* Number of readings per message. If you increase this, you may have to increase the message_t size. */ NREADINGS = 5, /* Default sampling period. */ DEFAULT_INTERVAL = 1024, - AM_OSCILLOSCOPE = 0x93 + AM_OSCILLOSCOPE = NEW_COLLECTION_ID(), }; typedef nx_struct oscilloscope { diff --git a/tos/lib/tosthreads/lib/net/ctp/CCollectionC.nc b/tos/lib/tosthreads/lib/net/ctp/CCollectionC.nc index 7508b706..6e17b7a0 100644 --- a/tos/lib/tosthreads/lib/net/ctp/CCollectionC.nc +++ b/tos/lib/tosthreads/lib/net/ctp/CCollectionC.nc @@ -45,16 +45,6 @@ implementation { components BlockingCollectionSenderP; 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_CTP_CLIENT, 255-1-12), - }; - CCP.BlockingReceive -> BlockingCollectionReceiverP; CCP.BlockingSnoop -> BlockingCollectionSnooperP; CCP.BlockingSend -> BlockingCollectionSenderP; diff --git a/tos/lib/tosthreads/lib/net/ctp/ccollection.h b/tos/lib/tosthreads/lib/net/ctp/ccollection.h new file mode 100644 index 00000000..4c8f9d24 --- /dev/null +++ b/tos/lib/tosthreads/lib/net/ctp/ccollection.h @@ -0,0 +1,46 @@ +/* + * 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 + */ + +#ifndef CCOLLECTION_H +#define CCOLLECTION_H + +#include "message.h" +#include "TinyError.h" +#include "Collection.h" +#include "Ctp.h" + +#define NEW_COLLECTION_ID() ((collection_id_t)unique(UQ_CTP_CLIENT)) + +#endif //CCOLLECTION_H diff --git a/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc b/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc index ecbb4a65..1b1dca26 100644 --- a/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc +++ b/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc @@ -45,16 +45,6 @@ implementation { components BlockingCollectionSenderP; 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; CCP.BlockingSend -> BlockingCollectionSenderP; @@ -64,5 +54,4 @@ implementation { CCP.Packet -> CollectionC; CCP.CollectionPacket -> CollectionC; CCP.RootControl -> CollectionC; - CollectionC.CollectionId -> CCP; } diff --git a/tos/lib/tosthreads/lib/net/lqi/ccollection.h b/tos/lib/tosthreads/lib/net/lqi/ccollection.h new file mode 100644 index 00000000..c18e2636 --- /dev/null +++ b/tos/lib/tosthreads/lib/net/lqi/ccollection.h @@ -0,0 +1,46 @@ +/* + * 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 + */ + +#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 diff --git a/tos/lib/tosthreads/lib/net/tosthread_collection.h b/tos/lib/tosthreads/lib/net/tosthread_collection.h index 4bdfb30e..9941ac07 100644 --- a/tos/lib/tosthreads/lib/net/tosthread_collection.h +++ b/tos/lib/tosthreads/lib/net/tosthread_collection.h @@ -36,9 +36,7 @@ #ifndef TOSTHREAD_COLLECTION_H #define TOSTHREAD_COLLECTION_H -#include "message.h" -#include "TinyError.h" -#include "Collection.h" +#include "ccollection.h" extern error_t collectionRoutingStart(); extern error_t collectionRoutingStop(); -- 2.39.2