log管理器内存分配池化,修复部分log写入部分与内存池部分存在的恶性bug
This commit is contained in:
8
c/main.c
8
c/main.c
@ -3,6 +3,8 @@
|
||||
#include "network/network.h"
|
||||
#include "tools/toml/toml.h"
|
||||
#include "tools/quit/quit.h"
|
||||
#include "memctl/memctl.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -33,9 +35,11 @@ int main()
|
||||
perror("load config error");
|
||||
int port = (int)toml_int_in(server,"list_port").u.i;
|
||||
//加载配置文件,读取端口
|
||||
mem_ctl *mem_ctler = (mem_ctl*)malloc(sizeof(mem_ctl));
|
||||
init_memctl(mem_ctler);
|
||||
log_manager *logsmanager=(log_manager*)malloc(sizeof(log_manager));
|
||||
//创建日志管理器与定时清理线层
|
||||
init_loger(logsmanager);
|
||||
init_loger(logsmanager,mem_ctler);
|
||||
pthread_create(&logsmanager->pid,NULL,logsmanager->clear_log,logsmanager);
|
||||
Ctl *teml = init_tem(logsmanager);
|
||||
teml->config = server;
|
||||
@ -53,13 +57,13 @@ int main()
|
||||
resource->loger = logsmanager;
|
||||
resource->network = networkmanager;
|
||||
resource->tem = teml;
|
||||
resource->memctler = mem_ctler;
|
||||
on_exit(quit_all,resource);
|
||||
//注册清理函数
|
||||
teml->run(teml,fifo);
|
||||
|
||||
//启动终端
|
||||
|
||||
|
||||
//等待网络管理器进程结束
|
||||
pthread_join(networkmanager->pid,NULL);
|
||||
networkmanager->pid = -1;
|
||||
|
||||
Reference in New Issue
Block a user