Add log for profile data when the app runs

[platform/core/dotnet/launcher.git] / NativeLauncher / launcher / lib / core_runtime.cc

diff --git a/NativeLauncher/launcher/lib/core_runtime.cc b/NativeLauncher/launcher/lib/core_runtime.cc
index c2fca03..ee23fde 100644 (file)
--- a/NativeLauncher/launcher/lib/core_runtime.cc
+++ b/NativeLauncher/launcher/lib/core_runtime.cc
@@ -154,36 +154,38 @@ static bool storage_cb(int id, storage_type_e type, storage_state_e state, const
        return true;
 }
 
-static void initEnvForSpecialFolder()
+static void setSpecialFolder(storage_directory_e type, const char* key)
 {
-       int storageId;
        int error;
-       char *path = NULL;
+       char* path = NULL;
+       static int __storageId = -1;
 
-       error = storage_foreach_device_supported(storage_cb, &storageId);
-       if (error != STORAGE_ERROR_NONE) {
-               return;
+       if (__storageId < 0) {
+               error = storage_foreach_device_supported(storage_cb, &__storageId);
+               if (error != STORAGE_ERROR_NONE) {
+                       return;
+               }
        }
 
-       error = storage_get_directory(storageId, STORAGE_DIRECTORY_IMAGES, &path);
+       error = storage_get_directory(__storageId, type, &path);
        if (error == STORAGE_ERROR_NONE && path != NULL) {
-               setenv("XDG_PICTURES_DIR", const_cast<char *>(path), 1);
+               setenv(key, const_cast<char *>(path), 1);
                free(path);
-               path = NULL;
        }
+}
 
-       error = storage_get_directory(storageId, STORAGE_DIRECTORY_MUSIC, &path);
-       if (error == STORAGE_ERROR_NONE && path != NULL) {
-               setenv("XDG_MUSIC_DIR", const_cast<char *>(path), 1);
-               free(path);
-               path = NULL;
+static void initEnvForSpecialFolder()
+{
+       if (getenv("XDG_PICTURES_DIR") == NULL) {
+               setSpecialFolder(STORAGE_DIRECTORY_IMAGES, "XDG_PICTURES_DIR");
        }
 
-       error = storage_get_directory(storageId, STORAGE_DIRECTORY_VIDEOS, &path);
-       if (error == STORAGE_ERROR_NONE && path != NULL) {
-               setenv("XDG_VIDEOS_DIR", const_cast<char *>(path), 1);
-               free(path);
-               path = NULL;
+       if (getenv("XDG_MUSIC_DIR") == NULL) {
+               setSpecialFolder(STORAGE_DIRECTORY_MUSIC, "XDG_MUSIC_DIR");
+       }
+
+       if (getenv("XDG_VIDEOS_DIR") == NULL) {
+               setSpecialFolder(STORAGE_DIRECTORY_VIDEOS, "XDG_VIDEOS_DIR");
        }
 }
 
@@ -275,12 +277,15 @@ void preload()
 
 bool initializeCoreClr(PathManager* pm, const std::string& tpa)
 {
+       bool ncdbStartupHook = isNCDBStartupHookProvided();
+
        const char *propertyKeys[] = {
                "TRUSTED_PLATFORM_ASSEMBLIES",
                "APP_PATHS",
                "APP_NI_PATHS",
                "NATIVE_DLL_SEARCH_DIRECTORIES",
-               "AppDomainCompatSwitch"
+               "AppDomainCompatSwitch",
+               ncdbStartupHook ? "STARTUP_HOOKS" : "" // must be the last one
        };
 
        const char *propertyValues[] = {
@@ -288,14 +293,15 @@ bool initializeCoreClr(PathManager* pm, const std::string& tpa)
                pm->getAppPaths().c_str(),
                pm->getAppNIPaths().c_str(),
                pm->getNativeDllSearchingPaths().c_str(),
-               "UseLatestBehaviorWhenTFMNotSpecified"
+               "UseLatestBehaviorWhenTFMNotSpecified",
+               ncdbStartupHook ? getNCDBStartupHook() : "" // must be the last one
        };
 
        std::string selfPath = readSelfPath();
 
        int st = initializeClr(selfPath.c_str(),
                                                        "TizenDotnetApp",
-                                                       sizeof(propertyKeys) / sizeof(propertyKeys[0]),
+                                                       sizeof(propertyKeys) / sizeof(propertyKeys[0]) - (ncdbStartupHook ? 0 : 1),
                                                        propertyKeys,
                                                        propertyValues,
                                                        &__hostHandle,
@@ -576,6 +582,7 @@ int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
 
                        if (exist(multiCoreJitProfile)) {
                                setEnvironmentVariable("COMPlus_MultiCoreJitNoProfileGather", "1");
+                               _INFO("Completed loading of profile data for the %s", appId);
                        } else {
                                setEnvironmentVariable("COMPlus_MultiCoreJitNoProfileGather", "0");
                                // stop profiling and write collected data after delay if env value is set.
@@ -588,6 +595,7 @@ int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
                                                stopProfileAfterDelay(delay);
                                        }
                                }
+                               _INFO("Create the profile data for the %s", appId);
                        }
                }
                free(localDataPath);