RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 20:00:56 +00:00
Code Issues Releases Wiki Activity

lua: subprocess: don't distinguish pipe errors/EOF

Browse Source 
What was the purpose of that? Probably none.

Also simplify another thing: if we get the cancel signal through FD,
there's no reason to check it separately.
This commit is contained in:
wm4 2014-10-26 00:52:46 +02:00
parent 90e3e99021
commit 0cfada604d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
player/lua.c
View File

@ -1246,16 +1246,17 @@ static int script_subprocess(lua_State *L)
close(pipes[1]);
pipes[1] = -1;
bool eof = false;
while (!eof) {
while (1) {
struct pollfd fds[] = {
{.events = POLLIN, .fd = pipes[0]},
{.events = POLLIN, .fd = cancel ? mp_cancel_get_fd(cancel) : -1},
};
if (poll(fds, fds[1].fd >= 0 ? 2 : 1, -1) < 0 && errno != EINTR)
break;
if (fds[1].revents)
if (fds[1].revents) {
kill(pid, SIGKILL);
break;
}
if (fds[0].revents) {
char buf[4096];
ssize_t r = read(pipes[0], buf, sizeof(buf));
@ -1263,7 +1264,6 @@ static int script_subprocess(lua_State *L)
continue;
if (r > 0)
bstr_xappend(tmp, &output, (bstr){buf, r});
eof = r == 0;
if (r <= 0)
break;
}
@ -1271,9 +1271,6 @@ static int script_subprocess(lua_State *L)
break;
}
if (!eof || (cancel && mp_cancel_test(cancel)))
kill(pid, SIGKILL);
// Note: it can happen that a child process closes the pipe, but does not
// terminate yet. In this case, we would have to run waitpid() in
// a separate thread and use pthread_cancel(), or use other weird