aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Scripting: use luaM_malloc instead of allocf

Browse Source 
handles GC if needed automatically
This commit is contained in:
Andrew Tridgell 2022-12-02 07:47:21 +11:00
parent ff6d9a12a4
commit afc1a38b73
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/AP_Scripting/lua_bindings.cpp
View File

@ -10,6 +10,10 @@
#include <AP_Scripting/AP_Scripting.h> #include <AP_Scripting/AP_Scripting.h>
#include <string.h> #include <string.h>
extern "C" {
#include "lua/src/lmem.h"
}
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
// millis // millis
@ -168,15 +172,8 @@ int AP_Logger_Write(lua_State *L) {
return luaL_argerror(L, args, "unknown format"); return luaL_argerror(L, args, "unknown format");
} }
lua_Alloc allocf = lua_getallocf(L, nullptr); // note that luaM_malloc will never return null, it will fault instead
char *buffer = (char*)allocf(nullptr, nullptr, 0, msg_len); char *buffer = (char*)luaM_malloc(L, msg_len);
if (buffer == nullptr) {
lua_gc(L, LUA_GCCOLLECT, 0);
buffer = (char*)allocf(nullptr, nullptr, 0, msg_len);
if (buffer == nullptr) {
return luaL_error(L, "Buffer allocation failed");
}
}
// add logging headers // add logging headers
uint8_t offset = 0; uint8_t offset = 0;
@ -210,7 +207,7 @@ int AP_Logger_Write(lua_State *L) {
int isnum; int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum); const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum) { if (!isnum) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range"); luaL_argerror(L, arg_index, "argument out of range");
// no return // no return
} }
@ -223,7 +220,7 @@ int AP_Logger_Write(lua_State *L) {
int isnum; int isnum;
const lua_Number tmp1 = lua_tonumberx(L, arg_index, &isnum); const lua_Number tmp1 = lua_tonumberx(L, arg_index, &isnum);
if (!isnum) { if (!isnum) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range"); luaL_argerror(L, arg_index, "argument out of range");
// no return // no return
} }
@ -241,7 +238,7 @@ int AP_Logger_Write(lua_State *L) {
int isnum; int isnum;
const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum); const lua_Integer tmp1 = lua_tointegerx(L, arg_index, &isnum);
if (!isnum || (tmp1 < 0) || (tmp1 > UINT8_MAX)) { if (!isnum || (tmp1 < 0) || (tmp1 > UINT8_MAX)) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range"); luaL_argerror(L, arg_index, "argument out of range");
// no return // no return
} }
@ -264,7 +261,7 @@ int AP_Logger_Write(lua_State *L) {
} else { } else {
const lua_Number v_float = lua_tonumberx(L, arg_index, &success); const lua_Number v_float = lua_tonumberx(L, arg_index, &success);
if (!success || (v_float < 0) || (v_float > float(UINT32_MAX))) { if (!success || (v_float < 0) || (v_float > float(UINT32_MAX))) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range"); luaL_argerror(L, arg_index, "argument out of range");
// no return // no return
} }
@ -284,7 +281,7 @@ int AP_Logger_Write(lua_State *L) {
break; break;
} }
default: { default: {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_error(L, "%c unsupported format",fmt_cat[index]); luaL_error(L, "%c unsupported format",fmt_cat[index]);
// no return // no return
} }
@ -293,12 +290,12 @@ int AP_Logger_Write(lua_State *L) {
size_t slen; size_t slen;
const char *tmp = lua_tolstring(L, arg_index, &slen); const char *tmp = lua_tolstring(L, arg_index, &slen);
if (tmp == nullptr) { if (tmp == nullptr) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_argerror(L, arg_index, "argument out of range"); luaL_argerror(L, arg_index, "argument out of range");
// no return // no return
} }
if (slen > charlen) { if (slen > charlen) {
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
luaL_error(L, "arg %d too long for %c format",arg_index,fmt_cat[index]); luaL_error(L, "arg %d too long for %c format",arg_index,fmt_cat[index]);
// no return // no return
} }
@ -312,7 +309,7 @@ int AP_Logger_Write(lua_State *L) {
AP_logger->WriteBlock(buffer,msg_len); AP_logger->WriteBlock(buffer,msg_len);
allocf(nullptr, buffer, 0, 0); luaM_free(L, buffer);
return 0; return 0;
} }