From 9b94474b1017fc378428bd016b2cdedddff30d61 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Mon, 19 Apr 2010 16:13:15 -0600 Subject: [PATCH] Fix possible overwrite of state changes make in a component's Init.init() If a component using State and providing Init is wired to MainC.SoftwareInit, the component cannot reliably call State.forceState() inside its Init.init(). If ncc renders MainC.SoftwareInit.Init()'s fanout calling the component's Init.init() before StateImplP's Init.init(), the latter sets the state[] array members all to zero (S_IDLE), undoing any state change the component may have attempted. The easy fix is to remove the extra initiation of state[] in StateImplP's Init.init(). Becuase state[] is a static, its elements are guaranteed to have values of zero (S_IDLE). --- tos/system/StateImplP.nc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tos/system/StateImplP.nc b/tos/system/StateImplP.nc index 3883ac15..edcde832 100644 --- a/tos/system/StateImplP.nc +++ b/tos/system/StateImplP.nc @@ -79,10 +79,6 @@ implementation { /***************** Init Commands ****************/ command error_t Init.init() { - int i; - for(i = 0; i < uniqueCount(UQ_STATE); i++) { - state[i] = S_IDLE; - } return SUCCESS; } -- 2.39.2