lsm/GuiLite
1
0
Fork 0
mirror of https://gitee.com/idea4good/GuiLite.git synced 2026-01-09 09:55:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!31 Remove cmd_target, refact timer

Browse Source
This commit is contained in:
idea4good
2020-10-20 11:57:57 +08:00
parent 75b2ad7b7c
commit bdf5dce9e1
15 changed files with 138 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workspace/core/adapter/api_linux.cpp
View File

@@ -61,7 +61,8 @@ typedef struct _timer_manage
int state; /* on or off */
int interval;
int elapse; /* 0~interval */
void (* timer_proc) (void* ptmr, void* parg);
void (* timer_proc) (void* param);
void* param;
}timer_info[MAX_TIMER_CNT];
void (* old_sigfunc)(int);
@@ -84,7 +85,7 @@ static void* timer_routine(void*)
if(timer_manage.timer_info[i].elapse == timer_manage.timer_info[i].interval)
{
timer_manage.timer_info[i].elapse = 0;
timer_manage.timer_info[i].timer_proc(0, 0);
timer_manage.timer_info[i].timer_proc(timer_manage.timer_info[i].param);
}
}
usleep(1000 * TIMER_UNIT);
@@ -106,7 +107,7 @@ static int init_mul_timer()
return 1;
}
static int set_a_timer(int interval, void (* timer_proc) (void* ptmr, void* parg))
static int set_a_timer(int interval, void (* timer_proc)(void* param), void* param)
{
init_mul_timer();
@@ -124,6 +125,7 @@ static int set_a_timer(int interval, void (* timer_proc) (void* ptmr, void* parg
}
memset(&timer_manage.timer_info[i], 0, sizeof(timer_manage.timer_info[i]));
timer_manage.timer_info[i].timer_proc = timer_proc;
timer_manage.timer_info[i].param = param;
timer_manage.timer_info[i].interval = interval;
timer_manage.timer_info[i].elapse = 0;
timer_manage.timer_info[i].state = 1;
@@ -196,9 +198,9 @@ unsigned int get_cur_thread_id()
return (unsigned long)pthread_self();
}
void register_timer(int milli_second,void func(void* ptmr, void* parg))
void register_timer(int milli_second,void func(void* param), void* param)
{
set_a_timer(milli_second/TIMER_UNIT,func);
set_a_timer(milli_second/TIMER_UNIT,func, param);
}
long get_time_in_second()

12
workspace/core/adapter/api_win.cpp
View File

@@ -59,7 +59,8 @@ typedef struct _timer_manage
int state; /* on or off */
int interval;
int elapse; /* 0~interval */
void (* timer_proc) (void* ptmr, void* parg);
void (* timer_proc) (void* param);
void* param;
}timer_info[MAX_TIMER_CNT];
void (* old_sigfunc)(int);
@@ -82,7 +83,7 @@ DWORD WINAPI timer_routine(LPVOID lpParam)
if(timer_manage.timer_info[i].elapse == timer_manage.timer_info[i].interval)
{
timer_manage.timer_info[i].elapse = 0;
timer_manage.timer_info[i].timer_proc(0, 0);
timer_manage.timer_info[i].timer_proc(timer_manage.timer_info[i].param);
}
}
Sleep(TIMER_UNIT);
@@ -104,7 +105,7 @@ static int init_mul_timer()
return 1;
}
static int set_a_timer(int interval, void (* timer_proc) (void* ptmr, void* parg))
static int set_a_timer(int interval, void (* timer_proc) (void* param), void* param)
{
init_mul_timer();
@@ -122,6 +123,7 @@ static int set_a_timer(int interval, void (* timer_proc) (void* ptmr, void* parg
}
memset(&timer_manage.timer_info[i], 0, sizeof(timer_manage.timer_info[i]));
timer_manage.timer_info[i].timer_proc = timer_proc;
timer_manage.timer_info[i].param = param;
timer_manage.timer_info[i].interval = interval;
timer_manage.timer_info[i].elapse = 0;
timer_manage.timer_info[i].state = 1;
@@ -199,9 +201,9 @@ unsigned int get_cur_thread_id()
return GetCurrentThreadId();
}
void register_timer(int milli_second,void func(void* ptmr, void* parg))
void register_timer(int milli_second,void func(void* param), void* param)
{
set_a_timer(milli_second/TIMER_UNIT,func);
set_a_timer(milli_second/TIMER_UNIT,func, param);
}
long get_time_in_second()

11
workspace/core/cmd_target.cpp
View File

@@ -1,11 +0,0 @@
#include "../core_include/cmd_target.h"
#ifdef GUILITE_ON
GL_MSG_ENTRY c_cmd_target::ms_usr_map_entries[USR_MSG_MAX];
unsigned short c_cmd_target::ms_user_map_size;
GL_BEGIN_MESSAGE_MAP(c_cmd_target)
GL_END_MESSAGE_MAP()
#endif