Fix PAL double initialize

Author: obastemur

bin/ch/ChakraRtInterface.cpp

@@ -49,15 +49,8 @@ bool ChakraRTInterface::LoadChakraDll(ArgInfo* argInfo, HINSTANCE *outLibrary)
 #ifndef CHAKRA_STATIC_LIBRARY
     HINSTANCE library = nullptr;
 
-    char filename[_MAX_PATH];
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-
-    char modulename[_MAX_PATH];
-    GetModuleFileNameA(NULL, modulename, _MAX_PATH);
-    _splitpath_s(modulename, drive, _MAX_DRIVE, dir, _MAX_DIR, nullptr, 0, nullptr, 0);
-    _makepath_s(filename, drive, dir, chakraDllName, nullptr);
-    LPCSTR dllName = filename;
+    char dllName[_MAX_PATH];
+    GetBinaryPathWithFileNameA(dllName, _MAX_PATH, chakraDllName);
 
     library = LoadChakraCore(dllName);
     *outLibrary = library;

bin/ch/Helpers.cpp

@@ -6,6 +6,14 @@
 
 #include <sys/stat.h>
 
+#if defined(__APPLE__)
+#include <mach-o/dyld.h> // _NSGetExecutablePath
+#elif defined(__linux__)
+#include <unistd.h> // readlink
+#elif !defined(_WIN32)
+#error "How to get the executable path for this platform?"
+#endif // _WIN32 ?
+
 //TODO: x-plat definitions
 #ifdef _WIN32
 typedef char16 TTDHostCharType;
@@ -725,3 +733,97 @@ void CALLBACK Helpers::TTFlushAndCloseStreamCallback(JsTTDStreamHandle handle, b
     fclose((FILE*)handle);
 }
 
+#define SET_BINARY_PATH_ERROR_MESSAGE(path, msg) \
+    str_len = (int) strlen(msg);                 \
+    memcpy(path, msg, (size_t)str_len);          \
+    path[str_len] = char(0)
+
+void GetBinaryLocation(char *path, const unsigned size)
+{
+    AssertMsg(path != nullptr, "Path can not be nullptr");
+    AssertMsg(size < INT_MAX, "Isn't it too big for a path buffer?");
+#ifdef _WIN32
+    LPWSTR wpath = (WCHAR*)malloc(sizeof(WCHAR) * size);
+    int str_len;
+    if (!wpath)
+    {
+        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName has failed. OutOfMemory!");
+        return;
+    }
+    str_len = GetModuleFileNameW(NULL, wpath, size - 1);
+    if (str_len <= 0)
+    {
+        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName has failed.");
+        free(wpath);
+        return;
+    }
+
+    str_len = WideCharToMultiByte(CP_UTF8, 0, wpath, str_len, path, size, NULL, NULL);
+    free(wpath);
+
+    if (str_len <= 0)
+    {
+        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName (WideCharToMultiByte) has failed.");
+        return;
+    }
+
+    if ((unsigned)str_len > size - 1)
+    {
+        str_len = (int) size - 1;
+    }
+    path[str_len] = char(0);
+#elif defined(__APPLE__)
+    uint32_t path_size = (uint32_t)size;
+    char *tmp = nullptr;
+    int str_len;
+    if (_NSGetExecutablePath(path, &path_size))
+    {
+        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: _NSGetExecutablePath has failed.");
+        return;
+    }
+
+    tmp = (char*)malloc(size);
+    char *result = realpath(path, tmp);
+    str_len = strlen(result);
+    memcpy(path, result, str_len);
+    free(tmp);
+    path[str_len] = char(0);
+#elif defined(__linux__)
+    int str_len = readlink("/proc/self/exe", path, size - 1);
+    if (str_len <= 0)
+    {
+        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: /proc/self/exe has failed.");
+        return;
+    }
+    path[str_len] = char(0);
+#else
+#warning "Implement GetBinaryLocation for this platform"
+#endif
+}
+
+// xplat-todo: Implement a corresponding solution for GetModuleFileNameW
+// and cleanup PAL. [ https://github.com/Microsoft/ChakraCore/pull/2288 should be merged first ]
+// GetModuleFileName* PAL is not reliable and forces us to explicitly double initialize PAL
+// with argc / argv....
+void GetBinaryPathWithFileNameA(char *path, const size_t buffer_size, const char* filename)
+{
+    char fullpath[_MAX_PATH];
+    char drive[_MAX_DRIVE];
+    char dir[_MAX_DIR];
+
+    char modulename[_MAX_PATH];
+    GetBinaryLocation(modulename, _MAX_PATH);
+    _splitpath_s(modulename, drive, _MAX_DRIVE, dir, _MAX_DIR, nullptr, 0, nullptr, 0);
+    _makepath_s(fullpath, drive, dir, filename, nullptr);
+
+    size_t len = strlen(fullpath);
+    if (len < buffer_size)
+    {
+        memcpy(path, fullpath, len * sizeof(char));
+    }
+    else
+    {
+        len = 0;
+    }
+    path[len] = char(0);
+}

bin/ch/WScriptJsrt.cpp

@@ -20,17 +20,14 @@
 #define DEST_PLATFORM_TEXT "win32"
 #else // ! _WIN32
 #if defined(__APPLE__)
-#include <mach-o/dyld.h> // _NSGetExecutablePath
 #ifdef __IOS__
 #define DEST_PLATFORM_TEXT "ios"
 #else // ! iOS
 #define DEST_PLATFORM_TEXT "darwin"
 #endif // iOS ?
 #elif defined(__ANDROID__)
-#include <unistd.h> // readlink
 #define DEST_PLATFORM_TEXT "android"
 #elif defined(__linux__)
-#include <unistd.h> // readlink
 #define DEST_PLATFORM_TEXT "posix"
 #elif defined(__FreeBSD__) || defined(__unix__)
 #define DEST_PLATFORM_TEXT "bsd"
@@ -740,74 +737,6 @@ bool WScriptJsrt::InstallObjectsOnObject(JsValueRef object, const char* name,
     return true;
 }
 
-#define SET_BINARY_PATH_ERROR_MESSAGE(path, msg) \
-    str_len = (int) strlen(msg);                 \
-    memcpy(path, msg, (size_t)str_len);          \
-    path[str_len] = char(0)
-
-void GetBinaryLocation(char *path, const unsigned size)
-{
-    AssertMsg(size >= 512 && path != nullptr, "Min path buffer size 512 and path can not be nullptr");
-    AssertMsg(size < INT_MAX, "Isn't it too big for a path buffer?");
-#ifdef _WIN32
-    LPWSTR wpath = (WCHAR*)malloc(sizeof(WCHAR) * size);
-    int str_len;
-    if (!wpath)
-    {
-        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName has failed. OutOfMemory!");
-        return;
-    }
-    str_len = GetModuleFileNameW(NULL, wpath, size - 1);
-    if (str_len <= 0)
-    {
-        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName has failed.");
-        free(wpath);
-        return;
-    }
-
-    str_len = WideCharToMultiByte(CP_UTF8, 0, wpath, str_len, path, size, NULL, NULL);
-    free(wpath);
-
-    if (str_len <= 0)
-    {
-        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: GetModuleFileName (WideCharToMultiByte) has failed.");
-        return;
-    }
-
-    if ((unsigned)str_len > size - 1)
-    {
-        str_len = (int) size - 1;
-    }
-    path[str_len] = char(0);
-#elif defined(__APPLE__)
-    uint32_t path_size = (uint32_t)size;
-    char *tmp = nullptr;
-    int str_len;
-    if (_NSGetExecutablePath(path, &path_size))
-    {
-        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: _NSGetExecutablePath has failed.");
-        return;
-    }
-
-    tmp = (char*)malloc(size);
-    char *result = realpath(path, tmp);
-    str_len = strlen(result);
-    memcpy(path, result, str_len);
-    free(tmp);
-    path[str_len] = char(0);
-#elif defined(__linux__)
-    int str_len = readlink("/proc/self/exe", path, size - 1);
-    if (str_len <= 0)
-    {
-        SET_BINARY_PATH_ERROR_MESSAGE(path, "GetBinaryLocation: /proc/self/exe has failed.");
-        return;
-    }
-    path[str_len] = char(0);
-#else
-#warning "Implement GetBinaryLocation for this platform"
-#endif
-}
-
 bool WScriptJsrt::Initialize()
 {
     HRESULT hr = S_OK;

bin/ch/ch.cpp

@@ -737,7 +737,10 @@ unsigned int WINAPI StaticThreadProc(void *lpParam)
 static char16** argv = nullptr;
 int main(int argc, char** c_argv)
 {
-    PAL_InitializeChakraCore(argc, c_argv);
+#ifndef CHAKRA_STATIC_LIBRARY
+// xplat-todo: PAL free CH ?
+    PAL_InitializeChakraCore();
+#endif
     argv = new char16*[argc];
     for (int i = 0; i < argc; i++)
     {

bin/ch/stdafx.h

@@ -257,3 +257,6 @@ inline JsErrorCode CreatePropertyIdFromString(const char* str, JsPropertyIdRef *
 {
     return ChakraRTInterface::JsCreatePropertyId(str, strlen(str), Id);
 }
+
+void GetBinaryLocation(char *path, const unsigned size);
+void GetBinaryPathWithFileNameA(char *path, const size_t buffer_size, const char* filename);

lib/Common/Core/SysInfo.cpp

@@ -65,7 +65,7 @@ AutoSystemInfo::Initialize()
 {
     Assert(!initialized);
 #ifndef _WIN32
-    PAL_InitializeDLL();
+    PAL_InitializeChakraCore();
     majorVersion = CHAKRA_CORE_MAJOR_VERSION;
     minorVersion = CHAKRA_CORE_MINOR_VERSION;
 #endif

lib/Common/Memory/RecyclerWriteBarrierManager.cpp

@@ -57,7 +57,7 @@ X64WriteBarrierCardTableManager::OnThreadInit()
     ULONG_PTR stackEnd = 0;
     ::GetCurrentThreadStackLimits(&stackEnd, &stackBase);
 #endif
-    
+
     size_t numPages = (stackBase - stackEnd) / AutoSystemInfo::PageSize;
     // stackEnd is the lower boundary
     return OnSegmentAlloc((char*) stackEnd, numPages);

lib/Jsrt/JsrtHelper.cpp

@@ -120,7 +120,7 @@ void JsrtCallbackState::ObjectBeforeCallectCallbackWrapper(JsObjectBeforeCollect
 #endif
 
 #ifndef _WIN32
-        PAL_InitializeChakraCore(0, NULL);
+        PAL_InitializeChakraCore();
 #endif
 
         HMODULE mod = GetModuleHandleW(NULL);

pal/inc/pal.h

@@ -390,44 +390,14 @@ typedef long time_t;
 #define DLL_THREAD_DETACH  3
 #define DLL_PROCESS_DETACH 0
 
-#define PAL_INITIALIZE_NONE            0x00
-#define PAL_INITIALIZE_SYNC_THREAD     0x01
-#define PAL_INITIALIZE_EXEC_ALLOCATOR  0x02
-#define PAL_INITIALIZE_REGISTER_SIGTERM_HANDLER     0x08
-#define PAL_INITIALIZE_DEBUGGER_EXCEPTIONS          0x10
-
-// PAL_Initialize() flags
-#define PAL_INITIALIZE                 PAL_INITIALIZE_SYNC_THREAD
-
-// PAL_InitializeDLL() flags - don't start any of the helper threads
-#define PAL_INITIALIZE_DLL             PAL_INITIALIZE_NONE
-
-// PAL_InitializeChakraCore() flags
-#define PAL_INITIALIZE_CHAKRACORE         (PAL_INITIALIZE | PAL_INITIALIZE_EXEC_ALLOCATOR)
-
 typedef DWORD (PALAPI *PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
 typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
 
 /******************* PAL-Specific Entrypoints *****************************/
 
-PALIMPORT
-int
-PALAPI
-PAL_Initialize(
-    int argc,
-    const char * const argv[]);
-
-PALIMPORT
 int
 PALAPI
-PAL_InitializeDLL();
-
-PALIMPORT
-DWORD
-PALAPI
-PAL_InitializeChakraCore(
-    int argc,
-    char** argv);
+PAL_InitializeChakraCore();
 
 PALIMPORT
 DWORD_PTR
@@ -464,30 +434,6 @@ PALAPI
 PAL_TerminateEx(
     int exitCode);
 
-/*++
-Function:
-  PAL_SetShutdownCallback
-
-Abstract:
-  Sets a callback that is executed when the PAL is shut down because of
-  ExitProcess, TerminateProcess or PAL_Shutdown but not PAL_Terminate/Ex.
-
-  NOTE: Currently only one callback can be set at a time.
---*/
-typedef VOID (*PSHUTDOWN_CALLBACK)(void);
-
-PALIMPORT
-VOID
-PALAPI
-PAL_SetShutdownCallback(
-    IN PSHUTDOWN_CALLBACK callback);
-
-PALIMPORT
-void
-PALAPI
-PAL_InitializeDebug(
-    void);
-
 PALIMPORT
 VOID
 PALAPI
@@ -522,15 +468,6 @@ PAL_Random(
     IN OUT LPVOID lpBuffer,
     IN DWORD dwLength);
 
-// This helper will be used *only* by the CoreCLR to determine
-// if an address lies inside CoreCLR or not.
-//
-// This shouldnt be used by any other component that links into the PAL.
-PALIMPORT
-BOOL
-PALAPI
-PAL_IsIPInCoreCLR(IN PVOID address);
-
 #ifdef PLATFORM_UNIX
 
 PALIMPORT