pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Terminate the device process gracefully

Browse Source 
Call shutdown() on the device socket to make the device process finish
its execution quickly and gracefully, without killing it.
This commit is contained in:
Romain Vimont
2018-02-16 11:11:07 +01:00
parent a791c272bc
commit ad6209f6ff
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/server.c
View File

@@ -7,6 +7,7 @@
#include "config.h"
#include "log.h"
#include "net.h"
#define SOCKET_NAME "scrcpy"
@@ -56,12 +57,6 @@ static process_t execute_server(const char *serial, Uint16 max_size, Uint32 bit_
return adb_execute(serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
}
static void terminate_server(process_t server) {
if (!cmd_terminate(server)) {
LOGE("Could not terminate server: %s", strerror(errno));
}
}
static socket_t listen_on_port(Uint16 port) {
#define IPV4_LOCALHOST 0x7F000001
return net_listen(IPV4_LOCALHOST, port, 1);
@@ -126,7 +121,15 @@ socket_t server_connect_to(struct server *server, const char *serial, Uint32 tim
void server_stop(struct server *server, const char *serial) {
SDL_assert(server->process != PROCESS_NONE);
terminate_server(server->process);
if (server->device_socket != INVALID_SOCKET) {
// shutdown the socket to finish the device process gracefully
net_shutdown(server->device_socket, SHUT_RDWR);
}
LOGD("Waiting the server to complete execution on the device...");
cmd_simple_wait(server->process, NULL); // ignore exit code
LOGD("Server terminated");
if (server->adb_reverse_enabled) {
// ignore failure