if duping the current ctty.
(fhandler_tty_common::close): Move debugging statement earlier in function.
(fhandler_tty_slave::close): Return success when closing ctty.
* syscalls.cc (close_all_files): Avoid calling fhandler_tty_slave close method
so that open_fhs will not be decremented when closing cygheap ctty.
(setsid): Ditto.
* dcrt0.cc (do_exit): Reorganize to avoid leaving a critical section active
after vfork.
* fhandler.h (fhandler_tty_slave::get_unit): Remove regparm parameter since it
can't work in a virtualized function.
+2003-12-09 Christopher Faylor <cgf@redhat.com>
+
+ * fhandler_tty.cc (fhandler_tty_common::dup): Just copy cygheap->ctty
+ to child if duping the current ctty.
+ (fhandler_tty_common::close): Move debugging statement earlier in function.
+ (fhandler_tty_slave::close): Return success when closing ctty.
+ * syscalls.cc (close_all_files): Avoid calling fhandler_tty_slave close
+ method so that open_fhs will not be decremented when closing cygheap
+ ctty.
+ (setsid): Ditto.
+ * dcrt0.cc (do_exit): Reorganize to avoid leaving a critical section
+ active after vfork.
+ * fhandler.h (fhandler_tty_slave::get_unit): Remove regparm parameter
+ since it can't work in a virtualized function.
+
2003-12-08 Christopher Faylor <cgf@redhat.com>
* pinfo.cc (_pinfo::set_ctty): Don't copy over existing ctty if it is
void __stdcall
do_exit (int status)
{
+ syscall_printf ("do_exit (%d), exit_state %d", status, exit_state);
+
+ vfork_save *vf = vfork_storage.val ();
+ if (vf != NULL && vf->pid < 0)
+ {
+ exit_state = ES_NOT_EXITING;
+ vf->restore_exit (status);
+ }
+
+ EnterCriticalSection (&exit_lock);
if (exit_state < ES_EVENTS_TERMINATE)
{
exit_state = ES_EVENTS_TERMINATE;
events_terminate ();
}
- EnterCriticalSection (&exit_lock);
UINT n = (UINT) status;
-
- syscall_printf ("do_exit (%d)", n);
-
- vfork_save *vf = vfork_storage.val ();
- if (vf != NULL && vf->pid < 0)
- vf->restore_exit (status);
-
if (exit_state < ES_THREADTERM)
{
exit_state = ES_THREADTERM;
_off64_t lseek (_off64_t, int) { return 0; }
select_record *select_read (select_record *s);
int cygserver_attach_tty (HANDLE*, HANDLE*);
- int get_unit () __attribute__ ((regparm (1)));
+ int get_unit ();
virtual char const *ttyname () { return pc.dev.name; }
};
FreeConsole ();
termios_printf ("decremented open_fhs %d", fhandler_console::open_fhs);
if (myself->ctty >= 0 && get_io_handle () == cygheap->ctty.get_io_handle ())
- return 1;
+ return 0;
return fhandler_tty_common::close ();
}
fhandler_tty_slave *fts = (fhandler_tty_slave *) child;
int errind;
+debug_printf ("get_io_handle %p, cygheap->ctty.get_io_handle %p",get_io_handle (),cygheap->ctty.get_io_handle ());
+ if (get_io_handle () == cygheap->ctty.get_io_handle ())
+ {
+ *fts = cygheap->ctty;
+ termios_printf ("duped ctty");
+ return 0;
+ }
+
fts->tcinit (get_ttyp ());
attach_tty (get_unit ());
}
if (get_major () == DEV_TTYS_MAJOR)
- myself->set_ctty (get_ttyp (), openflags, (fhandler_tty_slave *) this);
+ myself->set_ctty (get_ttyp (), openflags, fts);
return 0;
int
fhandler_tty_common::close ()
{
+ termios_printf ("tty%d <%p,%p> closing", get_unit (), get_handle (), get_output_handle ());
if (output_done_event && !CloseHandle (output_done_event))
termios_printf ("CloseHandle (output_done_event), %E");
if (ioctl_done_event && !CloseHandle (ioctl_done_event))
if (!ForceCloseHandle1 (get_output_handle (), to_pty))
termios_printf ("CloseHandle (get_output_handle ()<%p>), %E", get_output_handle ());
- set_io_handle (NULL);
-
inuse = NULL;
- termios_printf ("tty%d <%p,%p> closed", get_unit (), get_handle (), get_output_handle ());
+ set_io_handle (NULL);
return 0;
}
}
if (cygheap->ctty.get_io_handle ())
- {
- myself->ctty = -1;
- cygheap->ctty.close ();
- }
+ cygheap->ctty.fhandler_tty_common::close ();
ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
user_shared->delqueue.process_queue ();
myself->sid = getpid ();
myself->pgid = getpid ();
if (cygheap->ctty.get_io_handle ())
- {
- cygheap->ctty.close ();
- cygheap->ctty.set_io_handle (NULL);
- }
+ cygheap->ctty.fhandler_tty_common::close ();
syscall_printf ("sid %d, pgid %d, ctty %d, open_fhs %d", myself->sid,
myself->pgid, myself->ctty, fhandler_console::open_fhs);
return myself->sid;