xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #305 from H-ZeX/fix-mem-leak 

fix memory leak in os/linux/src/os.c::taosInitTimer #304
This commit is contained in:
slguan 2019-08-10 23:52:37 +08:00 committed by GitHub
parent c571c38bd6 ba81feaa86
commit cfa7527c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/os/linux/src/os.c
View File

@ -223,28 +223,30 @@ int taosOpenUDServerSocket(char *ip, short port) {
return sockFd; return sockFd;
} }
// The callback functions MUST free the param pass to it after finishing use it.
int taosInitTimer(void *(*callback)(void *), int ms) { int taosInitTimer(void *(*callback)(void *), int ms) {
/******************************************************** /********************************************************
* Create SIGALRM loop thread * Create SIGALRM loop thread
********************************************************/ ********************************************************/
pthread_t thread; pthread_t thread;
pthread_attr_t tattr; pthread_attr_t tattr;
if (pthread_attr_init(&tattr)) { if (pthread_attr_init(&tattr)) {
return -1; return -1;
} }
if (pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED)) { if (pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED)) {
return -1; return -1;
} }
int *tms = (int *)malloc(sizeof(int)); int *tms = (int *) malloc(sizeof(int));
*tms = ms; *tms = ms;
if (pthread_create(&thread, &tattr, callback, (void *)tms)) { if (pthread_create(&thread, &tattr, callback, (void *) tms)) {
return -1; free(tms);
return -1;
} }
if (pthread_attr_destroy(&tattr)) { if (pthread_attr_destroy(&tattr)) {
return -1; return -1;
} }
return 0; return 0;