提交 a999e56a 编写于 作者: F freemine

typo: pthread_cleanup_push/pop better exist in pair

上级 2a7732b1
...@@ -114,27 +114,28 @@ static void *taosProcessAlarmSignal(void *tharg) { ...@@ -114,27 +114,28 @@ static void *taosProcessAlarmSignal(void *tharg) {
taosThreadCleanupPush(taosDeleteTimer, &timerId); taosThreadCleanupPush(taosDeleteTimer, &timerId);
struct itimerspec ts; do {
ts.it_value.tv_sec = 0; struct itimerspec ts;
ts.it_value.tv_nsec = 1000000 * MSECONDS_PER_TICK; ts.it_value.tv_sec = 0;
ts.it_interval.tv_sec = 0; ts.it_value.tv_nsec = 1000000 * MSECONDS_PER_TICK;
ts.it_interval.tv_nsec = 1000000 * MSECONDS_PER_TICK; ts.it_interval.tv_sec = 0;
ts.it_interval.tv_nsec = 1000000 * MSECONDS_PER_TICK;
if (timer_settime(timerId, 0, &ts, NULL)) {
// printf("Failed to init timer"); if (timer_settime(timerId, 0, &ts, NULL)) {
return NULL; // printf("Failed to init timer");
} break;
int signo;
while (!stopTimer) {
if (sigwait(&sigset, &signo)) {
// printf("Failed to wait signal: number %d", signo);
continue;
} }
/* //printf("Signal handling: number %d ......\n", signo); */
callback(0); int signo;
} while (!stopTimer) {
if (sigwait(&sigset, &signo)) {
// printf("Failed to wait signal: number %d", signo);
continue;
}
/* //printf("Signal handling: number %d ......\n", signo); */
callback(0);
}
} while (0);
taosThreadCleanupPop(1); taosThreadCleanupPop(1);
......
...@@ -1046,26 +1046,28 @@ void *shellThreadLoop(void *arg) { ...@@ -1046,26 +1046,28 @@ void *shellThreadLoop(void *arg) {
taosGetOldTerminalMode(); taosGetOldTerminalMode();
taosThreadCleanupPush(shellCleanup, NULL); taosThreadCleanupPush(shellCleanup, NULL);
char *command = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
if (command == NULL) {
printf("failed to malloc command\r\n");
return NULL;
}
do { do {
memset(command, 0, SHELL_MAX_COMMAND_SIZE); char *command = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
taosSetTerminalMode(); if (command == NULL) {
printf("failed to malloc command\r\n");
if (shellReadCommand(command) != 0) {
break; break;
} }
taosResetTerminalMode(); do {
} while (shellRunCommand(command, true) == 0); memset(command, 0, SHELL_MAX_COMMAND_SIZE);
taosSetTerminalMode();
if (shellReadCommand(command) != 0) {
break;
}
taosMemoryFreeClear(command); taosResetTerminalMode();
shellWriteHistory(); } while (shellRunCommand(command, true) == 0);
shellExit();
taosMemoryFreeClear(command);
shellWriteHistory();
shellExit();
} while (0);
taosThreadCleanupPop(1); taosThreadCleanupPop(1);
return NULL; return NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册