Merge pull request #602 from thingsconnected/pullreq1

mluis1 · web-flow · commit cbde060f21dd · 2018-12-18T09:20:42.000+01:00
Fixed TimerGetElapsedTime race conditions
diff --git a/src/mac/region/RegionAS923.c b/src/mac/region/RegionAS923.c
@@ -917,7 +917,8 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -933,7 +934,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionAU915.c b/src/mac/region/RegionAU915.c
@@ -917,7 +917,8 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
         }
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -933,7 +934,7 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionCN470.c b/src/mac/region/RegionCN470.c
@@ -734,7 +734,8 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[5] = 0xFFFF;
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -750,7 +751,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionCN779.c b/src/mac/region/RegionCN779.c
@@ -860,7 +860,8 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -876,7 +877,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionCommon.c b/src/mac/region/RegionCommon.c
@@ -185,14 +185,14 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*
         {
             if( dutyCycle == true )
             {
-                if( bands[i].TimeOff <= TimerGetElapsedTime( bands[i].LastTxDoneTime ) )
+                TimerTime_t elapsed = TimerGetElapsedTime( bands[i].LastTxDoneTime );
+                if( bands[i].TimeOff <= elapsed )
                 {
                     bands[i].TimeOff = 0;
                 }
                 if( bands[i].TimeOff != 0 )
                 {
-                    nextTxDelay = MIN( bands[i].TimeOff - TimerGetElapsedTime( bands[i].LastTxDoneTime ),
-                                       nextTxDelay );
+                    nextTxDelay = MIN( bands[i].TimeOff - elapsed, nextTxDelay );
                 }
             }
             else
diff --git a/src/mac/region/RegionEU433.c b/src/mac/region/RegionEU433.c
@@ -860,7 +860,8 @@ LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -876,7 +877,7 @@ LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionEU868.c b/src/mac/region/RegionEU868.c
@@ -892,7 +892,8 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -908,7 +909,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionIN865.c b/src/mac/region/RegionIN865.c
@@ -885,7 +885,8 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -901,7 +902,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionKR920.c b/src/mac/region/RegionKR920.c
@@ -854,7 +854,8 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -870,7 +871,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
@@ -851,7 +851,8 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -867,7 +868,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )
diff --git a/src/mac/region/RegionUS915.c b/src/mac/region/RegionUS915.c
@@ -1009,7 +1009,8 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
         }
     }
 
-    if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    if( nextChanParams->AggrTimeOff <= elapsed )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
@@ -1025,7 +1026,7 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
     else
     {
         delayTx++;
-        nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );
+        nextTxDelay = nextChanParams->AggrTimeOff - elapsed;
     }
 
     if( nbEnabledChannels > 0 )

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,8 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_`
`917`	`917`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 );`
`918`	`918`	`}`
`919`	`919`
`920`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`920`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`921`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`921`	`922`	`{`
`922`	`923`	`// Reset Aggregated time off`
`923`	`924`	`*aggregatedTimeOff = 0;`
`@@ -933,7 +934,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_`
`933`	`934`	`else`
`934`	`935`	`{`
`935`	`936`	`delayTx++;`
`936`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`937`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`937`	`938`	`}`
`938`	`939`
`939`	`940`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,8 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_`
`734`	`734`	`NvmCtx.ChannelsMask[5] = 0xFFFF;`
`735`	`735`	`}`
`736`	`736`
`737`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`737`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`738`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`738`	`739`	`{`
`739`	`740`	`// Reset Aggregated time off`
`740`	`741`	`*aggregatedTimeOff = 0;`
`@@ -750,7 +751,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_`
`750`	`751`	`else`
`751`	`752`	`{`
`752`	`753`	`delayTx++;`
`753`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`754`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`754`	`755`	`}`
`755`	`756`
`756`	`757`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,8 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_`
`860`	`860`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`861`	`861`	`}`
`862`	`862`
`863`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`863`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`864`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`864`	`865`	`{`
`865`	`866`	`// Reset Aggregated time off`
`866`	`867`	`*aggregatedTimeOff = 0;`
`@@ -876,7 +877,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_`
`876`	`877`	`else`
`877`	`878`	`{`
`878`	`879`	`delayTx++;`
`879`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`880`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`880`	`881`	`}`
`881`	`882`
`882`	`883`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -185,14 +185,14 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*`
`185`	`185`	`{`
`186`	`186`	`if( dutyCycle == true )`
`187`	`187`	`{`
`188`		`- if( bands[i].TimeOff <= TimerGetElapsedTime( bands[i].LastTxDoneTime ) )`
	`188`	`+ TimerTime_t elapsed = TimerGetElapsedTime( bands[i].LastTxDoneTime );`
	`189`	`+ if( bands[i].TimeOff <= elapsed )`
`189`	`190`	`{`
`190`	`191`	`bands[i].TimeOff = 0;`
`191`	`192`	`}`
`192`	`193`	`if( bands[i].TimeOff != 0 )`
`193`	`194`	`{`
`194`		`- nextTxDelay = MIN( bands[i].TimeOff - TimerGetElapsedTime( bands[i].LastTxDoneTime ),`
`195`		`- nextTxDelay );`
	`195`	`+ nextTxDelay = MIN( bands[i].TimeOff - elapsed, nextTxDelay );`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`else`
Original file line number	Diff line number	Diff line change
`@@ -892,7 +892,8 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_`
`892`	`892`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`893`	`893`	`}`
`894`	`894`
`895`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`895`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`896`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`896`	`897`	`{`
`897`	`898`	`// Reset Aggregated time off`
`898`	`899`	`*aggregatedTimeOff = 0;`
`@@ -908,7 +909,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_`
`908`	`909`	`else`
`909`	`910`	`{`
`910`	`911`	`delayTx++;`
`911`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`912`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`912`	`913`	`}`
`913`	`914`
`914`	`915`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,8 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_`
`885`	`885`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`886`	`886`	`}`
`887`	`887`
`888`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`888`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`889`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`889`	`890`	`{`
`890`	`891`	`// Reset Aggregated time off`
`891`	`892`	`*aggregatedTimeOff = 0;`
`@@ -901,7 +902,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_`
`901`	`902`	`else`
`902`	`903`	`{`
`903`	`904`	`delayTx++;`
`904`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`905`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`905`	`906`	`}`
`906`	`907`
`907`	`908`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,8 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_`
`854`	`854`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`855`	`855`	`}`
`856`	`856`
`857`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`857`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`858`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`858`	`859`	`{`
`859`	`860`	`// Reset Aggregated time off`
`860`	`861`	`*aggregatedTimeOff = 0;`
`@@ -870,7 +871,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_`
`870`	`871`	`else`
`871`	`872`	`{`
`872`	`873`	`delayTx++;`
`873`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`874`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`874`	`875`	`}`
`875`	`876`
`876`	`877`	`if( nbEnabledChannels > 0 )`
Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,8 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_`
`851`	`851`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 );`
`852`	`852`	`}`
`853`	`853`
`854`		`- if( nextChanParams->AggrTimeOff <= TimerGetElapsedTime( nextChanParams->LastAggrTx ) )`
	`854`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`855`	`+ if( nextChanParams->AggrTimeOff <= elapsed )`
`855`	`856`	`{`
`856`	`857`	`// Reset Aggregated time off`
`857`	`858`	`*aggregatedTimeOff = 0;`
`@@ -867,7 +868,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_`
`867`	`868`	`else`
`868`	`869`	`{`
`869`	`870`	`delayTx++;`
`870`		`- nextTxDelay = nextChanParams->AggrTimeOff - TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`871`	`+ nextTxDelay = nextChanParams->AggrTimeOff - elapsed;`
`871`	`872`	`}`
`872`	`873`
`873`	`874`	`if( nbEnabledChannels > 0 )`