deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed busy-wait while receiving radio data (just stay awake)

Browse source
This commit is contained in:
fros4943 2006-10-05 12:09:40 +00:00
parent cd2fbcdbd8
commit 837f71e8dd
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/cooja/dev/radio-arch.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: radio-arch.c,v 1.3 2006/10/05 07:46:53 fros4943 Exp $ * $Id: radio-arch.c,v 1.4 2006/10/05 12:09:40 fros4943 Exp $
*/ */
#include "dev/radio-arch.h" #include "dev/radio-arch.h"
@ -68,9 +68,9 @@ doInterfaceActionsBeforeTick(void)
return; return;
} }
// Busy-wait while receiving (in main file) // Don't fall asleep while receiving (in main file)
if (simReceiving) { if (simReceiving) {
busyWaitNext = 1; simDontFallAsleep = 1;
return; return;
} }

4
platform/cooja/lib/simEnvChange.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: simEnvChange.c,v 1.2 2006/10/02 15:05:49 fros4943 Exp $ * $Id: simEnvChange.c,v 1.3 2006/10/05 12:09:53 fros4943 Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -37,7 +37,7 @@
// All registered interfaces // All registered interfaces
extern const struct simInterface *simInterfaces[]; extern const struct simInterface *simInterfaces[];
char busyWaitNext = 0; char simDontFallAsleep = 0;
int simProcessRunValue; int simProcessRunValue;
int simEtimerPending; int simEtimerPending;

6
platform/cooja/lib/simEnvChange.h
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: simEnvChange.h,v 1.2 2006/10/02 15:05:49 fros4943 Exp $ * $Id: simEnvChange.h,v 1.3 2006/10/05 12:09:53 fros4943 Exp $
*/ */
#ifndef __SIMENVCHANGE_H__ #ifndef __SIMENVCHANGE_H__
@ -43,8 +43,8 @@ extern int simProcessRunValue;
extern int simEtimerPending; extern int simEtimerPending;
extern int simNextExpirationTime; extern int simNextExpirationTime;
// Variable that if set to != 0, immediately yields before then next process_run() call // Variable that when set to != 0, stops the mote from falling asleep next tick
extern char busyWaitNext; extern char simDontFallAsleep;
// Definition for registering an interface // Definition for registering an interface
#define SIM_INTERFACE(name, doActionsBeforeTick, doActionsAfterTick) \ #define SIM_INTERFACE(name, doActionsBeforeTick, doActionsAfterTick) \

14
tools/cooja/config/code_main_template
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: code_main_template,v 1.6 2006/10/05 07:48:15 fros4943 Exp $ * $Id: code_main_template,v 1.7 2006/10/05 12:10:12 fros4943 Exp $
*/ */
/** /**
@ -116,14 +116,14 @@ start_process_run_loop(void *data)
/* Always pretend we have processes left while inside process_run() */ /* Always pretend we have processes left while inside process_run() */
simProcessRunValue = 1; simProcessRunValue = 1;
// Busy-wait while receiving
while (busyWaitNext > 0) {
busyWaitNext--;
cooja_mt_yield();
}
simProcessRunValue = process_run(); simProcessRunValue = process_run();
// Check if we must stay awake
if (simDontFallAsleep) {
simDontFallAsleep=0;
simProcessRunValue = 1;
}
/* Yield thread when one process_run has completed */ /* Yield thread when one process_run has completed */
cooja_mt_yield(); cooja_mt_yield();
} }