Add 'size' field to module load event.

[ChuckR]

Summary

Simply adds the size field to this event.

[ki.stfu]

Update MIExtensions.txt please

test/tools/lldb-mi/TestMiLibraryLoaded.py

32

it may cause false negative on systems where full path to lldb dir contains bad symbols that should be escaped (" or \ etc). I had the same issue in MiSyntaxTestCase.

tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

725

GetByteSize returns uint32_t/uint64_t therefore you should use PRIu32/64 here

[abidh]

I wonder what you plan to do with the section size.

[ChuckR]

test/tools/lldb-mi/TestMiLibraryLoaded.py

32

Any suggestions for checking the size then? I could make a second test that only checks for the size field?

[ki.stfu]

test/tools/lldb-mi/TestMiLibraryLoaded.py

32

I think u can use an analogue of AddSlashes:

>>> def add_slashes(x): return x.replace("\\", "\\\\").replace("\"", "\\\"").replace("\'", "\\\'")
... 
>>> print "C:\\foo\\bar\\baz\"\'ext"
C:\foo\bar\baz"'ext
>>> print add_slashes("C:\\foo\\bar\\baz\"\'ext")
C:\\foo\\bar\\baz\"\'ext

test/tools/lldb-mi/TestMiLibraryLoaded.py

         path = os.path.join(os.getcwd(), self.myexe)
         symbols_path = os.path.join(path + ".dSYM", "Contents", "Resources", "DWARF", self.myexe)
         self.expect([
-                "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"1\",symbols-path=\"%s\",loaded_addr=\"-\"" % (path, path, path, symbols_path),
-                "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"0\",loaded_addr=\"-\"" % (path, path, path)
-            ], exactly = True)
+                "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"1\",symbols-path=\"%s\",loaded_addr=\"-\",size=\"[0-9]+\"" % (path, path, path, symbols_path),
+                "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"0\",loaded_addr=\"-\",size=\"[0-9]+\"" % (path, path, path)
+            ])
 
 if __name__ == '__main__':
     unittest2.main()

tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

             bOk = bOk && vwrMiOutOfBandRecord.Add(miValueResult5);
         }
         // Build "loaded_addr" field
-        const lldb::SBAddress sbAddress(vModule.GetObjectFileHeaderAddress());
+        lldb::SBAddress sbAddress(vModule.GetObjectFileHeaderAddress());
         CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
         const lldb::addr_t nLoadAddress(sbAddress.GetLoadAddress(rSessionInfo.GetTarget()));
         const CMIUtilString strLoadedAddr(nLoadAddress != LLDB_INVALID_ADDRESS ?

         const CMICmnMIValueConst miValueConst6(strLoadedAddr);
         const CMICmnMIValueResult miValueResult6("loaded_addr", miValueConst6);
         bOk = bOk && vwrMiOutOfBandRecord.Add(miValueResult6);
+        
+         // Build "size" field
+        lldb::SBSection sbSection = sbAddress.GetSection();
+        const CMIUtilString strSize(CMIUtilString::Format("%ld", sbSection.GetByteSize()));
+        const CMICmnMIValueConst miValueConst7(strSize);
+        const CMICmnMIValueResult miValueResult7("size", miValueConst7);
+        bOk = bOk && vwrMiOutOfBandRecord.Add(miValueResult7);   
     }
-
     return bOk;
 }