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

Add mechanism to execute code on the main thread FIXME

Browse Source 
This allows to schedule a runnable to be executed on the main thread.

FIXME: the implementation is incorrect: if another event is triggered
which makes scrcpy exit, then the callback will never be executed and
cause a memory leak.
This commit is contained in:
Romain Vimont 2024-09-06 23:08:08 +02:00
parent a3405ab62e
commit 154507c009
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/events.c
View File

@ -17,3 +17,24 @@ sc_push_event_impl(uint32_t type, const char *name) {
return true;
}
bool
sc_post_to_main_thread(sc_runnable_fn run, void *userdata) {
SDL_Event event = {
.user = {
.type = SC_EVENT_RUN_ON_MAIN_THREAD,
.data1 = run,
.data2 = userdata,
},
};
int ret = SDL_PushEvent(&event);
// ret < 0: error (queue full)
// ret == 0: event was filtered
// ret == 1: success
if (ret != 1) {
LOGW("Coud not post to main thread: %s", SDL_GetError());
return false;
}
return true;
}

6
app/src/events.h
View File

@ -9,6 +9,7 @@
enum {
SC_EVENT_NEW_FRAME = SDL_USEREVENT,
SC_EVENT_RUN_ON_MAIN_THREAD,
SC_EVENT_DEVICE_DISCONNECTED,
SC_EVENT_SERVER_CONNECTION_FAILED,
SC_EVENT_SERVER_CONNECTED,
@ -25,4 +26,9 @@ sc_push_event_impl(uint32_t type, const char *name);
#define sc_push_event(TYPE) sc_push_event_impl(TYPE, # TYPE)
typedef void (*sc_runnable_fn)(void *userdata);
bool
sc_post_to_main_thread(sc_runnable_fn run, void *userdata);
#endif

5
app/src/scrcpy.c
View File

@ -174,6 +174,11 @@ event_loop(struct scrcpy *s) {
case SDL_QUIT:
LOGD("User requested to quit");
return SCRCPY_EXIT_SUCCESS;
case SC_EVENT_RUN_ON_MAIN_THREAD:
sc_runnable_fn run = event.user.data1;
void *userdata = event.user.data2;
run(userdata);
break;
default:
if (!sc_screen_handle_event(&s->screen, &event)) {
return SCRCPY_EXIT_FAILURE;

5
app/src/usb/scrcpy_otg.c
View File

@ -38,6 +38,11 @@ event_loop(struct scrcpy_otg *s) {
case SDL_QUIT:
LOGD("User requested to quit");
return SCRCPY_EXIT_SUCCESS;
case SC_EVENT_RUN_ON_MAIN_THREAD:
sc_runnable_fn run = event.user.data1;
void *userdata = event.user.data2;
run(userdata);
break;
default:
sc_screen_otg_handle_event(&s->screen_otg, &event);
break;