Revert "Delayed private heap allocation to after child the process started on windows"
This reverts commit acce462995
.
This commit is contained in:
parent
acce462995
commit
4352c402c0
1 changed files with 5 additions and 22 deletions
|
@ -169,6 +169,8 @@ static void CALLBACK handle_child_terminated(PVOID lpParameter,
|
|||
|
||||
int resume_child(void) {
|
||||
#ifdef VANILLA_WIN32
|
||||
init_inheritable_heap();
|
||||
|
||||
TCHAR mapping_name[128];
|
||||
_sntprintf(mapping_name, 128, g_mapping_name, GetCurrentProcessId());
|
||||
|
||||
|
@ -177,10 +179,8 @@ int resume_child(void) {
|
|||
FALSE,
|
||||
mapping_name);
|
||||
|
||||
if (sharedMem == NULL) {
|
||||
init_inheritable_heap();
|
||||
if (sharedMem == NULL)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct full_context *ctx = (struct full_context *) MapViewOfFile(sharedMem,
|
||||
FILE_MAP_ALL_ACCESS,
|
||||
|
@ -196,20 +196,6 @@ int resume_child(void) {
|
|||
local_ctx = *ctx;
|
||||
UnmapViewOfFile(ctx);
|
||||
|
||||
HANDLE self = GetCurrentThread();
|
||||
DuplicateHandle(GetCurrentProcess(),
|
||||
self,
|
||||
GetCurrentProcess(),
|
||||
&self,
|
||||
0,
|
||||
FALSE,
|
||||
DUPLICATE_SAME_ACCESS);
|
||||
|
||||
SetEvent(local_ctx.sync);
|
||||
SuspendThread(self);
|
||||
|
||||
init_inheritable_heap();
|
||||
|
||||
struct test_single_param *param = NULL;
|
||||
if (local_ctx.param.size != 0) {
|
||||
ctx = (struct full_context*) MapViewOfFile(sharedMem,
|
||||
|
@ -339,6 +325,8 @@ s_proc_handle *fork_process() {
|
|||
if (g_worker_context.suite->data)
|
||||
ctx->suite_data = *g_worker_context.suite->data;
|
||||
|
||||
inherit_heap(info.hProcess);
|
||||
|
||||
if (ResumeThread(info.hThread) == (DWORD) -1)
|
||||
goto failure;
|
||||
|
||||
|
@ -348,11 +336,6 @@ s_proc_handle *fork_process() {
|
|||
if (wres == WAIT_OBJECT_0)
|
||||
goto failure;
|
||||
|
||||
inherit_heap(info.hProcess);
|
||||
|
||||
if (ResumeThread(info.hThread) == (DWORD) -1)
|
||||
goto failure;
|
||||
|
||||
CloseHandle(info.hThread);
|
||||
|
||||
UnmapViewOfFile(ctx);
|
||||
|
|
Loading…
Add table
Reference in a new issue