[Tinyos-2-commits] CVS: tinyos-2.x/doc/txt tep119.txt,1.10,1.11

Tue May 6 15:21:06 PDT 2008

Update of /cvsroot/tinyos/tinyos-2.x/doc/txt
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31104/txt

Modified Files:
	tep119.txt 
Log Message:
Updates to 119.

Index: tep119.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/txt/tep119.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tep119.txt	4 May 2008 18:38:27 -0000	1.10
--- tep119.txt	6 May 2008 22:21:03 -0000	1.11
***************
*** 25,31 ****
  The memo documents the interfaces, components, and semantics used by
  collection protocol in TinyOS 2.x. Collection provides a best-effort,
! multihop delivery of packets to the root of *a* tree. There may be
! multiple roots in a network, and in this case the semantics implemented
! are of *anycast* delivery to at least one of the roots. A node sending
  a packet does not specify which root the packet is destined to.

--- 25,31 ----
  The memo documents the interfaces, components, and semantics used by
  collection protocol in TinyOS 2.x. Collection provides a best-effort,
! multihop delivery of packets to the root of a tree. There may be
! multiple tree roots in a network, and in this case the semantics
! are *anycast* delivery to at least one of the roots. A node sending
  a packet does not specify which root the packet is destined to.

***************
*** 75,80 ****
      from introducing interference for subsequent packets.

! The rest of this document describes a set of components and interfaces
! for a collection service outlined above.

  2. Collection interfaces
--- 75,82 ----
      from introducing interference for subsequent packets.

! While collection protocols can take a wide range of approaches to
! address these challenges, the programming interface they provide is
! typically independent of these details. The rest of this document
! describes a set of components and interfaces for collection services.

  2. Collection interfaces
***************
*** 82,114 ****

  A node can perform four different roles in collection: producer,
! consumer, snooper, and in-network processor. Depending on their role,
  the nodes use different interfaces to interact with the collection
  component. 

- A consumer is a root of a tree. The set of all roots and the paths that
- lead to them form the collection routing infrastructure in the network.
- For any connected set of nodes implementing the collection protocol 
- there is only one collection infrastructure, *i.e.*, all roots in this 
- set active at the same time are part of the same infrastructure.
- 
- A node is configured to become a root by using the RootControl
- interface. RootControl.setRoot() MUST make the current node a root of
- the collection infrastructure. RootControl.unsetRoot() MUST make
- the current root no longer a root in the collection infrastructure.
- Both calls are idempotent.  RootControl.setRoot() MAY be called on a
- node that is already a root, to no effect. RootControl.unsetRoot() MAY
- be called on a node that is not a root::
- 
-   interface RootControl {
-     command error_t setRoot();
-     command error_t unsetRoot();
-     command bool isRoot();
-   }
- 
- Both commands MUST return SUCCESS if the node is now in the specified
- state, and FAIL otherwise. For example, if a node is already a root
- and an application calls RootControl.setRoot(), the call will
- return SUCCESS.
- 
  The collection infrastructure can be multiplexed among independent
  applications, by means of a *collection identifier*. It is important
--- 84,91 ----

  A node can perform four different roles in collection: producer,
! snooper, in-network processor, and consumer. Depending on their role,
  the nodes use different interfaces to interact with the collection
  component. 

  The collection infrastructure can be multiplexed among independent
  applications, by means of a *collection identifier*. It is important
***************
*** 121,129 ****
  parameter to Send during instantiation.

- Root nodes that receive data from the network are *consumers*. The
- consumers use the Receive interface [1_] to receive a message
- delivered by collection. The collection identifier is specified
- as a parameter to Receive during instantiation.
- 
  The nodes that overhear messages in transit are *snoopers*. The
  snoopers use the Receive interface [1_] to receive a snooped
--- 98,101 ----
***************
*** 149,152 ****
--- 121,150 ----
  existing packet.

+ Root nodes that receive data from the network are *consumers*. The
+ consumers use the Receive interface [1_] to receive a message
+ delivered by collection. The collection identifier is specified
+ as a parameter to Receive during instantiation.
+ 
+ The set of all roots and the paths that
+ lead to them form the collection routing infrastructure in the network.
+ For any connected set of nodes implementing the collection protocol 
+ there is only one collection infrastructure, *i.e.*, all roots in this 
+ set active at the same time are part of the same infrastructure.
+ 
+ The RootControl interface configures whether a node is a
+ root::
+ 
+   interface RootControl {
+     command error_t setRoot();
+     command error_t unsetRoot();
+     command bool isRoot();
+   }
+ 
+ Both commands MUST return SUCCESS if the node is now in the specified
+ state, and FAIL otherwise. For example, if a node is already a root
+ and an application calls RootControl.setRoot(), the call will
+ return SUCCESS. If setRoot() returns SUCCESS, then a subsequent call
+ to isRoot() MUST return TRUE. If unsetRoot() returns SUCCESS, then
+ a subsequent call to isRoot() MUST return FALSE. 

  3 Collection Services
***************
*** 173,180 ****

! CollectionC MAY have additional interfaces, but they MUST have
! default functions on all outgoing invocations (commands for uses,
! events for provides) of those interfaces so that it can operate
! properly if they are not wired.

  Components SHOULD NOT wire to CollectionC.Send. The generic
--- 171,178 ----

! CollectionC MAY have additional interfaces. These additional
! interfaces MUST have default functions on all outgoing invocations
! (commands for uses, events for provides) of those interfaces so that
! it can operate properly if they are not wired.

  Components SHOULD NOT wire to CollectionC.Send. The generic
***************
*** 190,194 ****
  snoopers, intercepters, and receivers can parse it properly.

! Receive.receive MUST NOT be signaled on non-root
  nodes. CollectionC MAY signal Receive.receive on a root node when
  a data packet successfully arrives at that node. If a root node calls
--- 188,192 ----
  snoopers, intercepters, and receivers can parse it properly.

! ColletionC MUST NOT signal Receive.receive on non-root
  nodes. CollectionC MAY signal Receive.receive on a root node when
  a data packet successfully arrives at that node. If a root node calls