Merge remote-tracking branch 'origin/master' into linux

digitalinfinity · digitalinfinity · commit bddda2dbfadd · 2016-06-30T12:02:13.000-07:00
diff --git a/README.md b/README.md
@@ -89,6 +89,10 @@ Contributions to ChakraCore are welcome.  Here is how you can contribute to Chak
 
 Please refer to [Contribution guidelines](CONTRIBUTING.md) and the [Code of Conduct](CODE_OF_CONDUCT.md) for more details.
 
+### License
+
+Code licensed under the [MIT License](https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt).
+
 ## Roadmap
 For details on our planned features and future direction please refer to our [roadmap](https://github.com/Microsoft/ChakraCore/wiki/Roadmap).
 
diff --git a/build.sh b/build.sh
@@ -206,4 +206,11 @@ if [[ $? == 0 ]]; then
     fi
 fi
 
+$MAKE $MULTICORE_BUILD 2>&1 | tee build.log
+_RET=${PIPESTATUS[0]}
+if [[ $_RET != 0 ]]; then
+    echo Error: $MAKE return $_RET
+fi
+
 popd > /dev/null
+exit $_RET
diff --git a/lib/Runtime/Base/CMakeLists.txt b/lib/Runtime/Base/CMakeLists.txt
@@ -28,6 +28,7 @@ add_library (Chakra.Runtime.Base STATIC
     ThreadContextTlsEntry.cpp
     ThreadServiceWrapperBase.cpp
     Utf8SourceInfo.cpp
+    VTuneChakraProfile.cpp
     # WindowsFoundationAdapter.cpp
     # WindowsGlobalizationAdapter.cpp
     )
diff --git a/lib/Runtime/Base/VTuneChakraProfile.cpp b/lib/Runtime/Base/VTuneChakraProfile.cpp
@@ -19,25 +19,30 @@ bool VTuneChakraProfile::isJitProfilingActive = false;
 //
 void VTuneChakraProfile::Register()
 {
+#if ENABLE_NATIVE_CODEGEN
     isJitProfilingActive = (iJIT_IsProfilingActive() == iJIT_SAMPLING_ON);
+#endif
 }
 
 //
 // Unregister and notify VTune that even sampling is done.
 //
 void VTuneChakraProfile::UnRegister()
 {
+#if ENABLE_NATIVE_CODEGEN
     if(isJitProfilingActive)
     {
         iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, NULL);
     }
+#endif
 }
 
 //
 // Log JIT method native load event to VTune 
 //
 void VTuneChakraProfile::LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::FunctionEntryPointInfo* entryPoint)
 {
+#if ENABLE_NATIVE_CODEGEN
     if (isJitProfilingActive)
     {
         iJIT_Method_Load methodInfo;
@@ -105,13 +110,15 @@ void VTuneChakraProfile::LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::Fu
             HeapDeleteArray(length, utf8MethodName);
         }
     }
+#endif
 }
 
 //
 // Log loop body load event to VTune 
 //
 void VTuneChakraProfile::LogLoopBodyLoadEvent(Js::FunctionBody* body, Js::LoopHeader* loopHeader, Js::LoopEntryPointInfo* entryPoint, uint16 loopNumber)
 {
+#if ENABLE_NATIVE_CODEGEN
     if (isJitProfilingActive)
     {
         iJIT_Method_Load methodInfo;
@@ -144,6 +151,7 @@ void VTuneChakraProfile::LogLoopBodyLoadEvent(Js::FunctionBody* body, Js::LoopHe
             HeapDeleteArray(length, utf8MethodName);
         }
     }
+#endif
 }
 
 //
diff --git a/lib/Runtime/Base/VTuneChakraProfile.h b/lib/Runtime/Base/VTuneChakraProfile.h
@@ -15,7 +15,7 @@ class VTuneChakraProfile
     static void Register();
     static void UnRegister();
 
-	static void LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::FunctionEntryPointInfo* entryPoint);
+    static void LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::FunctionEntryPointInfo* entryPoint);
     static void LogLoopBodyLoadEvent(Js::FunctionBody* body, Js::LoopHeader* loopHeader, Js::LoopEntryPointInfo* entryPoint, uint16 loopNumber);
 
     static const utf8char_t DynamicCode[];

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ add_library (Chakra.Runtime.Base STATIC`
`28`	`28`	`ThreadContextTlsEntry.cpp`
`29`	`29`	`ThreadServiceWrapperBase.cpp`
`30`	`30`	`Utf8SourceInfo.cpp`
	`31`	`+ VTuneChakraProfile.cpp`
`31`	`32`	`# WindowsFoundationAdapter.cpp`
`32`	`33`	`# WindowsGlobalizationAdapter.cpp`
`33`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,25 +19,30 @@ bool VTuneChakraProfile::isJitProfilingActive = false;`
`19`	`19`	`//`
`20`	`20`	`void VTuneChakraProfile::Register()`
`21`	`21`	`{`
	`22`	`+#if ENABLE_NATIVE_CODEGEN`
`22`	`23`	`isJitProfilingActive = (iJIT_IsProfilingActive() == iJIT_SAMPLING_ON);`
	`24`	`+#endif`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`//`
`26`	`28`	`// Unregister and notify VTune that even sampling is done.`
`27`	`29`	`//`
`28`	`30`	`void VTuneChakraProfile::UnRegister()`
`29`	`31`	`{`
	`32`	`+#if ENABLE_NATIVE_CODEGEN`
`30`	`33`	`if(isJitProfilingActive)`
`31`	`34`	`{`
`32`	`35`	`iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, NULL);`
`33`	`36`	`}`
	`37`	`+#endif`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`//`
`37`	`41`	`// Log JIT method native load event to VTune`
`38`	`42`	`//`
`39`	`43`	`void VTuneChakraProfile::LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::FunctionEntryPointInfo* entryPoint)`
`40`	`44`	`{`
	`45`	`+#if ENABLE_NATIVE_CODEGEN`
`41`	`46`	`if (isJitProfilingActive)`
`42`	`47`	`{`
`43`	`48`	`iJIT_Method_Load methodInfo;`
`@@ -105,13 +110,15 @@ void VTuneChakraProfile::LogMethodNativeLoadEvent(Js::FunctionBody* body, Js::Fu`
`105`	`110`	`HeapDeleteArray(length, utf8MethodName);`
`106`	`111`	`}`
`107`	`112`	`}`
	`113`	`+#endif`
`108`	`114`	`}`
`109`	`115`
`110`	`116`	`//`
`111`	`117`	`// Log loop body load event to VTune`
`112`	`118`	`//`
`113`	`119`	`void VTuneChakraProfile::LogLoopBodyLoadEvent(Js::FunctionBody* body, Js::LoopHeader* loopHeader, Js::LoopEntryPointInfo* entryPoint, uint16 loopNumber)`
`114`	`120`	`{`
	`121`	`+#if ENABLE_NATIVE_CODEGEN`
`115`	`122`	`if (isJitProfilingActive)`
`116`	`123`	`{`
`117`	`124`	`iJIT_Method_Load methodInfo;`
`@@ -144,6 +151,7 @@ void VTuneChakraProfile::LogLoopBodyLoadEvent(Js::FunctionBody* body, Js::LoopHe`
`144`	`151`	`HeapDeleteArray(length, utf8MethodName);`
`145`	`152`	`}`
`146`	`153`	`}`
	`154`	`+#endif`
`147`	`155`	`}`
`148`	`156`
`149`	`157`	`//`