external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-02-15 04:42:06 +00:00
Code Issues Releases Wiki Activity

miracle-dispd: add timer to ensure the termination of encoder process

Browse source 
Change-Id: I282136c79392137f2501f82009154087ee9649be
This commit is contained in:
Derek Dai 2017-04-23 22:31:24 +08:00
parent cc3f773a89
commit 91777de219
1 changed files with 69 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/disp/dispd-encoder.c
View file

@ -35,6 +35,7 @@ struct dispd_encoder
sd_event *loop; sd_event *loop;
sd_event_source *child_source; sd_event_source *child_source;
sd_event_source *child_term_time_source;
sd_event_source *pipe_source; sd_event_source *pipe_source;
sd_bus *bus; sd_bus *bus;
@ -49,7 +50,7 @@ struct dispd_encoder
}; };
static int dispd_encoder_new(struct dispd_encoder **out); static int dispd_encoder_new(struct dispd_encoder **out);
static int dispd_encoder_on_unique_name(sd_event_source *source, static int on_unique_readable(sd_event_source *source,
int fd, int fd,
uint32_t events, uint32_t events,
void *userdata); void *userdata);
@ -150,6 +151,18 @@ static void dispd_encoder_cleanup(struct dispd_encoder *e)
dispd_encoder_unref(e); dispd_encoder_unref(e);
} }
if(e->child_term_time_source) {
sd_event_source_unref(e->child_term_time_source);
e->child_term_time_source = NULL;
dispd_encoder_unref(e);
}
if(e->child_source) {
sd_event_source_unref(e->child_source);
e->child_source = NULL;
dispd_encoder_unref(e);
}
dispd_encoder_close_pipe(e); dispd_encoder_close_pipe(e);
if(e->name_disappeared_slot) { if(e->name_disappeared_slot) {
@ -165,7 +178,7 @@ static void dispd_encoder_cleanup(struct dispd_encoder *e)
} }
} }
static int dispd_encoder_on_terminated(sd_event_source *source, static int on_child_terminated(sd_event_source *source,
const siginfo_t *si, const siginfo_t *si,
void *userdata) void *userdata)
{ {
@ -218,7 +231,7 @@ int dispd_encoder_spawn(struct dispd_encoder **out, struct wfd_session *s)
&e->child_source, &e->child_source,
pid, pid,
WEXITED, WEXITED,
dispd_encoder_on_terminated, on_child_terminated,
dispd_encoder_ref(e)); dispd_encoder_ref(e));
if(0 > r) { if(0 > r) {
goto close_pipe; goto close_pipe;
@ -228,7 +241,7 @@ int dispd_encoder_spawn(struct dispd_encoder **out, struct wfd_session *s)
&e->pipe_source, &e->pipe_source,
fds[0], fds[0],
EPOLLIN, EPOLLIN,
dispd_encoder_on_unique_name, on_unique_readable,
dispd_encoder_ref(e)); dispd_encoder_ref(e));
if(0 > r) { if(0 > r) {
goto close_pipe; goto close_pipe;
@ -450,7 +463,7 @@ static int on_encoder_disappeared(sd_bus_message *m,
return 0; return 0;
} }
static int dispd_encoder_on_unique_name(sd_event_source *source, static int on_unique_readable(sd_event_source *source,
int fd, int fd,
uint32_t events, uint32_t events,
void *userdata) void *userdata)
@ -730,11 +743,13 @@ static int dispd_encoder_call(struct dispd_encoder *e, const char *method)
"org.freedesktop.miracle.encoder", "org.freedesktop.miracle.encoder",
method); method);
if(0 > r) { if(0 > r) {
log_vERR(r);
goto error; goto error;
} }
r = sd_bus_call(e->bus, call, 0, &error, &reply); r = sd_bus_call(e->bus, call, 0, &error, &reply);
if(0 > r) { if(0 > r) {
log_warning("%s: %s", error.name, error.message);
goto error; goto error;
} }
@ -743,20 +758,67 @@ static int dispd_encoder_call(struct dispd_encoder *e, const char *method)
error: error:
dispd_encoder_kill_child(e); dispd_encoder_kill_child(e);
return log_ERRNO(); return r;
} }
int dispd_encoder_start(struct dispd_encoder *e) int dispd_encoder_start(struct dispd_encoder *e)
{ {
assert_ret(e);
return dispd_encoder_call(e, "Start"); return dispd_encoder_call(e, "Start");
} }
int dispd_encoder_pause(struct dispd_encoder *e) int dispd_encoder_pause(struct dispd_encoder *e)
{ {
assert_ret(e);
return dispd_encoder_call(e, "Pause"); return dispd_encoder_call(e, "Pause");
} }
static int on_child_term_timeout(sd_event_source *s,
uint64_t usec,
void *userdata)
{
struct dispd_encoder *e = userdata;
dispd_encoder_kill_child(e);
return 0;
}
int dispd_encoder_stop(struct dispd_encoder *e) int dispd_encoder_stop(struct dispd_encoder *e)
{ {
return dispd_encoder_call(e, "Stop"); uint64_t now;
sd_event *loop;
int r;
assert_ret(e);
r = dispd_encoder_call(e, "Stop");
if(0 > r) {
return r;
}
loop = ctl_wfd_get_loop();
r = sd_event_now(loop, CLOCK_MONOTONIC, &now);
if(0 > r) {
log_vERR(r);
goto error;
}
r = sd_event_add_time(loop,
&e->child_term_time_source,
CLOCK_MONOTONIC,
now + (1000 * 1000),
0,
on_child_term_timeout,
dispd_encoder_ref(e));
if(0 > r) {
log_vERR(r);
goto error;
}
error:
dispd_encoder_kill_child(e);
return r;
} }