github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-04-28 19:54:01 +00:00
Code Issues Projects Releases Wiki Activity

life_mngr:fix resend shutdown cmd fail

Browse Source 
1) fix a bug,resend shutdown cmd only send one character
2) move out accept routine from while loop, let this thread
   can read data from acrn-dm continuously.

Tracked-On: #4446
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Reviewed-by: Yuhong Tao <yuhong.tao@intel.com>
Reviewed-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Mingqiang Chi 2020-03-27 11:01:45 +08:00 committed by wenlingz
parent 90b8d844d0
commit 2b648476cc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/life_mngr/life_mngr.c
View File

@ -171,8 +171,6 @@ void *sos_socket_thread(void *arg)
listen_fd = setup_socket_listen(SOS_SOCKET_PORT); listen_fd = setup_socket_listen(SOS_SOCKET_PORT);
LOG_PRINTF("life_mngr:listen_fd=0x%x socket port is 0x%x\r\n", listen_fd, SOS_SOCKET_PORT); LOG_PRINTF("life_mngr:listen_fd=0x%x socket port is 0x%x\r\n", listen_fd, SOS_SOCKET_PORT);
while (1) {
memset(buf, 0, BUFF_SIZE);
connect_fd = accept(listen_fd, (struct sockaddr *)&client, &len); connect_fd = accept(listen_fd, (struct sockaddr *)&client, &len);
if (connect_fd == -1) { if (connect_fd == -1) {
LOG_WRITE("accept a connection error on a socket\n"); LOG_WRITE("accept a connection error on a socket\n");
@ -180,6 +178,9 @@ void *sos_socket_thread(void *arg)
exit(1); exit(1);
} }
while (1) {
memset(buf, 0, BUFF_SIZE);
/* Here assume the socket communication is reliable, no need to try */ /* Here assume the socket communication is reliable, no need to try */
num = read(connect_fd, buf, sizeof(SHUTDOWN_CMD)); num = read(connect_fd, buf, sizeof(SHUTDOWN_CMD));
if (num == -1) { if (num == -1) {
@ -250,7 +251,7 @@ void *listener_fn_to_sos(void *arg)
shutdown_self = true; shutdown_self = true;
} else { } else {
if (retry > 0) { if (retry > 0) {
if (send_message(tty_dev_fd, SHUTDOWN_CMD, sizeof(SHUTDOWN_CMD) != 0)) { if (send_message(tty_dev_fd, SHUTDOWN_CMD, sizeof(SHUTDOWN_CMD)) != 0) {
LOG_PRINTF("Try resend shutdown cmd failed cnt = %d\n", retry); LOG_PRINTF("Try resend shutdown cmd failed cnt = %d\n", retry);
} }
retry--; retry--;