优化内存管理

Author: imxieyi

apps/apps_api.cpp

@@ -49,6 +49,7 @@ void close_window(SHEET *sht){
 
 void api_loopforever(LambdaContainer func,int interval){
 	auto task=task_now();
+	task->callback=&func;
 	auto fifo=(FIFO*)malloc(sizeof(FIFO));
 	fifo->init(128,task);
 	task->fifo=fifo;
@@ -59,8 +60,8 @@ void api_loopforever(LambdaContainer func,int interval){
 			sleepTask();
 		}else{
 			fifo->get();
-			func();
 			timer->set(interval);
+			func();
 		}
 	}
 }

fifo.cpp

@@ -26,6 +26,7 @@ void FIFO::init(int size,Task *task){
 
 void FIFO::remove(){
 	mfree((uintptr_t)buf,size*4);
+	destroyed=true;
 	return;
 }
 

heap.cpp

@@ -147,7 +147,9 @@ int MEMMAN::free_4k(unsigned int addr,unsigned int size){
 }
 
 uintptr_t malloc(uint32_t size){
-	return memman->alloc_4k(size);
+	auto t=memman->alloc_4k(size);
+	hanastd::memset((uintptr_t)t,0,size);
+	return t;
 }
 
 int mfree(uintptr_t addr,uint32_t size){

include/fifo.hpp

@@ -3,9 +3,10 @@
 #define FLAGS_OVERRUN	0x0001
 class FIFO {
 private:
+	int *buf;
 	int r,w,size,free,flags;
 public:
-	int *buf;
+	bool destroyed=false;
 	struct Task *task;
 	void init(int size);
 	void init(int size,Task *task);

include/lambda_container.hpp

@@ -57,6 +57,10 @@ class LambdaContainer {
     }
 
     ~LambdaContainer() {
+        //mfree((uintptr_t)buf,size);
+    }
+
+    void destroy() {
         mfree((uintptr_t)buf,size);
     }
 };

include/task.hpp

@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include "timer.hpp"
+#include "lambda_container.hpp"
 
 #define TASK_STACK_SIZE (64*1024)
 
@@ -17,6 +18,7 @@ typedef struct Task {
 	int level,priority;
 	uint32_t stackbottom;
 	FIFO *fifo;
+	LambdaContainer *callback=NULL;
 } __attribute__((packed)) Task;
 
 #define MAX_TASKS 1000

sheet.cpp

@@ -34,7 +34,6 @@ SHEET *SHEETCTRL::allocsheet(int xsize,int ysize){
 			SHEET *sht=&sheets0[i];
 			sht->graphics=(GRAPHICS *)malloc(sizeof(GRAPHICS));
 			uint32_t *buf=(uint32_t *)malloc(xsize*ysize*4);
-			memset(buf,0,xsize*ysize*4);
 			if(buf==0){
 				return 0;
 			}

task.cpp

@@ -68,7 +68,6 @@ void task_switchsub(){
 
 Task *initTasking(TIMER *timer){
 	taskctl=(TASKCTRL*)malloc(sizeof(TASKCTRL));
-	memset(taskctl,0,sizeof(TASKCTRL));
 	for(int i=0;i<MAX_TASKS;i++)
 		taskctl->tasks0[i].stat=EMPTY;
 	auto task=taskctl->alloc();
@@ -177,4 +176,10 @@ void killTask(Task *task){
 		mfree(task->stackbottom,TASK_STACK_SIZE);
 		task->stat=EMPTY;
 	}
+	if(task->fifo!=NULL){
+		task->fifo->remove();
+		mfree((uintptr_t)task->fifo,sizeof(FIFO));
+	}
+	if(task->callback!=NULL)
+		task->callback->destroy();
 }

timer.cpp

@@ -44,7 +44,8 @@ void TIMERCTRL::interrupt(){
 	for(;;){
 		if(timer->timeout>count)break;
 		if(timer!=mt_timer){
-			timer->push();
+			if(!timer->fifo->destroyed)
+				timer->push();
 		}else{
 			timer->flag=ALLOC;
 			ts=1;