emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from select to poll and improve the no prefixing of eend calls.

Browse Source
This commit is contained in:
Roy Marples 2008-11-27 21:05:39 +00:00
parent 5403e70313
commit 2537a07e10
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/rc/runscript.c
View File

@ -29,13 +29,13 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <sys/select.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -43,6 +43,7 @@
#include <getopt.h> #include <getopt.h>
#include <libgen.h> #include <libgen.h>
#include <limits.h> #include <limits.h>
#include <poll.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -367,7 +368,7 @@ cleanup(void)
static int static int
write_prefix(const char *buffer, size_t bytes, bool *prefixed) write_prefix(const char *buffer, size_t bytes, bool *prefixed)
{ {
unsigned int i; size_t i, j;
const char *ec = ecolor(ECOLOR_HILITE); const char *ec = ecolor(ECOLOR_HILITE);
const char *ec_normal = ecolor(ECOLOR_NORMAL); const char *ec_normal = ecolor(ECOLOR_NORMAL);
ssize_t ret = 0; ssize_t ret = 0;
@ -383,9 +384,15 @@ write_prefix(const char *buffer, size_t bytes, bool *prefixed)
} }
for (i = 0; i < bytes; i++) { for (i = 0; i < bytes; i++) {
/* We don't prefix escape codes, like eend */ /* We don't prefix eend calls (cursor up) */
if (buffer[i] == '\033') if (buffer[i] == '\033' && !*prefixed) {
*prefixed = true; for (j = i + 1; j < bytes; j++) {
if (buffer[j] == 'A')
*prefixed = true;
if (isalpha((unsigned int)buffer[j]))
break;
}
}
if (!*prefixed) { if (!*prefixed) {
ret += write(fd, ec, strlen(ec)); ret += write(fd, ec, strlen(ec));
@ -414,7 +421,7 @@ svc_exec(const char *arg1, const char *arg2)
struct winsize ws; struct winsize ws;
int i; int i;
int flags = 0; int flags = 0;
fd_set rset; struct pollfd fd[2];
int s; int s;
char *buffer; char *buffer;
size_t bytes; size_t bytes;
@ -457,8 +464,8 @@ svc_exec(const char *arg1, const char *arg2)
eerrorx("%s: fork: %s", service, strerror(errno)); eerrorx("%s: fork: %s", service, strerror(errno));
if (service_pid == 0) { if (service_pid == 0) {
if (slave_tty >= 0) { if (slave_tty >= 0) {
dup2(slave_tty, 1); dup2(slave_tty, STDOUT_FILENO);
dup2(slave_tty, 2); dup2(slave_tty, STDERR_FILENO);
} }
if (exists(RC_SVCDIR "/runscript.sh")) { if (exists(RC_SVCDIR "/runscript.sh")) {
@ -480,28 +487,32 @@ svc_exec(const char *arg1, const char *arg2)
selfd = MAX(master_tty, signal_pipe[0]) + 1; selfd = MAX(master_tty, signal_pipe[0]) + 1;
buffer = xmalloc(sizeof(char) * BUFSIZ); buffer = xmalloc(sizeof(char) * BUFSIZ);
for (;;) { fd[0].fd = signal_pipe[0];
FD_ZERO(&rset); fd[0].events = fd[1].events = POLLIN;
FD_SET(signal_pipe[0], &rset); fd[0].revents = fd[1].revents = 0;
if (master_tty >= 0) if (master_tty >= 0) {
FD_SET(master_tty, &rset); fd[1].fd = master_tty;
fd[1].events = POLLIN;
fd[1].revents = 0;
}
if ((s = select(selfd, &rset, NULL, NULL, NULL)) == -1) { for (;;) {
if ((s = poll(fd, master_tty >= 0 ? 2 : 1, -1)) == -1) {
if (errno != EINTR) { if (errno != EINTR) {
eerror("%s: select: %s", service, eerror("%s: poll: %s",
strerror(errno)); service, strerror(errno));
break; break;
} }
} }
if (s > 0) { if (s > 0) {
if (master_tty >= 0 && FD_ISSET(master_tty, &rset)) { if (fd[1].revents & (POLLIN | POLLHUP)) {
bytes = read(master_tty, buffer, BUFSIZ); bytes = read(master_tty, buffer, BUFSIZ);
write_prefix(buffer, bytes, &prefixed); write_prefix(buffer, bytes, &prefixed);
} }
/* Only SIGCHLD signals come down this pipe */ /* Only SIGCHLD signals come down this pipe */
if (FD_ISSET(signal_pipe[0], &rset)) if (fd[0].revents & (POLLIN | POLLHUP))
break; break;
} }
} }