mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-21 12:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

server_thread

Browse source
This commit is contained in:
Romain Vimont 2021-10-30 16:31:38 +02:00
parent dc05033441
commit 9e6687e698
2 changed files with 73 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
app/src/server.c
View file

@ -392,6 +392,7 @@ server_init(struct server *server, const struct server_params *params,
}
server->process_terminated = false;
server->connected = false;
server->server_socket = SC_INVALID_SOCKET;
server->video_socket = SC_INVALID_SOCKET;
@ -402,6 +403,11 @@ server_init(struct server *server, const struct server_params *params,
server->tunnel_enabled = false;
server->tunnel_forward = false;
assert(cbs);
assert(cbs->on_connection_failed);
assert(cbs->on_connected);
assert(cbs->on_disconnected);
server->cbs = cbs;
server->cbs_userdata = cbs_userdata;
@ -409,9 +415,61 @@ server_init(struct server *server, const struct server_params *params,
}
static int
run_wait_server(void *data) {
run_server_connect(void *data) {
struct server *server = data;
char device_name[DEVICE_NAME_FIELD_LENGTH];
struct sc_size frame_size;
if (!server_connect_to(server, device_name, &frame_size)) {
server->cbs->on_connection_failed(server, server->cbs_userdata);
goto end;
}
server->connected = true;
server->cbs->on_connected(server, device_name, frame_size,
server->cbs_userdata);
end:
return 0;
}
static int
run_server(void *data) {
struct server *server = data;
const struct server_params *params = &server->params;
if (!push_server(params->serial)) {
server->cbs->on_connection_failed(server, server->cbs_userdata);
goto end;
}
if (!enable_tunnel_any_port(server, params->port_range,
params->force_adb_forward)) {
server->cbs->on_connection_failed(server, server->cbs_userdata);
goto end;
}
server->process = execute_server(server, params);
if (server->process == PROCESS_NONE) {
server->cbs->on_connection_failed(server, server->cbs_userdata);
goto end;
}
sc_thread connect_thread;
bool ok = sc_thread_create(&connect_thread, run_server_connect,
"server-connect", server);
if (!ok) {
LOGW("Could not create thread, killing the server...");
process_terminate(server->process);
server->cbs->on_connection_failed(server, server->cbs_userdata);
process_wait(server->process, false); // ignore exit code
goto end;
}
process_wait(server->process, false); // ignore exit code
LOGD("Server terminated");
sc_mutex_lock(&server->mutex);
server->process_terminated = true;
@ -425,54 +483,22 @@ run_wait_server(void *data) {
net_interrupt(server->server_socket);
}
LOGD("Server terminated");
sc_thread_join(&connect_thread, NULL);
// Written by connect_thread, sc_thread_join() provides the necessary
// memory barrier
if (server->connected) {
server->cbs->on_disconnected(server, server->cbs_userdata);
}
// Otherwise, ->on_connection_failed() is already called
end:
return 0;
}
bool
server_start(struct server *server) {
const struct server_params *params = &server->params;
if (!push_server(params->serial)) {
/* server->serial will be freed on server_destroy() */
return false;
}
if (!enable_tunnel_any_port(server, params->port_range,
params->force_adb_forward)) {
return false;
}
// server will connect to our server socket
server->process = execute_server(server, params);
if (server->process == PROCESS_NONE) {
goto error;
}
// If the server process dies before connecting to the server socket, then
// the client will be stuck forever on accept(). To avoid the problem, we
// must be able to wake up the accept() call when the server dies. To keep
// things simple and multiplatform, just spawn a new thread waiting for the
// server process and calling shutdown()/close() on the server socket if
// necessary to wake up any accept() blocking call.
bool ok = sc_thread_create(&server->wait_server_thread, run_wait_server,
"wait-server", server);
if (!ok) {
process_terminate(server->process);
process_wait(server->process, true); // ignore exit code
goto error;
}
server->tunnel_enabled = true;
return true;
error:
// The server socket (if any) will be closed on server_destroy()
disable_tunnel(server);
return false;
return sc_thread_create(&server->thread, run_server, "server", server);
}
static bool
@ -585,7 +611,7 @@ server_stop(struct server *server) {
process_terminate(server->process);
}
sc_thread_join(&server->wait_server_thread, NULL);
sc_thread_join(&server->thread, NULL);
process_close(server->process);
}

3
app/src/server.h
View file

@ -44,11 +44,12 @@ struct server {
struct server_params params;
process_t process;
sc_thread wait_server_thread;
sc_thread thread;
sc_mutex mutex;
sc_cond process_terminated_cond;
bool process_terminated;
bool connected; // written by connect_thread
sc_socket server_socket; // only used if !tunnel_forward
sc_socket video_socket;