Remove erroneously checked-in debugging statements.
* cygheap.cc (cygheap_fixup_in_child): Here. * debug.cc (delete_handle): Here. * sigproc.cc (child_info_spawn::cleanup): Here. * spawn.cc (child_info_spawn::worker): Here.
This commit is contained in:
parent
466e694855
commit
18eaa70b5b
@ -1,3 +1,11 @@
|
|||||||
|
2011-11-13 Christopher Faylor <me.cygwin2011@cgf.cx>
|
||||||
|
|
||||||
|
Remove erroneously checked-in debugging statements.
|
||||||
|
* cygheap.cc (cygheap_fixup_in_child): Here.
|
||||||
|
* debug.cc (delete_handle): Here.
|
||||||
|
* sigproc.cc (child_info_spawn::cleanup): Here.
|
||||||
|
* spawn.cc (child_info_spawn::worker): Here.
|
||||||
|
|
||||||
2011-11-13 Christopher Faylor <me.cygwin2011@cgf.cx>
|
2011-11-13 Christopher Faylor <me.cygwin2011@cgf.cx>
|
||||||
|
|
||||||
Throughout, change "sig %d" in strace output to "signal %d" for
|
Throughout, change "sig %d" in strace output to "signal %d" for
|
||||||
|
@ -64,11 +64,8 @@ cygheap_fixup_in_child (bool execed)
|
|||||||
cygheap_max = cygheap = (init_cygheap *) _cygheap_start;
|
cygheap_max = cygheap = (init_cygheap *) _cygheap_start;
|
||||||
_csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap);
|
_csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap);
|
||||||
child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL);
|
child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL);
|
||||||
debug_printf ("HERE");
|
|
||||||
cygheap_init ();
|
cygheap_init ();
|
||||||
debug_printf ("HERE 2");
|
|
||||||
debug_fixup_after_fork_exec ();
|
debug_fixup_after_fork_exec ();
|
||||||
debug_printf ("HERE 2, %d", execed);
|
|
||||||
if (execed)
|
if (execed)
|
||||||
{
|
{
|
||||||
cygheap->hooks.next = NULL;
|
cygheap->hooks.next = NULL;
|
||||||
@ -86,7 +83,6 @@ debug_printf ("HERE 2, %d", execed);
|
|||||||
_cfree (ce); /* Marked by parent for freeing in child */
|
_cfree (ce); /* Marked by parent for freeing in child */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
debug_printf ("HERE 3, %d", execed);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -171,7 +171,6 @@ delete_handle (handle_list *hl)
|
|||||||
void
|
void
|
||||||
debug_fixup_after_fork_exec ()
|
debug_fixup_after_fork_exec ()
|
||||||
{
|
{
|
||||||
debug_printf ("BEFORE");
|
|
||||||
/* No lock needed at this point */
|
/* No lock needed at this point */
|
||||||
handle_list *hl;
|
handle_list *hl;
|
||||||
for (hl = &cygheap->debug.starth; hl->next != NULL; /* nothing */)
|
for (hl = &cygheap->debug.starth; hl->next != NULL; /* nothing */)
|
||||||
@ -179,7 +178,6 @@ debug_printf ("BEFORE");
|
|||||||
hl = hl->next;
|
hl = hl->next;
|
||||||
else
|
else
|
||||||
delete_handle (hl); // removes hl->next
|
delete_handle (hl); // removes hl->next
|
||||||
debug_printf ("AFTER");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool __stdcall
|
static bool __stdcall
|
||||||
|
@ -865,13 +865,10 @@ child_info_spawn::cleanup ()
|
|||||||
CloseHandle (ev);
|
CloseHandle (ev);
|
||||||
ev = NULL;
|
ev = NULL;
|
||||||
}
|
}
|
||||||
debug_printf ("type %d, type == _CH_EXEC == %d, hExeced %p", type, type == _CH_EXEC, hExeced);
|
|
||||||
if (type == _CH_EXEC)
|
if (type == _CH_EXEC)
|
||||||
{
|
{
|
||||||
if (iscygwin () && hExeced)
|
if (iscygwin () && hExeced)
|
||||||
{debug_printf ("cleaning up");
|
|
||||||
proc_subproc (PROC_EXEC_CLEANUP, 0);
|
proc_subproc (PROC_EXEC_CLEANUP, 0);
|
||||||
}
|
|
||||||
sync_proc_subproc.release ();
|
sync_proc_subproc.release ();
|
||||||
}
|
}
|
||||||
type = _CH_NADA;
|
type = _CH_NADA;
|
||||||
|
@ -849,7 +849,6 @@ loop:
|
|||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
debug_printf ("about to call cleanup");
|
|
||||||
this->cleanup ();
|
this->cleanup ();
|
||||||
if (envblock)
|
if (envblock)
|
||||||
free (envblock);
|
free (envblock);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user