[esan|cfrag] Add the skeleton to handle the cfrag argument

[zhaoqin]

Summary

Adds the struct declaration for the cache-fragmentation tool variable
passed to the runtime library.

Updates test struct-simple.cpp.

[bruening]

[esan|cfrag] Adds struct CacheFragType

nit: title should be "Add" not "Adds" for consistency

[zhaoqin]

Update commit msg

[zhaoqin]

Rename CacheFragType to CacheFragTy for consistency.

[aizatsky]

lib/esan/cache_frag.cpp

21

Again, the same question as for D20541 - is there a reason to have this specialized rather than shared for all tools?

Tool & UnitName seem to be generic enough.

[aizatsky]

lib/esan/cache_frag.cpp

21

I saw following CLs and I've got my answers: different tools will have different structures.

[filcab]

lib/esan/cache_frag.cpp

22

Same as D20541: No need passing ToolType in the struct, since we're passing it to __esan_init

30

Same as above. If we get here and this test fails, then we should have failed on an __esan_init call.

[zhaoqin]

Rebase to ToT.
Remove ToolType.

[zhaoqin]

Add ToolInfo and CacheFragInfo

[filcab]

If we have a common ToolInfo struct, maybe we can switch __esan_init to
take it instead of a void* so we can do without a few of the casts.

LGTM, anyway.

Thank you,

Filipe

[zhaoqin]

Remove ToolInfo

[zhaoqin]

Final

lib/esan/cache_frag.cpp

 //
 // This file contains cache fragmentation-specific code.
 //===----------------------------------------------------------------------===//
 
 #include "esan.h"
 
 namespace __esan {
 
+// This should be kept consistent with LLVM's EfficiencySanitizer CacheFragType.
+// The tool-specific information per compilation unit (module).
+struct CacheFragTy {
+  ToolType WhichTool;
+  const char *UnitName;
+};
+
 //===-- Init/exit functions -----------------------------------------------===//
 
 void processCacheFragCompilationUnitInit(void *Ptr) {
-  VPrintf(2, "in esan::%s\n", __FUNCTION__);
+  CacheFragTy *CacheFrag = (CacheFragTy *)Ptr;
+  if (CacheFrag->WhichTool != WhichTool)
+    return;
+  VPrintf(2, "in esan::%s: %s\n", __FUNCTION__, CacheFrag->UnitName);
 }
 
 void processCacheFragCompilationUnitExit(void *Ptr) {
-  VPrintf(2, "in esan::%s\n", __FUNCTION__);
+  CacheFragTy *CacheFrag = (CacheFragTy *)Ptr;
+  if (CacheFrag->WhichTool != WhichTool)
+    return;
+  VPrintf(2, "in esan::%s: %s\n", __FUNCTION__, CacheFrag->UnitName);
 }
 
 void initializeCacheFrag() {
   VPrintf(2, "in esan::%s\n", __FUNCTION__);
 }
 
 int finalizeCacheFrag() {
   VPrintf(2, "in esan::%s\n", __FUNCTION__);
   // FIXME: add the cache fragmentation final report.
   Report("%s is not finished: nothing yet to report\n", SanitizerToolName);
   return 0;
 }
 
 } // namespace __esan

test/esan/TestCases/struct-simple.cpp

 
 //===-- compilation unit with main function -------------------------------===//
 
 #ifdef MAIN
 int main(int argc, char **argv) {
   // CHECK:      in esan::initializeLibrary
   // CHECK-NEXT: in esan::initializeCacheFrag
   // CHECK:      in esan::processCompilationUnitInit
-  // CHECK-NEXT: in esan::processCacheFragCompilationUnitInit
+  // CHECK-NEXT: in esan::processCacheFragCompilationUnitInit: {{.*}}struct-simple.cpp
   // CHECK-NEXT: in esan::processCompilationUnitInit
-  // CHECK-NEXT: in esan::processCacheFragCompilationUnitInit
+  // CHECK-NEXT: in esan::processCacheFragCompilationUnitInit: {{.*}}struct-simple.cpp
   part();
   return 0;
   // CHECK:      in esan::finalizeLibrary
   // CHECK-NEXT: in esan::finalizeCacheFrag
   // CHECK-NEXT: {{.*}}EfficiencySanitizer is not finished: nothing yet to report
   // CHECK-NEXT: in esan::processCompilationUnitExit
-  // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit
+  // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp
   // CHECK-NEXT: in esan::processCompilationUnitExit
-  // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit
+  // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp
 }
 #endif // MAIN