Tweaking ETW manifest for easier auto-generation of LTTng bindings

By placing structs at the end, it is simpler to generate the LTTng bindings
There was also a redundant ETW event parameter which was confusing the generator.

Author: MSLaguana

lib/Jsrt/JsrtSourceHolder.cpp

@@ -113,7 +113,7 @@ namespace Js
 
 #if ENABLE_DEBUG_CONFIG_OPTIONS
         AssertMsg(reasonString != nullptr, "Reason string for why we are mapping the source was not provided.");
-        JS_ETW(EventWriteJSCRIPT_SOURCEMAPPING((uint32)wcslen(reasonString), reasonString, (ushort)requestedFor));
+        JS_ETW(EventWriteJSCRIPT_SOURCEMAPPING(reasonString, (ushort)requestedFor));
 #endif
     }
 
@@ -285,7 +285,7 @@ namespace Js
 
 #if ENABLE_DEBUG_CONFIG_OPTIONS
         AssertMsg(reasonString != nullptr, "Reason string for why we are mapping the source was not provided.");
-        JS_ETW(EventWriteJSCRIPT_SOURCEMAPPING((uint32)wcslen(reasonString), reasonString, (ushort)requestedFor));
+        JS_ETW(EventWriteJSCRIPT_SOURCEMAPPING(reasonString, (ushort)requestedFor));
 #endif
     }
 

lib/Runtime/Base/ScriptContext.cpp

@@ -6159,11 +6159,11 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
 
                 if (emitV2AsyncStackEvent)
                 {
-                    JS_ETW(EventWriteJSCRIPT_ASYNCCAUSALITY_STACKTRACE_V2(operationID, frameCount, nameBufferLength, sizeof(StackFrameInfo), &stackFrames.Item(0), nameBufferString));
+                    JS_ETW(EventWriteJSCRIPT_ASYNCCAUSALITY_STACKTRACE_V2(operationID, frameCount, nameBufferLength, nameBufferString, sizeof(StackFrameInfo), &stackFrames.Item(0)));
                 }
                 else
                 {
-                    JS_ETW(EventWriteJSCRIPT_STACKTRACE(operationID, frameCount, nameBufferLength, sizeof(StackFrameInfo), &stackFrames.Item(0), nameBufferString));
+                    JS_ETW(EventWriteJSCRIPT_STACKTRACE(operationID, frameCount, nameBufferLength, nameBufferString, sizeof(StackFrameInfo), &stackFrames.Item(0)));
                 }
             }
         }

manifests/Microsoft-Scripting-Chakra-Instrumentation.man

@@ -1614,6 +1614,11 @@
                     inType="win:UInt16"
                     name="NameBufferCount"
                     />
+                <data
+                    inType="win:UnicodeString"
+                    length="NameBufferCount"
+                    name="NameBuffer"
+                    />
                 <struct
                     count="FrameCount"
                     name="Frames"
@@ -1635,11 +1640,6 @@
                         name="NameIndex"
                         />
                 </struct>
-                <data
-                    inType="win:UnicodeString"
-                    length="NameBufferCount"
-                    name="NameBuffer"
-                    />
                 </template>
                 <template tid="Element_Zero">
                 <data
@@ -1836,7 +1836,12 @@
                     inType="win:UInt32"
                     name="FrameNameBufferCount"
                     />
-                <struct
+                <data
+                    inType="win:UnicodeString"
+                    length="FrameNameBufferCount"
+                    name="FrameNameBuffer"
+                    />
+                  <struct
                     count="FrameCount"
                     name="Frames"
                     >
@@ -1862,11 +1867,6 @@
                         name="IsFrameNameIndex"
                         />
                 </struct>
-                <data
-                    inType="win:UnicodeString"
-                    length="FrameNameBufferCount"
-                    name="FrameNameBuffer"
-                    />
                 </template>
                 <template tid="JscriptHostNativeModuleLoad">
                 <data
@@ -1912,13 +1912,8 @@
                     />
                 </template>
                 <template tid="JScriptSourceMappingInfo">
-                <data
-                    inType="win:UInt32"
-                    name="ReasonBufferCount"
-                    />
                 <data
                     inType="win:UnicodeString"
-                    length="ReasonBufferCount"
                     name="ReasonBuffer"
                     />
                 <data
@@ -4092,4 +4087,4 @@
             </stringTable>
         </resources>
     </localization>
-</instrumentationManifest>
+</instrumentationManifest>