diff options
| author | Aleksei Vereshchagin <avereschagin@dev.rtsoft.ru> | 2018-05-18 15:58:02 +0300 |
|---|---|---|
| committer | Aleksei Vereshchagin <avereschagin@dev.rtsoft.ru> | 2018-05-18 15:58:02 +0300 |
| commit | 08817f543a95311b6e3bb914a09ec5b6baf06521 (patch) | |
| tree | f52edd3254e008932cdd6e69e3a4511c12620f5d | |
| parent | fde77186b7c90715feb55d3a8a39c3044842c7ce (diff) | |
| parent | d98df3e6aaf6a9ac15c9525739179907e4850c59 (diff) | |
| download | heaptrack-08817f543a95311b6e3bb914a09ec5b6baf06521.tar.gz heaptrack-08817f543a95311b6e3bb914a09ec5b6baf06521.tar.bz2 heaptrack-08817f543a95311b6e3bb914a09ec5b6baf06521.zip | |
Merge branch 'managed-profiler' into 'delivery'
# Conflicts:
# scripts/heaptrack-pid.sh
| -rwxr-xr-x | scripts/heaptrack-pid.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/heaptrack-pid.sh b/scripts/heaptrack-pid.sh index 4a18115..16eb3f6 100755 --- a/scripts/heaptrack-pid.sh +++ b/scripts/heaptrack-pid.sh @@ -22,8 +22,14 @@ export AUL_APPID=${APP_ID} export CORECLR_PROFILER={C7BAD323-25F0-4C0B-B354-566390B215CA} export CORECLR_PROFILER_PATH=${HEAPTRACK_DIR}/libprofiler.so export CORECLR_ENABLE_PROFILING=1 -export COMPlus_AltJit=* -export COMPlus_AltJitName='liblegacyjit.so' + +#TODO: remove this once RyuJIT is the default and has ELT callbacks support +legacyjit=$(find -L "/usr/share/dotnet" -name liblegacyjit.so) +if [ ! -z "$legacyjit" ]; then + echo 'Using legacy JIT' + export COMPlus_AltJit=* + export COMPlus_AltJitName='liblegacyjit.so' +fi nohup ./heaptrack /usr/bin/dotnet-launcher --standalone ${APP_PATH} & |