thread being terminated rather than thread doing terminating.
* fhandler.h (fhandler_pty_master::slave): Delete.
(fhandler_pty_master::get_unit): Ditto.
(fhandler_pty_master::setup): Change argument declaration to accommodate new
usage.
* fhandler_tty.cc (fhandler_tty_master::init): Remove obsolete slave
assignment. Pass argument to setup indicating that this is a tty.
(fhandler_tty_slave::open): Use dev() method rather than referencing pc.dev
directly.
(fhandler_pty_master::open): Don't create archetype based on ptym device
number. Set device number to use DEV_TTYM_MAJOR and tty number. Pass argument
to setup indicating that this is a pty.
(fhandler_pty_master::setup): Change single argument to a flag indicating
whether we're creating a pty and use appropriately. Calculate 't' variable
here rather than in caller.
* fhandler_dsp.cc (fhandler_dev_dsp::open): Use dev() method rather than
referencing pc.dev directly.
2006-06-03 Christopher Faylor <cgf@timesys.com>
+ * cygthread.cc (cygthread::terminate_thread): In debugging output, use
+ name of thread being terminated rather than thread doing terminating.
+
+ * fhandler.h (fhandler_pty_master::slave): Delete.
+ (fhandler_pty_master::get_unit): Ditto.
+ (fhandler_pty_master::setup): Change argument declaration to
+ accommodate new usage.
+ * fhandler_tty.cc (fhandler_tty_master::init): Remove obsolete slave
+ assignment. Pass argument to setup indicating that this is a tty.
+ (fhandler_tty_slave::open): Use dev() method rather than referencing
+ pc.dev directly.
+ (fhandler_pty_master::open): Don't create archetype based on ptym
+ device number. Set device number to use DEV_TTYM_MAJOR and tty number.
+ Pass argument to setup indicating that this is a pty.
+ (fhandler_pty_master::setup): Change single argument to a flag
+ indicating whether we're creating a pty and use appropriately.
+ Calculate 't' variable here rather than in caller.
+
+ * fhandler_dsp.cc (fhandler_dev_dsp::open): Use dev() method rather
+ than referencing pc.dev directly.
+
+2006-06-03 Christopher Faylor <cgf@timesys.com>
+
* dcrt0.cc (dll_crt0_0): Call tty_list::init_session here.
(dll_crt0_1): Reflect renaming from tty_init to tty::init_session.
(do_exit): Reflect moving of tty_terminate into tty_list.
cygthread::terminate_thread ()
{
bool terminated = true;
- debug_printf ("thread '%s', id %p, inuse %d, stack_ptr %p", name (), id, inuse, stack_ptr);
+ debug_printf ("thread '%s', id %p, inuse %d, stack_ptr %p", __name, id, inuse, stack_ptr);
while (inuse && !stack_ptr)
low_priority_sleep (0);
class fhandler_pty_master: public fhandler_tty_common
{
int pktmode; // non-zero if pty in a packet mode.
-protected:
- device slave; // device type of slave
public:
int need_nl; // Next read should start with \n
DWORD dwProcessId; // Owner of master handles
HANDLE from_master, to_master;
bool hit_eof ();
- int get_unit () const { return slave.minor; }
- bool setup (tty&);
+ bool setup (bool);
int dup (fhandler_base *);
void fixup_after_fork (HANDLE parent);
void fixup_after_exec ();
int
fhandler_dev_dsp::open (int flags, mode_t mode)
{
- if (cygheap->fdtab.find_archetype (pc.dev))
+ if (cygheap->fdtab.find_archetype (dev ()))
{
set_errno (EBUSY);
return 0;
int
fhandler_tty_master::init ()
{
- slave = dev ();
termios_printf ("Creating master for tty%d", get_unit ());
if (init_console ())
memset (&ti, 0, sizeof (ti));
console->tcsetattr (0, &ti);
- if (!setup (*cygwin_shared->tty[get_unit ()]))
+ if (!setup (false))
return 1;
set_winsize (false);
fhandler_tty_slave::open (int flags, mode_t)
{
if (get_device () == FH_TTY)
- pc.dev.tty_to_real_device ();
+ dev().tty_to_real_device ();
fhandler_tty_slave *arch = (fhandler_tty_slave *) cygheap->fdtab.find_archetype (pc.dev);
if (arch)
{
int
fhandler_pty_master::open (int flags, mode_t)
{
- fhandler_pty_master *arch = (fhandler_tty_master *) cygheap->fdtab.find_archetype (pc.dev);
- if (arch)
- {
- *this = *(fhandler_pty_master *) arch;
- termios_printf ("copied fhandler_pty_master archetype");
- set_flags ((flags & ~O_TEXT) | O_BINARY);
- goto out;
- }
-
int ntty;
ntty = cygwin_shared->tty.allocate (false);
if (ntty < 0)
return 0;
- slave = *ttys_dev;
- slave.setunit (ntty);
- if (!setup (*cygwin_shared->tty[ntty]))
+ dev().devn = FHDEV (DEV_TTYM_MAJOR, ntty);
+ if (!setup (true))
{
lock_ttys::release ();
return 0;
set_open_status ();
//
// FIXME: Do this better someday
- arch = (fhandler_tty_master *) cmalloc (HEAP_ARCHETYPES, sizeof (*this));
+ fhandler_pty_master *arch = (fhandler_tty_master *) cmalloc (HEAP_ARCHETYPES, sizeof (*this));
*((fhandler_pty_master **) cygheap->fdtab.add_archetype ()) = arch;
archetype = arch;
*arch = *this;
arch->dwProcessId = GetCurrentProcessId ();
-out:
usecount = 0;
arch->usecount++;
char buf[sizeof ("opened pty master for ttyNNNNNNNNNNN")];
} while (0)
bool
-fhandler_pty_master::setup (tty& t)
+fhandler_pty_master::setup (bool ispty)
{
+ tty& t = *cygwin_shared->tty[get_unit ()];
+
tcinit (&t, true); /* Set termios information. Force initialization. */
const char *errstr = NULL;
/* Create synchronisation events */
- if (get_major () == DEV_TTYM_MAJOR)
+ if (!ispty)
{
if (!(output_done_event = t.get_event (errstr = OUTPUT_DONE_EVENT)))
goto err;