diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-11-14 04:28:45 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-11-14 04:28:45 +0000 |
| commit | 59297e046420341bea04797159ee62b544c2295d (patch) | |
| tree | f26e338f090a0a3d33fd3b2d096cdb59738f87c4 /winsup/cygwin/cygheap.h | |
| parent | 70c500b3431209690b9578984785a519572b9514 (diff) | |
| download | cygnal-59297e046420341bea04797159ee62b544c2295d.tar.gz cygnal-59297e046420341bea04797159ee62b544c2295d.tar.bz2 cygnal-59297e046420341bea04797159ee62b544c2295d.zip | |
* cygheap.h (init_cygheap::manage_console_count): Declare new function.
(init_cygheap::console_count): Renamed from open_fhs. Make private.
* cygheap.cc (init_cygheap::manage_console_count): Define new function.
* dtable.cc (dtable::fixup_after_exec): Always call fixup_after_exec on
elements of fd even when they are about to be closed.
* fhandler.h (report_tty_counts): Remove open_fhs from debugging output.
* fhandler_console.cc (fhandler_console::open): Use manage_console_count rather
than manipulating count directly.
(fhandler_console::close): Ditto.
(fhandler_console::fixup_after_fork): Ditto.
(fhandler_console::fixup_after_exec): Ditto. Don't close handles if
close_on_exec.
* fhandler_tty.cc (fhandler_tty_slave::open): Use manage_console_count() rather
than manipulating count directly. Reflect change in arguments to
report_tty_counts().
(fhandler_tty_slave::close): Ditto for both.
(fhandler_tty_slave::dup): Ditto for both.
(fhandler_tty_slave::ioctl): Use myctty() rather than raw ctty #.
(fhandler_tty_slave::fixup_after_fork): Reflect change in arguments to
report_tty_counts().
(fhandler_tty_master::init_console): Use manage_console_count() rather than
manipulating count directly.
* fhandler_clipboard.cc (fhandler_dev_clipboard::fixup_after_exec): Don't
perform any operations if close_on_exec.
* fhandler_dsp.cc (fhandler_dev_dsp::fixup_after_exec): Ditto.
* fhandler_raw.cc (fhandler_dev_raw::fixup_after_exec): Ditto.
* fhandler_serial.cc (fhandler_serial::fixup_after_exec): Ditto.
* pinfo.h (_pinfo::_ctty): Declare new function.
(myctty): Declare new macro.
(__ctty): Declare new macro.
* pinfo.cc (_pinfo::_ctty): Define new function.
(_pinfo::set_ctty): Use manage_console_count() rather than manipulating count
directly.
* signal.cc (kill_pgrp): Use myctty() and __ctty() macros rather than raw ctty
#.
* syscalls.cc (setsid): Ditto. Use manage_console_count() rather than
manipulating count directly.
Diffstat (limited to 'winsup/cygwin/cygheap.h')
| -rw-r--r-- | winsup/cygwin/cygheap.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index ea4fb1c20..100d8d92d 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -296,13 +296,16 @@ struct init_cygheap #endif struct _cygtls **threadlist; size_t sthreads; - int open_fhs; pid_t pid; /* my pid */ HANDLE pid_handle; /* handle for my pid */ hook_chain hooks; void close_ctty (); + int manage_console_count (const char *, int, bool = false) __attribute__ ((regparm (3))); +private: + int console_count; }; + #define _CYGHEAPSIZE_SLOP (128 * 1024) #define CYGHEAPSIZE (sizeof (init_cygheap) + (20000 * sizeof (fhandler_union)) + _CYGHEAPSIZE_SLOP) #define CYGHEAPSIZE_MIN (sizeof (init_cygheap) + (10000 * sizeof (fhandler_union))) |