#include "path_manager.h"
#include "log_manager.h"
-#define PLUGIN_PATH "/usr/share/dotnet.tizen/lib/libdotnet_plugin.so"
-#define ENV_FILE_PATH "/usr/share/dotnet.tizen/lib/coreclr_env.list"
-
namespace tizen {
namespace runtime {
namespace dotnetcore {
}
}
-static std::u16string utf8ToUtf16(char* str)
-{
- std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
- return convert.from_bytes(str);
-}
-
void CoreRuntime::preloadTypes()
{
const static std::string initDllPath = "/usr/share/dotnet.tizen/framework/Tizen.Init.dll";
int CoreRuntime::initialize(bool standalone)
{
- // checkInjection checks dotnet-launcher run mode,
- // if it contains DOTNET_LAUNCHER_INJECT variable, it injects library.
+ // checkInjection checks dotnet-launcher run mode
// At the moment, this mechanism is used only when the Memory Profiler is started.
int res = checkInjection();
if (res != 0) {
// Write Debug.WriteLine to stderr
putenv(const_cast<char *>("COMPlus_DebugWriteToStdErr=1"));
+#ifdef USE_DEFAULT_BASE_ADDR
+ putenv(const_cast<char *>("COMPlus_UseDefaultBaseAddr=1"));
+#endif // USE_DEFAULT_BASE_ADDR
+
// read string from external file and set them to environment value.
setEnvFromFile();
CORELIB_RETURN_IF_NOSYM(coreclr_execute_assembly_ptr, executeAssembly, "coreclr_execute_assembly");
CORELIB_RETURN_IF_NOSYM(coreclr_shutdown_ptr, shutdown, "coreclr_shutdown");
CORELIB_RETURN_IF_NOSYM(coreclr_create_delegate_ptr, createDelegate, "coreclr_create_delegate");
- CORELIB_RETURN_IF_NOSYM(set_environment_variable_ptr, setEnvironmentVariable, "SetEnvironmentVariableW");
#undef CORELIB_RETURN_IF_NOSYM
std::string appRoot = std::string("/proc/self/fd/") + std::to_string(fd);
std::string appBin = concatPath(appRoot, "bin");
std::string appLib = concatPath(appRoot, "lib");
- std::string probePath = appBin + ":" + appLib;
+ std::string appTac = concatPath(appBin, TAC_SYMLINK_SUB_DIR);
+ std::string probePath = appBin + ":" + appLib + ":" + appTac;
+ std::string NIprobePath = concatPath(appBin, APP_NI_SUB_DIR) + ":" + concatPath(appLib, APP_NI_SUB_DIR) + ":" + appTac;
std::string tpa = getTPA();
- std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory;
+ std::string runtimeDir = getRuntimeDir();
+ std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory + ":" + runtimeDir;
std::string appName = std::string("dotnet-launcher-") + std::to_string(getpid());
- if (!initializeCoreClr(appName.c_str(), probePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) {
+ if (!initializeCoreClr(appName.c_str(), probePath.c_str(), NIprobePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) {
_ERR("Failed to initialize coreclr");
return -1;
}
+ int st = createDelegate(__hostHandle, __domainId, "Dotnet.Launcher", "Dotnet.Launcher.Environment", "SetEnvironmentVariable", (void**)&setEnvironmentVariable);
+ if (st < 0 || setEnvironmentVariable == nullptr) {
+ _ERR("Create delegate for Dotnet.Launcher.dll -> Dotnet.Launcher.Environment -> SetEnvironmentVariable failed (0x%08x)", st);
+ return -1;
+ }
+
__initialized = true;
if (!standalone)
bool CoreRuntime::initializeCoreClr(const char* appId,
const char* assemblyProbePaths,
+ const char* NIProbePaths,
const char* pinvokeProbePaths,
const char* tpaList)
{
const char *propertyValues[] = {
tpaList,
assemblyProbePaths,
- assemblyProbePaths,
+ NIProbePaths,
pinvokeProbePaths,
"UseLatestBehaviorWhenTFMNotSpecified"
};
// application data path can be changed by owner. So, we have to set data path just before launching.
char* localDataPath = app_get_data_path();
if (localDataPath != nullptr) {
- std::u16string envval = utf8ToUtf16(localDataPath);
-
- if (!setEnvironmentVariable(u"XDG_DATA_HOME", envval.c_str())) {
- _ERR("Failed to set XDG_DATA_HOME");
- }
-
+ setEnvironmentVariable("XDG_DATA_HOME", localDataPath);
free(localDataPath);
}