Make the CRON module work reliably #2153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
djphoenix
approved these changes
Oct 29, 2017
| @@ -141,7 +141,7 @@ static int lcron_unschedule(lua_State *L) { | |||
| size_t i = lcron_findindex(L, ud); | |||
| if (i == -1) return 0; | |||
| luaL_unref(L, LUA_REGISTRYINDEX, cronent_list[i]); | |||
| memmove(cronent_list + i, cronent_list + i + 1, sizeof(int) * cronent_count - i - 1); | |||
| memmove(cronent_list + i, cronent_list + i + 1, sizeof(int) * (cronent_count - i - 1)); | |||
There was a problem hiding this comment.
Cheers, good catch! Dumb mistake from me...
| @@ -104,7 +104,7 @@ static size_t lcron_findindex(lua_State *L, cronent_ud_t *ud) { | |||
| size_t i; | |||
| for (i = 0; i < cronent_count; i++) { | |||
| lua_rawgeti(L, LUA_REGISTRYINDEX, cronent_list[i]); | |||
| eud = lua_touserdata(L, 1); | |||
| eud = lua_touserdata(L, -1); | |||
There was a problem hiding this comment.
Not sure what it is... But you definitely know inner mechanics better.
There was a problem hiding this comment.
The rawgeti pushes the integer onto the stack. This is element -1. Element 1 is the first argument in the current lua stackframe.
crasu
pushed a commit
to crasu/nodemcu-firmware
that referenced
this pull request
Jan 11, 2018
dnc40085
pushed a commit
to dnc40085/nodemcu-firmware
that referenced
this pull request
Mar 3, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1924.
devbranch rather than formaster.There were two bugs -- the memmove moved the wrong number of bytes (which could have led to a crash) and the lua_touserdata calls were trying to get the pointer from the wrong stack location. It is (somewhat) of a miracle that it worked at all!