lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: remove os_isatty

Browse Source 
os_isatty can be made to disappear by moving maybe_sigio_broken from kernel to
user code.  This also lets write_sigio_workaround become static.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike
2006-07-10 04:45:11 -07:00
committed by Linus Torvalds
parent bfaafd7184
commit 8e64d96aeb
4 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/um/include/os.h
View File

@@ -318,7 +318,6 @@ extern void reboot_skas(void);
/* irq.c */ /* irq.c */
extern int os_waiting_for_events(struct irq_fd *active_fds); extern int os_waiting_for_events(struct irq_fd *active_fds);
extern int os_isatty(int fd);
extern int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds); extern int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds);
extern void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg, extern void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
struct irq_fd *active_fds, struct irq_fd ***last_irq_ptr2); struct irq_fd *active_fds, struct irq_fd ***last_irq_ptr2);
@@ -330,9 +329,9 @@ extern void os_set_ioignore(void);
extern void init_irq_signals(int on_sigstack); extern void init_irq_signals(int on_sigstack);
/* sigio.c */ /* sigio.c */
extern void write_sigio_workaround(void);
extern int add_sigio_fd(int fd, int read); extern int add_sigio_fd(int fd, int read);
extern int ignore_sigio_fd(int fd); extern int ignore_sigio_fd(int fd);
extern void maybe_sigio_broken(int fd, int read);
/* skas/trap */ /* skas/trap */
extern void sig_handler_common_skas(int sig, void *sc_ptr); extern void sig_handler_common_skas(int sig, void *sc_ptr);

17
arch/um/kernel/irq.c
View File

@@ -110,19 +110,6 @@ void sigio_handler(int sig, union uml_pt_regs *regs)
free_irqs(); free_irqs();
} }
static void maybe_sigio_broken(int fd, int type)
{
if (os_isatty(fd)) {
if ((type == IRQ_WRITE) && !pty_output_sigio) {
write_sigio_workaround();
add_sigio_fd(fd, 0);
} else if ((type == IRQ_READ) && !pty_close_sigio) {
write_sigio_workaround();
add_sigio_fd(fd, 1);
}
}
}
static DEFINE_SPINLOCK(irq_lock); static DEFINE_SPINLOCK(irq_lock);
int activate_fd(int irq, int fd, int type, void *dev_id) int activate_fd(int irq, int fd, int type, void *dev_id)
@@ -221,7 +208,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
/* This calls activate_fd, so it has to be outside the critical /* This calls activate_fd, so it has to be outside the critical
* section. * section.
*/ */
maybe_sigio_broken(fd, type); maybe_sigio_broken(fd, (type == IRQ_READ));
return(0); return(0);
@@ -318,7 +305,7 @@ void reactivate_fd(int fd, int irqnum)
/* This calls activate_fd, so it has to be outside the critical /* This calls activate_fd, so it has to be outside the critical
* section. * section.
*/ */
maybe_sigio_broken(fd, irq->type); maybe_sigio_broken(fd, (irq->type == IRQ_READ));
} }
void deactivate_fd(int fd, int irqnum) void deactivate_fd(int fd, int irqnum)

5
arch/um/os-Linux/irq.c
View File

@@ -52,11 +52,6 @@ int os_waiting_for_events(struct irq_fd *active_fds)
return n; return n;
} }
int os_isatty(int fd)
{
return isatty(fd);
}
int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds) int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds)
{ {
if (pollfds_num == pollfds_size) { if (pollfds_num == pollfds_size) {

14
arch/um/os-Linux/sigio.c
View File

@@ -233,7 +233,7 @@ static struct pollfd *setup_initial_poll(int fd)
return p; return p;
} }
void write_sigio_workaround(void) static void write_sigio_workaround(void)
{ {
unsigned long stack; unsigned long stack;
struct pollfd *p; struct pollfd *p;
@@ -314,6 +314,18 @@ out_close1:
close(l_write_sigio_fds[1]); close(l_write_sigio_fds[1]);
} }
void maybe_sigio_broken(int fd, int read)
{
if(!isatty(fd))
return;
if((read || pty_output_sigio) && (!read || pty_close_sigio))
return;
write_sigio_workaround();
add_sigio_fd(fd, read);
}
void sigio_cleanup(void) void sigio_cleanup(void)
{ {
if(write_sigio_pid != -1){ if(write_sigio_pid != -1){