Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: improve binding index function efficiency

Browse Source 
Move the string checks into the load functions to avoid duplicating it
for each binding.

Also sync up the return types to avoid an unnecessary conversion.

Saves ~1.5K.
This commit is contained in:
Thomas Watson 2024-06-30 15:09:57 -05:00 committed by Andrew Tridgell
parent e66d2a1495
commit 575ed6224f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/AP_Scripting/generator/src/main.c
View File

@ -2459,15 +2459,11 @@ void emit_index(struct userdata *head) {
}
fprintf(source, "static int %s_index(lua_State *L) {\n", node->sanatized_name);
fprintf(source, " const char * name = luaL_checkstring(L, 2);\n");
fprintf(source, " if (load_function(L,%s_meta,ARRAY_SIZE(%s_meta),name)",node->sanatized_name,node->sanatized_name);
fprintf(source, " return load_function(L,%s_meta,ARRAY_SIZE(%s_meta))",node->sanatized_name,node->sanatized_name);
if (node->enums != NULL) {
fprintf(source, " || load_enum(L,%s_enums,ARRAY_SIZE(%s_enums),name)",node->sanatized_name,node->sanatized_name);
fprintf(source, " || load_enum(L,%s_enums,ARRAY_SIZE(%s_enums))",node->sanatized_name,node->sanatized_name);
}
fprintf(source, ") {\n");
fprintf(source, " return 1;\n");
fprintf(source, " }\n");
fprintf(source, " return 0;\n");
fprintf(source, ";\n");
fprintf(source, "}\n");
end_dependency(source, node->dependency);
fprintf(source, "\n");
@ -2992,14 +2988,15 @@ void emit_docs(struct userdata *node, int is_userdata, int emit_creation) {
void emit_index_helpers(void) {
fprintf(source, "static bool load_function(lua_State *L, const luaL_Reg *list, const uint8_t length, const char* name) {\n");
fprintf(source, "static int load_function(lua_State *L, const luaL_Reg *list, const uint8_t length) {\n");
fprintf(source, " const char * name = luaL_checkstring(L, 2);\n");
fprintf(source, " for (uint8_t i = 0; i < length; i++) {\n");
fprintf(source, " if (strcmp(name,list[i].name) == 0) {\n");
fprintf(source, " lua_pushcfunction(L, list[i].func);\n");
fprintf(source, " return true;\n");
fprintf(source, " return 1;\n");
fprintf(source, " }\n");
fprintf(source, " }\n");
fprintf(source, " return false;\n");
fprintf(source, " return 0;\n");
fprintf(source, "}\n\n");
// If enough stuff is defined out we can end up with no enums.
@ -3007,14 +3004,15 @@ void emit_index_helpers(void) {
fprintf(source, "#pragma GCC diagnostic push\n");
fprintf(source, "#pragma GCC diagnostic ignored \"-Wunused-function\"\n");
fprintf(source, "static bool load_enum(lua_State *L, const userdata_enum *list, const uint8_t length, const char* name) {\n");
fprintf(source, "static int load_enum(lua_State *L, const userdata_enum *list, const uint8_t length) {\n");
fprintf(source, " const char * name = luaL_checkstring(L, 2);\n");
fprintf(source, " for (uint8_t i = 0; i < length; i++) {\n");
fprintf(source, " if (strcmp(name,list[i].name) == 0) {\n");
fprintf(source, " lua_pushinteger(L, list[i].value);\n");
fprintf(source, " return true;\n");
fprintf(source, " return 1;\n");
fprintf(source, " }\n");
fprintf(source, " }\n");
fprintf(source, " return false;\n");
fprintf(source, " return 0;\n");
fprintf(source, "}\n");
fprintf(source, "#pragma GCC diagnostic pop\n\n");