Throughout, change name from set_inheritance to set_no_inheritance to better

reflect input arguments of this function.
* cygheap.h (CYGHEAPSIZE): Increase size of cygheap to something closer to the
21st century.
This commit is contained in:
Christopher Faylor 2004-02-02 20:33:09 +00:00
parent 94d61fcb76
commit 6027d26d8b
9 changed files with 28 additions and 20 deletions

View File

@ -1,3 +1,11 @@
2004-02-02 Christopher Faylor <cgf@redhat.com>
Throughout, change name from set_inheritance to set_no_inheritance to
better reflect input arguments of this function.
* cygheap.h (CYGHEAPSIZE): Increase size of cygheap to something closer
to the 21st century.
2004-02-02 Corinna Vinschen <corinna@vinschen.de>
* cygerrno.h (set_errno): Replace semicolon with comma in non-DEBUGGING

View File

@ -272,7 +272,7 @@ struct init_cygheap
void close_ctty ();
};
#define CYGHEAPSIZE (sizeof (init_cygheap) + (20000 * sizeof (fhandler_union)) + (5 * 65536))
#define CYGHEAPSIZE (sizeof (init_cygheap) + (20000 * sizeof (fhandler_union)) + (64 * 1024 * 1024))
extern init_cygheap *cygheap;
extern void *cygheap_max;

View File

@ -1299,7 +1299,7 @@ fhandler_dev_null::dump (void)
}
void
fhandler_base::set_inheritance (HANDLE &h, int not_inheriting)
fhandler_base::set_no_inheritance (HANDLE &h, int not_inheriting)
{
HANDLE oh = h;
/* Note that we could use SetHandleInformation here but it is not available
@ -1335,7 +1335,7 @@ void
fhandler_base::set_close_on_exec (int val)
{
if (!get_nohandle ())
set_inheritance (io_handle, val);
set_no_inheritance (io_handle, val);
set_close_on_exec_flag (val);
debug_printf ("set close_on_exec for %s to %d", get_name (), val);
}

View File

@ -265,7 +265,7 @@ class fhandler_base
__ino64_t get_namehash () { return namehash; }
virtual void hclose (HANDLE h) {CloseHandle (h);}
virtual void set_inheritance (HANDLE &h, int not_inheriting);
virtual void set_no_inheritance (HANDLE &h, int not_inheriting);
/* fixup fd possibly non-inherited handles after fork */
void fork_fixup (HANDLE parent, HANDLE &h, const char *name);

View File

@ -1747,7 +1747,7 @@ void
fhandler_console::set_close_on_exec (int val)
{
fhandler_base::set_close_on_exec (val);
set_inheritance (output_handle, val);
set_no_inheritance (output_handle, val);
}
void

View File

@ -200,7 +200,7 @@ fhandler_socket::create_secret_event (int* secret)
debug_printf("create event %E");
else if (get_close_on_exec ())
/* Event allows inheritance, but handle will not be inherited */
set_inheritance (secret_event, 1);
set_no_inheritance (secret_event, 1);
return secret_event;
}
@ -1300,9 +1300,9 @@ void
fhandler_socket::set_close_on_exec (int val)
{
if (secret_event)
set_inheritance (secret_event, val);
set_no_inheritance (secret_event, val);
if (!winsock2_active) /* < Winsock 2.0 */
set_inheritance (get_handle (), val);
set_no_inheritance (get_handle (), val);
set_close_on_exec_flag (val);
debug_printf ("set close_on_exec for %s to %d", get_name (), val);
}

View File

@ -1341,24 +1341,24 @@ fhandler_tty_common::set_close_on_exec (int val)
else
{
if (output_done_event)
set_inheritance (output_done_event, val);
set_no_inheritance (output_done_event, val);
if (ioctl_request_event)
set_inheritance (ioctl_request_event, val);
set_no_inheritance (ioctl_request_event, val);
if (ioctl_done_event)
set_inheritance (ioctl_done_event, val);
set_no_inheritance (ioctl_done_event, val);
if (inuse)
set_inheritance (inuse, val);
set_inheritance (output_mutex, val);
set_inheritance (input_mutex, val);
set_inheritance (input_available_event, val);
set_inheritance (output_handle, val);
set_no_inheritance (inuse, val);
set_no_inheritance (output_mutex, val);
set_no_inheritance (input_mutex, val);
set_no_inheritance (input_available_event, val);
set_no_inheritance (output_handle, val);
#ifndef DEBUGGING
fhandler_base::set_close_on_exec (val);
#else
/* FIXME: This is a duplication from fhandler_base::set_close_on_exec.
It is here because we need to specify the "from_pty" stuff here or
we'll get warnings from ForceCloseHandle when debugging. */
set_inheritance (get_io_handle (), val);
set_no_inheritance (get_io_handle (), val);
set_close_on_exec_flag (val);
#endif
}

View File

@ -133,7 +133,7 @@ fhandler_windows::set_close_on_exec (int val)
fhandler_base::set_close_on_exec_flag (val);
void *h = hWnd_;
if (h)
set_inheritance (h, val);
set_no_inheritance (h, val);
}
void

View File

@ -45,9 +45,9 @@ fhandler_pipe::set_close_on_exec (int val)
{
fhandler_base::set_close_on_exec (val);
if (guard)
set_inheritance (guard, val);
set_no_inheritance (guard, val);
if (writepipe_exists)
set_inheritance (writepipe_exists, val);
set_no_inheritance (writepipe_exists, val);
}
struct pipeargs