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

minor etimer code cleanup

Browse source
This commit is contained in:
fros4943 2009-06-09 19:38:38 +00:00
parent 7741d58cdb
commit 1a2084b597
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/cooja/config/contiki_template.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: contiki_template.c,v 1.14 2009/05/26 14:08:51 fros4943 Exp $ * $Id: contiki_template.c,v 1.15 2009/06/09 19:38:38 fros4943 Exp $
*/ */
/** /**
@ -267,16 +267,12 @@ Java_se_sics_cooja_corecomm_[CLASS_NAME]_tick(JNIEnv *env, jobject obj)
doActionsBeforeTick(); doActionsBeforeTick();
simNoYield = 0; simNoYield = 0;
/* Check if any e-timers are pending (save result for state decisions) */ /* Poll etimer process */
if (etimer_pending()) { if (etimer_pending()) {
/* Poll etimers */
etimer_request_poll(); etimer_request_poll();
simEtimerPending = 1;
} else {
simEtimerPending = 0;
} }
/* Let Contiki execute one or a part of the process_run()-function via the thread. /* Let Contiki handle a few events.
This call stores the process_run() return value */ This call stores the process_run() return value */
cooja_mt_exec(&process_run_thread); cooja_mt_exec(&process_run_thread);
@ -286,14 +282,12 @@ Java_se_sics_cooja_corecomm_[CLASS_NAME]_tick(JNIEnv *env, jobject obj)
simNoYield = 0; simNoYield = 0;
/* Look for new e-timers */ /* Look for new e-timers */
if (!simEtimerPending && etimer_pending()) { simEtimerPending = etimer_pending();
/* Poll etimers */
etimer_request_poll();
simEtimerPending = 1;
}
/* Save nearest event timer expiration time (0 if no timers) */ /* Save nearest event timer expiration time */
simNextExpirationTime = etimer_next_expiration_time() - simCurrentTime; if (simEtimerPending) {
simNextExpirationTime = etimer_next_expiration_time() - simCurrentTime;
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**