public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-04-23 18:19:50 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix possible freeze on exit if exiting quickly after start

Browse Source
This commit is contained in:
dec05eba
2024-05-13 21:22:29 +02:00
parent 133c3a22b9
commit c01eb53513
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kms/client/kms_client.c
View File

@@ -79,7 +79,7 @@ static int send_msg_to_server(int server_fd, gsr_kms_request *request) {
return sendmsg(server_fd, &response_message, 0); return sendmsg(server_fd, &response_message, 0);
} }
static int recv_msg_from_server(int server_fd, gsr_kms_response *response) { static int recv_msg_from_server(int server_pid, int server_fd, gsr_kms_response *response) {
struct iovec iov; struct iovec iov;
iov.iov_base = response; iov.iov_base = response;
iov.iov_len = sizeof(*response); iov.iov_len = sizeof(*response);
@@ -93,11 +93,26 @@ static int recv_msg_from_server(int server_fd, gsr_kms_response *response) {
response_message.msg_control = cmsgbuf; response_message.msg_control = cmsgbuf;
response_message.msg_controllen = sizeof(cmsgbuf); response_message.msg_controllen = sizeof(cmsgbuf);
int res = recvmsg(server_fd, &response_message, MSG_WAITALL); int res = 0;
if(res <= 0) for(;;) {
return res; res = recvmsg(server_fd, &response_message, MSG_DONTWAIT);
if(res <= 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
// If we are replacing the connection and closing the application at the same time
// then recvmsg can get stuck (because the server died), so we prevent that by doing
// non-blocking recvmsg and checking if the server died
int status = 0;
int wait_result = waitpid(server_pid, &status, WNOHANG);
if(wait_result != 0) {
res = -1;
break;
}
usleep(1000);
} else {
break;
}
}
if(response->num_fds > 0) { if(res > 0 && response->num_fds > 0) {
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message); struct cmsghdr *cmsg = CMSG_FIRSTHDR(&response_message);
if(cmsg) { if(cmsg) {
int *fds = (int*)CMSG_DATA(cmsg); int *fds = (int*)CMSG_DATA(cmsg);
@@ -371,7 +386,7 @@ int gsr_kms_client_replace_connection(gsr_kms_client *self) {
return -1; return -1;
} }
const int recv_res = recv_msg_from_server(self->socket_pair[GSR_SOCKET_PAIR_LOCAL], &response); const int recv_res = recv_msg_from_server(self->kms_server_pid, self->socket_pair[GSR_SOCKET_PAIR_LOCAL], &response);
if(recv_res == 0) { if(recv_res == 0) {
fprintf(stderr, "gsr warning: gsr_kms_client_replace_connection: kms server shut down\n"); fprintf(stderr, "gsr warning: gsr_kms_client_replace_connection: kms server shut down\n");
return -1; return -1;
@@ -404,7 +419,7 @@ int gsr_kms_client_get_kms(gsr_kms_client *self, gsr_kms_response *response) {
return -1; return -1;
} }
const int recv_res = recv_msg_from_server(self->socket_pair[GSR_SOCKET_PAIR_LOCAL], response); const int recv_res = recv_msg_from_server(self->kms_server_pid, self->socket_pair[GSR_SOCKET_PAIR_LOCAL], response);
if(recv_res == 0) { if(recv_res == 0) {
fprintf(stderr, "gsr warning: gsr_kms_client_get_kms: kms server shut down\n"); fprintf(stderr, "gsr warning: gsr_kms_client_get_kms: kms server shut down\n");
strcpy(response->err_msg, "failed to receive"); strcpy(response->err_msg, "failed to receive");