Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

support deinit no ref object

Browse Source
This commit is contained in:
lyon 2022-04-26 12:23:39 +08:00
parent 4956994086
commit ba11251d6d
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
port/linux/package/pikascript/pikascript-core/dataArg.c
View File

@ -342,18 +342,15 @@ void* arg_getHeapStruct(Arg* self) {
} }
void arg_deinitHeap(Arg* self) { void arg_deinitHeap(Arg* self) {
if (arg_getType(self) == ARG_TYPE_HEAP_STRUCT) { ArgType type = arg_getType(self);
/* deinit heap struct */
if (type == ARG_TYPE_HEAP_STRUCT) {
/* deinit heap strcut */ /* deinit heap strcut */
StructDeinitFun struct_deinit_fun = StructDeinitFun struct_deinit_fun =
(StructDeinitFun)arg_getHeapStructDeinitFun(self); (StructDeinitFun)arg_getHeapStructDeinitFun(self);
struct_deinit_fun(arg_getHeapStruct(self)); struct_deinit_fun(arg_getHeapStruct(self));
} }
}
void arg_deinit(Arg* self) {
arg_deinitHeap(self);
/* deinit sub object */ /* deinit sub object */
ArgType type = arg_getType(self);
if (type == ARG_TYPE_OBJECT) { if (type == ARG_TYPE_OBJECT) {
PikaObj* subObj = arg_getPtr(self); PikaObj* subObj = arg_getPtr(self);
obj_refcntDec(subObj); obj_refcntDec(subObj);
@ -362,6 +359,11 @@ void arg_deinit(Arg* self) {
obj_deinit(subObj); obj_deinit(subObj);
} }
} }
}
void arg_deinit(Arg* self) {
/* deinit arg pointed heap */
arg_deinitHeap(self);
/* free the ref */ /* free the ref */
arg_freeContent(self); arg_freeContent(self);
} }

38
port/linux/test/pikaMain-test.cpp
View File

@ -721,25 +721,25 @@ TEST(pikaMain, string_no_init_arg) {
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
} }
// TEST(pikaMain, obj_no_free) { TEST(pikaMain, obj_no_free) {
// /* init */ /* init */
// pikaMemInfo.heapUsedMax = 0; pikaMemInfo.heapUsedMax = 0;
// PikaObj* pikaMain = newRootObj((char*)"pikaMain", New_PikaMain); PikaObj* pikaMain = newRootObj((char*)"pikaMain", New_PikaMain);
// /* run */ /* run */
// __platform_printf((char*)"BEGIN\n"); __platform_printf((char*)"BEGIN\n");
// obj_run(pikaMain, (char*) obj_run(pikaMain, (char*)
// "s = PikaStdData.String()\n" "s = PikaStdData.String()\n"
// "s.set('test')\n" "s.set('test')\n"
// "s = PikaStdData.String()\n" "s = PikaStdData.String()\n"
// "s.set('test')\n" "s.set('test')\n"
// "\n" "\n"
// ); );
// /* collect */ /* collect */
// /* assert */ /* assert */
// /* deinit */ /* deinit */
// obj_deinit(pikaMain); obj_deinit(pikaMain);
// EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
// } }
TEST(pikaMain, list__set__) { TEST(pikaMain, list__set__) {
/* init */ /* init */

14
src/dataArg.c
View File

@ -342,18 +342,15 @@ void* arg_getHeapStruct(Arg* self) {
} }
void arg_deinitHeap(Arg* self) { void arg_deinitHeap(Arg* self) {
if (arg_getType(self) == ARG_TYPE_HEAP_STRUCT) { ArgType type = arg_getType(self);
/* deinit heap struct */
if (type == ARG_TYPE_HEAP_STRUCT) {
/* deinit heap strcut */ /* deinit heap strcut */
StructDeinitFun struct_deinit_fun = StructDeinitFun struct_deinit_fun =
(StructDeinitFun)arg_getHeapStructDeinitFun(self); (StructDeinitFun)arg_getHeapStructDeinitFun(self);
struct_deinit_fun(arg_getHeapStruct(self)); struct_deinit_fun(arg_getHeapStruct(self));
} }
}
void arg_deinit(Arg* self) {
arg_deinitHeap(self);
/* deinit sub object */ /* deinit sub object */
ArgType type = arg_getType(self);
if (type == ARG_TYPE_OBJECT) { if (type == ARG_TYPE_OBJECT) {
PikaObj* subObj = arg_getPtr(self); PikaObj* subObj = arg_getPtr(self);
obj_refcntDec(subObj); obj_refcntDec(subObj);
@ -362,6 +359,11 @@ void arg_deinit(Arg* self) {
obj_deinit(subObj); obj_deinit(subObj);
} }
} }
}
void arg_deinit(Arg* self) {
/* deinit arg pointed heap */
arg_deinitHeap(self);
/* free the ref */ /* free the ref */
arg_freeContent(self); arg_freeContent(self);
} }