Skip to content

Unify how timeouts are handled for TCP state machine #456

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 17 commits into from
May 13, 2024
Merged

Unify how timeouts are handled for TCP state machine #456

merged 17 commits into from
May 13, 2024

Conversation

pennam
Copy link
Collaborator

@pennam pennam commented May 13, 2024 •
edited
Loading

Same as #441 to be merged on master

pennam added 17 commits April 9, 2024 14:53
@pennam
Add missing debug print
d8254d0
@pennam
Simplify Connect/Disconnect Attach/Detach logic
16ad787
@pennam
Simplify Attach/Detach timeout logic
68e3d97
@pennam
Add comments and DEBUG
baf69e4
@pennam
Reorder functions implementation
5c9db23
@pennam
Unify naming and logic of thing susbscribe retry
3aeb4ab
@pennam
Reorder timeout variables declaration and initialization
0c21a29
@pennam
Unify naming and logic of last values request retry
8d84dcd
@pennam
Remove WaitDeviceConfig state
ca26344
@pennam
We can safely send another subscribe request without unsubscribe
30dde27
@pennam
Merge disconnect conditions
03e87ba
@pennam
Reorder timeout and retry defines
a7f0559
@pennam
Add specific define for max number of retry connecting to device topic
c9d808b
@pennam
Add Class to handle retries and state transitions
5d9f39d
@pennam
TimedAttempt: add variable to store next attempt wait time
2f12cb9
@pennam
TimedAttempt: add getWaitTime()
a7c28d7
@pennam
ArduinoIoTCloudTCP: use getWaitTime() for broker connection retry
51710f3
@codecov Codecov
Copy link

codecov bot commented May 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.04%. Comparing base (b629c11) to head (51710f3).
Report is 23 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master     #456   +/-   ##
=======================================
  Coverage   95.04%   95.04%           
=======================================
  Files          27       27           
  Lines        1231     1231           
=======================================
  Hits         1170     1170           
  Misses         61       61

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pennam pennam added topic: code Related to content of the project itself type: enhancement Proposed improvement labels May 13, 2024
@pennam pennam requested a review from andreagilardoni May 13, 2024 09:40
@github-actions GitHub Actions
Copy link

Memory usage change @ 51710f3

Board flash % RAM for global variables %
arduino:esp32:nano_nora 🔺 +8 - +24 0.0 - 0.0 💚 -16 - -16 -0.0 - -0.0
arduino:mbed_edge:edge_control 💚 -136 - -136 -0.01 - -0.01 💚 -24 - -16 -0.01 - -0.01
arduino:mbed_giga:giga 💚 -200 - 0 -0.01 - 0.0 💚 -32 - 0 -0.01 - 0.0
arduino:mbed_nano:nanorp2040connect 💚 -220 - 0 -0.0 - 0.0 💚 -16 - 0 -0.01 - 0.0
arduino:mbed_nicla:nicla_vision 💚 -136 - 0 -0.01 - 0.0 💚 -32 - 0 -0.01 - 0.0
arduino:mbed_opta:opta 💚 -200 - 0 -0.01 - 0.0 💚 -32 - 0 -0.01 - 0.0
arduino:mbed_portenta:envie_m7 N/A N/A N/A N/A
arduino:renesas_portenta:portenta_c33 💚 -136 - 0 -0.01 - 0.0 💚 -32 - 0 -0.01 - 0.0
arduino:renesas_uno:unor4wifi 💚 -136 - -120 -0.05 - -0.05 💚 -16 - -16 -0.05 - -0.05
arduino:samd:mkr1000 💚 -208 - 0 -0.08 - 0.0 💚 -16 - 0 -0.05 - 0.0
arduino:samd:mkrgsm1400 💚 -200 - 0 -0.08 - 0.0 💚 -16 - 0 -0.05 - 0.0
arduino:samd:mkrnb1500 💚 -208 - 0 -0.08 - 0.0 💚 -16 - 0 -0.05 - 0.0
arduino:samd:mkrwan1300 0 - 0 0.0 - 0.0 0 - 0 0.0 - 0.0
arduino:samd:mkrwifi1010 💚 -200 - 0 -0.08 - 0.0 💚 -16 - 0 -0.05 - 0.0
arduino:samd:nano_33_iot 💚 -200 - 0 -0.08 - 0.0 💚 -16 - 0 -0.05 - 0.0
esp32:esp32:esp32 🔺 +4 - +28 0.0 - 0.0 💚 -16 - -16 -0.0 - -0.0
esp8266:esp8266:huzzah 💚 -156 - -136 -0.01 - -0.01 💚 -92 - -60 -0.11 - -0.07
Click for full report table
Board examples/ArduinoIoTCloud-Advanced
flash		 % examples/ArduinoIoTCloud-Advanced
RAM for global variables		 % examples/ArduinoIoTCloud-Basic
flash		 % examples/ArduinoIoTCloud-Basic
RAM for global variables		 % examples/ArduinoIoTCloud-Callbacks
flash		 % examples/ArduinoIoTCloud-Callbacks
RAM for global variables		 % examples/ArduinoIoTCloud-Schedule
flash		 % examples/ArduinoIoTCloud-Schedule
RAM for global variables		 % examples/utility/ArduinoIoTCloud_Travis_CI
flash		 % examples/utility/ArduinoIoTCloud_Travis_CI
RAM for global variables		 % examples/ArduinoIoTCloud-DeferredOTA
flash		 % examples/ArduinoIoTCloud-DeferredOTA
RAM for global variables		 % examples/utility/Provisioning
flash		 % examples/utility/Provisioning
RAM for global variables		 % examples/utility/SelfProvisioning
flash		 % examples/utility/SelfProvisioning
RAM for global variables		 %
arduino:esp32:nano_nora 24 0.0 -16 -0.0 24 0.0 -16 -0.0 8 0.0 -16 -0.0 8 0.0 -16 -0.0 8 0.0 -16 -0.0 8 0.0 -16 -0.0
arduino:mbed_edge:edge_control -136 -0.01 -16 -0.01 -136 -0.01 -24 -0.01 -136 -0.01 -16 -0.01 -136 -0.01 -24 -0.01 -136 -0.01 -24 -0.01
arduino:mbed_giga:giga -136 -0.01 -32 -0.01 -136 -0.01 0 0.0 -136 -0.01 -32 -0.01 -136 -0.01 0 0.0 -200 -0.01 0 0.0 -200 -0.01 -32 -0.01 0 0.0 0 0.0
arduino:mbed_nano:nanorp2040connect -220 -0.0 -16 -0.01 -220 -0.0 -16 -0.01 -220 -0.0 -16 -0.01 -220 -0.0 -16 -0.01 -220 -0.0 -16 -0.01 -220 -0.0 -16 -0.01 0 0.0 0 0.0 0 0.0 0 0.0
arduino:mbed_nicla:nicla_vision -136 -0.01 -32 -0.01 -136 -0.01 0 0.0 -136 -0.01 -32 -0.01 -136 -0.01 0 0.0 -136 -0.01 0 0.0 -72 -0.0 -32 -0.01 0 0.0 0 0.0
arduino:mbed_opta:opta -136 -0.01 -32 -0.01 -136 -0.01 0 0.0 -136 -0.01 -32 -0.01 -200 -0.01 0 0.0 -200 -0.01 0 0.0 -136 -0.01 0 0.0 0 0.0 0 0.0
arduino:mbed_portenta:envie_m7 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
arduino:renesas_portenta:portenta_c33 -128 -0.01 -32 -0.01 -128 -0.01 0 0.0 -136 -0.01 -32 -0.01 -136 -0.01 -32 -0.01 -136 -0.01 -32 -0.01 0 0.0 0 0.0
arduino:renesas_uno:unor4wifi -136 -0.05 -16 -0.05 -136 -0.05 -16 -0.05 -136 -0.05 -16 -0.05 -136 -0.05 -16 -0.05 -120 -0.05 -16 -0.05
arduino:samd:mkr1000 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 0 0.0 0 0.0
arduino:samd:mkrgsm1400 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 0 0.0 0 0.0
arduino:samd:mkrnb1500 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 -208 -0.08 -16 -0.05 0 0.0 0 0.0
arduino:samd:mkrwan1300 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0 0 0.0
arduino:samd:mkrwifi1010 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -192 -0.07 -16 -0.05 -192 -0.07 -16 -0.05 0 0.0 0 0.0 0 0.0 0 0.0
arduino:samd:nano_33_iot -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -200 -0.08 -16 -0.05 -192 -0.07 -16 -0.05 -192 -0.07 -16 -0.05 0 0.0 0 0.0 0 0.0 0 0.0
esp32:esp32:esp32 24 0.0 -16 -0.0 24 0.0 -16 -0.0 28 0.0 -16 -0.0 24 0.0 -16 -0.0 4 0.0 -16 -0.0 28 0.0 -16 -0.0
esp8266:esp8266:huzzah -136 -0.01 -64 -0.08 -156 -0.01 -84 -0.1 -140 -0.01 -60 -0.07 -136 -0.01 -80 -0.1 -156 -0.01 -92 -0.11
Click for full report CSV 
Board,examples/ArduinoIoTCloud-Advanced<br>flash,%,examples/ArduinoIoTCloud-Advanced<br>RAM for global variables,%,examples/ArduinoIoTCloud-Basic<br>flash,%,examples/ArduinoIoTCloud-Basic<br>RAM for global variables,%,examples/ArduinoIoTCloud-Callbacks<br>flash,%,examples/ArduinoIoTCloud-Callbacks<br>RAM for global variables,%,examples/ArduinoIoTCloud-Schedule<br>flash,%,examples/ArduinoIoTCloud-Schedule<br>RAM for global variables,%,examples/utility/ArduinoIoTCloud_Travis_CI<br>flash,%,examples/utility/ArduinoIoTCloud_Travis_CI<br>RAM for global variables,%,examples/ArduinoIoTCloud-DeferredOTA<br>flash,%,examples/ArduinoIoTCloud-DeferredOTA<br>RAM for global variables,%,examples/utility/Provisioning<br>flash,%,examples/utility/Provisioning<br>RAM for global variables,%,examples/utility/SelfProvisioning<br>flash,%,examples/utility/SelfProvisioning<br>RAM for global variables,%
arduino:esp32:nano_nora,24,0.0,-16,-0.0,24,0.0,-16,-0.0,8,0.0,-16,-0.0,8,0.0,-16,-0.0,8,0.0,-16,-0.0,8,0.0,-16,-0.0
arduino:mbed_edge:edge_control,-136,-0.01,-16,-0.01,-136,-0.01,-24,-0.01,-136,-0.01,-16,-0.01,-136,-0.01,-24,-0.01,-136,-0.01,-24,-0.01,,,,
arduino:mbed_giga:giga,-136,-0.01,-32,-0.01,-136,-0.01,0,0.0,-136,-0.01,-32,-0.01,-136,-0.01,0,0.0,-200,-0.01,0,0.0,-200,-0.01,-32,-0.01,0,0.0,0,0.0
arduino:mbed_nano:nanorp2040connect,-220,-0.0,-16,-0.01,-220,-0.0,-16,-0.01,-220,-0.0,-16,-0.01,-220,-0.0,-16,-0.01,-220,-0.0,-16,-0.01,-220,-0.0,-16,-0.01,0,0.0,0,0.0,0,0.0,0,0.0
arduino:mbed_nicla:nicla_vision,-136,-0.01,-32,-0.01,-136,-0.01,0,0.0,-136,-0.01,-32,-0.01,-136,-0.01,0,0.0,-136,-0.01,0,0.0,-72,-0.0,-32,-0.01,0,0.0,0,0.0,,,,
arduino:mbed_opta:opta,-136,-0.01,-32,-0.01,-136,-0.01,0,0.0,-136,-0.01,-32,-0.01,-200,-0.01,0,0.0,-200,-0.01,0,0.0,-136,-0.01,0,0.0,0,0.0,0,0.0,,,,
arduino:mbed_portenta:envie_m7,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,,,,
arduino:renesas_portenta:portenta_c33,-128,-0.01,-32,-0.01,-128,-0.01,0,0.0,-136,-0.01,-32,-0.01,-136,-0.01,-32,-0.01,-136,-0.01,-32,-0.01,,,,,0,0.0,0,0.0,,,,
arduino:renesas_uno:unor4wifi,-136,-0.05,-16,-0.05,-136,-0.05,-16,-0.05,-136,-0.05,-16,-0.05,-136,-0.05,-16,-0.05,-120,-0.05,-16,-0.05,,,,,,,,,,,,
arduino:samd:mkr1000,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,,,,,0,0.0,0,0.0,,,,
arduino:samd:mkrgsm1400,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,,,,,0,0.0,0,0.0,,,,
arduino:samd:mkrnb1500,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,-208,-0.08,-16,-0.05,,,,,0,0.0,0,0.0,,,,
arduino:samd:mkrwan1300,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,0,0.0,,,,,,,,,,,,
arduino:samd:mkrwifi1010,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-192,-0.07,-16,-0.05,-192,-0.07,-16,-0.05,0,0.0,0,0.0,0,0.0,0,0.0
arduino:samd:nano_33_iot,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-200,-0.08,-16,-0.05,-192,-0.07,-16,-0.05,-192,-0.07,-16,-0.05,0,0.0,0,0.0,0,0.0,0,0.0
esp32:esp32:esp32,24,0.0,-16,-0.0,24,0.0,-16,-0.0,28,0.0,-16,-0.0,24,0.0,-16,-0.0,4,0.0,-16,-0.0,28,0.0,-16,-0.0,,,,,,,,
esp8266:esp8266:huzzah,-136,-0.01,-64,-0.08,-156,-0.01,-84,-0.1,-140,-0.01,-60,-0.07,-136,-0.01,-80,-0.1,-156,-0.01,-92,-0.11,,,,,,,,,,,,

@pennam pennam merged commit 87f28a3 into master May 13, 2024
67 checks passed
@pennam pennam deleted the timed-attempt-2 branch May 23, 2024 06:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@andreagilardoni andreagilardoni andreagilardoni approved these changes

Assignees
No one assigned
Labels
topic: code Related to content of the project itself type: enhancement Proposed improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pennam @andreagilardoni