* dtable.cc (dtable::release): Drop fixup_before handling.

(dtable::fixup_before_fork): Remove.
	(dtable::fixup_before_exec): Remove.
	* dtable.h (class dtable): Remove cnt_need_fixup_before member.
	(dtable::dtable): Accommodate above change.
	(dtable::dec_need_fixup_before): Remove.
	(dtable::inc_need_fixup_before): Remove.
	(dtable::need_fixup_before): Remove.
	(dtable::fixup_before_exec): Remove declaration.
	(dtable::fixup_before_fork): Ditto.
	* fhandler.h (fhandler_base::fixup_before_fork_exec): Remove.
	(fhandler_base::need_fixup_before): Remove.
	* fork.cc (frok::parent): Drop fixup_before handling.
	* spawn.cc (spawn_guts): Ditto.
This commit is contained in:
Corinna Vinschen
2008-04-30 09:51:38 +00:00
parent 7e2b8e7d2a
commit 7aefc1596d
6 changed files with 19 additions and 67 deletions

View File

@@ -236,8 +236,6 @@ dtable::release (int fd)
{
if (!not_open (fd))
{
if (fds[fd]->need_fixup_before ())
dec_need_fixup_before ();
fhandler_base *arch = fds[fd]->archetype;
delete fds[fd];
if (arch && !arch->usecount)
@@ -672,22 +670,6 @@ dtable::select_except (int fd, select_record *s)
return s;
}
/* Function to walk the fd table after an exec and perform
per-fhandler type fixups. */
void
dtable::fixup_before_fork (DWORD target_proc_id)
{
lock ();
fhandler_base *fh;
for (size_t i = 0; i < size; i++)
if ((fh = fds[i]) != NULL)
{
debug_printf ("fd %d (%s)", i, fh->get_name ());
fh->fixup_before_fork_exec (target_proc_id);
}
unlock ();
}
void
dtable::move_fd (int from, int to)
{
@@ -696,20 +678,6 @@ dtable::move_fd (int from, int to)
fds[from] = NULL;
}
void
dtable::fixup_before_exec (DWORD target_proc_id)
{
lock ();
fhandler_base *fh;
for (size_t i = 0; i < size; i++)
if ((fh = fds[i]) != NULL && !fh->close_on_exec ())
{
debug_printf ("fd %d (%s)", i, fh->get_name ());
fh->fixup_before_fork_exec (target_proc_id);
}
unlock ();
}
void
dtable::set_file_pointers_for_exec ()
{