Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.6] win: avoid stack overflow in initial deserialization #23255

Merged
merged 1 commit into from
Aug 21, 2017
Merged

[release-0.6] win: avoid stack overflow in initial deserialization #23255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion src/dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2595,11 +2595,51 @@ JL_DLLEXPORT void jl_set_sysimg_so(void *handle)
jl_sysimg_handle = handle;
}

#ifdef _OS_WINDOWS_
static unsigned __stdcall _jl_restore_system_image_from_stream(void*);
extern DWORD jl_tls_key;
#endif

static void jl_restore_system_image_from_stream(ios_t *f)
{
#ifdef _OS_WINDOWS_
// on Windows, the default stack size is insufficient
// for this serializer design,
// use a separate thread to run this function
// as a workaround
int en = jl_gc_enable(0);
void *main_ptls = TlsGetValue(jl_tls_key);
void *args[] = {
(void*)f,
(void*)main_ptls
};
HANDLE hThread = (HANDLE)_beginthreadex(
NULL,
8 * 1024 * 1024, /* 8 MB */
&_jl_restore_system_image_from_stream,
(void*)args,
0,
NULL);
WaitForSingleObject(hThread, INFINITE);
CloseHandle(hThread);

jl_gc_reset_alloc_count();
jl_gc_enable(en);
jl_update_all_fptrs();
}

static unsigned __stdcall _jl_restore_system_image_from_stream(void* threadargs)
{
ios_t *f = (ios_t*)((void**)threadargs)[0];
void *old_ptls = TlsGetValue(jl_tls_key);
void *main_ptls = ((void**)threadargs)[1];
TlsSetValue(jl_tls_key, main_ptls);
#else
int en = jl_gc_enable(0);
#endif

JL_TIMING(SYSIMG_LOAD);
jl_ptls_t ptls = jl_get_ptls_states();
int en = jl_gc_enable(0);
arraylist_new(&backref_list, 250000);
jl_serializer_state s = {
f, MODE_SYSTEM_IMAGE,
Expand Down Expand Up @@ -2663,9 +2703,14 @@ static void jl_restore_system_image_from_stream(ios_t *f)
//jl_printf(JL_STDERR, "backref_list.len = %d\n", backref_list.len);
arraylist_free(&backref_list);

#ifdef _OS_WINDOWS_
TlsSetValue(jl_tls_key, old_ptls);
return 0;
#else
jl_gc_reset_alloc_count();
jl_gc_enable(en);
jl_update_all_fptrs();
#endif
}

JL_DLLEXPORT void jl_restore_system_image(const char *fname)
Expand Down
2 changes: 1 addition & 1 deletion src/threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jl_get_ptls_states_func jl_get_ptls_states_getter(void)
// Apparently windows doesn't have a static TLS model (or one that can be
// reliably used from a shared library) either..... Use `TLSAlloc` instead.

static DWORD jl_tls_key;
DWORD jl_tls_key;

// Put this here for now. We can move this out later if we find more use for it.
BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle, IN DWORD nReason,
Expand Down