Commit 7745990d authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb/Plugin] Rename TSanRuntime for consistency with plugin (NFC) 

Renames TSanRuntime to InstrumentationRuntimeTSan to be
consistent with the directory structure and plugin name.
parent 0feedebf

lldb/source/API/SystemInitializerFull.cpp

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"

#include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"

#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/TSanRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h"

#include "Plugins/InstrumentationRuntime/UBSan/UBSanRuntime.h"

#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"

#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
@@ -223,7 +223,7 @@ llvm::Error SystemInitializerFull::Initialize() { 
  minidump::ProcessMinidump::Initialize();

  MemoryHistoryASan::Initialize();

  InstrumentationRuntimeASan::Initialize();

  ThreadSanitizerRuntime::Initialize();

  InstrumentationRuntimeTSan::Initialize();

  UndefinedBehaviorSanitizerRuntime::Initialize();

  MainThreadCheckerRuntime::Initialize();
@@ -317,7 +317,7 @@ void SystemInitializerFull::Terminate() { 
  minidump::ProcessMinidump::Terminate();

  MemoryHistoryASan::Terminate();

  InstrumentationRuntimeASan::Terminate();

  ThreadSanitizerRuntime::Terminate();

  InstrumentationRuntimeTSan::Terminate();

  UndefinedBehaviorSanitizerRuntime::Terminate();

  MainThreadCheckerRuntime::Terminate();

  wasm::SymbolVendorWasm::Terminate();

lldb/source/Plugins/InstrumentationRuntime/TSan/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
add_lldb_library(lldbPluginInstrumentationRuntimeTSan PLUGIN

  TSanRuntime.cpp

  InstrumentationRuntimeTSan.cpp



  LINK_LIBS

    lldbBreakpoint

lldb/source/Plugins/InstrumentationRuntime/TSan/TSanRuntime.cpp→lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp

+35 −34
Original line number Diff line number Diff line 
//===-- TSanRuntime.cpp -----------------------------------------*- C++ -*-===//

//===-- InstrumentationRuntimeTSan.cpp --------------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,7 @@ 
//

//===----------------------------------------------------------------------===//



#include "TSanRuntime.h"

#include "InstrumentationRuntimeTSan.h"



#include "Plugins/Process/Utility/HistoryThread.h"

#include "lldb/Breakpoint/StoppointCallbackContext.h"
@@ -36,29 +36,29 @@ using namespace lldb; 
using namespace lldb_private;



lldb::InstrumentationRuntimeSP

ThreadSanitizerRuntime::CreateInstance(const lldb::ProcessSP &process_sp) {

  return InstrumentationRuntimeSP(new ThreadSanitizerRuntime(process_sp));

InstrumentationRuntimeTSan::CreateInstance(const lldb::ProcessSP &process_sp) {

  return InstrumentationRuntimeSP(new InstrumentationRuntimeTSan(process_sp));

}



void ThreadSanitizerRuntime::Initialize() {

void InstrumentationRuntimeTSan::Initialize() {

  PluginManager::RegisterPlugin(

      GetPluginNameStatic(), "ThreadSanitizer instrumentation runtime plugin.",

      CreateInstance, GetTypeStatic);

}



void ThreadSanitizerRuntime::Terminate() {

void InstrumentationRuntimeTSan::Terminate() {

  PluginManager::UnregisterPlugin(CreateInstance);

}



lldb_private::ConstString ThreadSanitizerRuntime::GetPluginNameStatic() {

lldb_private::ConstString InstrumentationRuntimeTSan::GetPluginNameStatic() {

  return ConstString("ThreadSanitizer");

}



lldb::InstrumentationRuntimeType ThreadSanitizerRuntime::GetTypeStatic() {

lldb::InstrumentationRuntimeType InstrumentationRuntimeTSan::GetTypeStatic() {

  return eInstrumentationRuntimeTypeThreadSanitizer;

}



ThreadSanitizerRuntime::~ThreadSanitizerRuntime() { Deactivate(); }

InstrumentationRuntimeTSan::~InstrumentationRuntimeTSan() { Deactivate(); }



const char *thread_sanitizer_retrieve_report_data_prefix = R"(

extern "C"
@@ -299,8 +299,8 @@ static user_id_t Renumber(uint64_t id, 
  return IT->second;

}



StructuredData::ObjectSP

ThreadSanitizerRuntime::RetrieveReportData(ExecutionContextRef exe_ctx_ref) {

StructuredData::ObjectSP InstrumentationRuntimeTSan::RetrieveReportData(

    ExecutionContextRef exe_ctx_ref) {

  ProcessSP process_sp = GetProcessSP();

  if (!process_sp)

    return StructuredData::ObjectSP();
@@ -486,7 +486,7 @@ ThreadSanitizerRuntime::RetrieveReportData(ExecutionContextRef exe_ctx_ref) { 
}



std::string

ThreadSanitizerRuntime::FormatDescription(StructuredData::ObjectSP report) {

InstrumentationRuntimeTSan::FormatDescription(StructuredData::ObjectSP report) {

  std::string description = report->GetAsDictionary()

                                ->GetValueForKey("issue_type")

                                ->GetAsString()
@@ -580,7 +580,7 @@ static void GetSymbolDeclarationFromAddress(ProcessSP process_sp, addr_t addr, 
  decl = var->GetDeclaration();

}



addr_t ThreadSanitizerRuntime::GetFirstNonInternalFramePc(

addr_t InstrumentationRuntimeTSan::GetFirstNonInternalFramePc(

    StructuredData::ObjectSP trace, bool skip_one_frame) {

  ProcessSP process_sp = GetProcessSP();

  ModuleSP runtime_module_sp = GetRuntimeModuleSP();
@@ -609,7 +609,7 @@ addr_t ThreadSanitizerRuntime::GetFirstNonInternalFramePc( 
}



std::string

ThreadSanitizerRuntime::GenerateSummary(StructuredData::ObjectSP report) {

InstrumentationRuntimeTSan::GenerateSummary(StructuredData::ObjectSP report) {

  ProcessSP process_sp = GetProcessSP();



  std::string summary = report->GetAsDictionary()
@@ -695,8 +695,8 @@ ThreadSanitizerRuntime::GenerateSummary(StructuredData::ObjectSP report) { 
  return summary;

}



addr_t

ThreadSanitizerRuntime::GetMainRacyAddress(StructuredData::ObjectSP report) {

addr_t InstrumentationRuntimeTSan::GetMainRacyAddress(

    StructuredData::ObjectSP report) {

  addr_t result = (addr_t)-1;



  report->GetObjectForDotSeparatedPath("mops")->GetAsArray()->ForEach(
@@ -711,7 +711,7 @@ ThreadSanitizerRuntime::GetMainRacyAddress(StructuredData::ObjectSP report) { 
  return (result == (addr_t)-1) ? 0 : result;

}



std::string ThreadSanitizerRuntime::GetLocationDescription(

std::string InstrumentationRuntimeTSan::GetLocationDescription(

    StructuredData::ObjectSP report, addr_t &global_addr,

    std::string &global_name, std::string &filename, uint32_t &line) {

  std::string result = "";
@@ -791,15 +791,15 @@ std::string ThreadSanitizerRuntime::GetLocationDescription( 
  return result;

}



bool ThreadSanitizerRuntime::NotifyBreakpointHit(

bool InstrumentationRuntimeTSan::NotifyBreakpointHit(

    void *baton, StoppointCallbackContext *context, user_id_t break_id,

    user_id_t break_loc_id) {

  assert(baton && "null baton");

  if (!baton)

    return false;



  ThreadSanitizerRuntime *const instance =

      static_cast<ThreadSanitizerRuntime *>(baton);

  InstrumentationRuntimeTSan *const instance =

      static_cast<InstrumentationRuntimeTSan *>(baton);



  ProcessSP process_sp = instance->GetProcessSP();
@@ -873,12 +873,13 @@ bool ThreadSanitizerRuntime::NotifyBreakpointHit( 
    return false; // Let target run

}



const RegularExpression &ThreadSanitizerRuntime::GetPatternForRuntimeLibrary() {

const RegularExpression &

InstrumentationRuntimeTSan::GetPatternForRuntimeLibrary() {

  static RegularExpression regex(llvm::StringRef("libclang_rt.tsan_"));

  return regex;

}



bool ThreadSanitizerRuntime::CheckIfRuntimeIsValid(

bool InstrumentationRuntimeTSan::CheckIfRuntimeIsValid(

    const lldb::ModuleSP module_sp) {

  static ConstString g_tsan_get_current_report("__tsan_get_current_report");

  const Symbol *symbol = module_sp->FindFirstSymbolWithNameAndType(
@@ -886,7 +887,7 @@ bool ThreadSanitizerRuntime::CheckIfRuntimeIsValid( 
  return symbol != nullptr;

}



void ThreadSanitizerRuntime::Activate() {

void InstrumentationRuntimeTSan::Activate() {

  if (IsActive())

    return;
@@ -916,7 +917,7 @@ void ThreadSanitizerRuntime::Activate() { 
      process_sp->GetTarget()

          .CreateBreakpoint(symbol_address, internal, hardware)

          .get();

  breakpoint->SetCallback(ThreadSanitizerRuntime::NotifyBreakpointHit, this,

  breakpoint->SetCallback(InstrumentationRuntimeTSan::NotifyBreakpointHit, this,

                          true);

  breakpoint->SetBreakpointKind("thread-sanitizer-report");

  SetBreakpointID(breakpoint->GetID());
@@ -924,7 +925,7 @@ void ThreadSanitizerRuntime::Activate() { 
  SetActive(true);

}



void ThreadSanitizerRuntime::Deactivate() {

void InstrumentationRuntimeTSan::Deactivate() {

  if (GetBreakpointID() != LLDB_INVALID_BREAK_ID) {

    ProcessSP process_sp = GetProcessSP();

    if (process_sp) {
@@ -1043,7 +1044,7 @@ static void AddThreadsForPath(const std::string &path, 
}



lldb::ThreadCollectionSP

ThreadSanitizerRuntime::GetBacktracesFromExtendedStopInfo(

InstrumentationRuntimeTSan::GetBacktracesFromExtendedStopInfo(

    StructuredData::ObjectSP info) {

  ThreadCollectionSP threads;

  threads = std::make_shared<ThreadCollection>();

lldb/source/Plugins/InstrumentationRuntime/TSan/TSanRuntime.h→lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h

+4 −4
Original line number Diff line number Diff line 
//===-- TSanRuntime.h -------------------------------------------*- C++ -*-===//

//===-- InstrumentationRuntimeTSan.h ----------------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -16,9 +16,9 @@ 


namespace lldb_private {



class ThreadSanitizerRuntime : public lldb_private::InstrumentationRuntime {

class InstrumentationRuntimeTSan : public lldb_private::InstrumentationRuntime {

public:

  ~ThreadSanitizerRuntime() override;

  ~InstrumentationRuntimeTSan() override;



  static lldb::InstrumentationRuntimeSP

  CreateInstance(const lldb::ProcessSP &process_sp);
@@ -43,7 +43,7 @@ public: 
  GetBacktracesFromExtendedStopInfo(StructuredData::ObjectSP info) override;



private:

  ThreadSanitizerRuntime(const lldb::ProcessSP &process_sp)

  InstrumentationRuntimeTSan(const lldb::ProcessSP &process_sp)

      : lldb_private::InstrumentationRuntime(process_sp) {}



  const RegularExpression &GetPatternForRuntimeLibrary() override;

lldb/tools/lldb-test/SystemInitializerTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"

#include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"

#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/TSanRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h"

#include "Plugins/InstrumentationRuntime/UBSan/UBSanRuntime.h"

#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"

#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
@@ -194,7 +194,7 @@ llvm::Error SystemInitializerTest::Initialize() { 
  minidump::ProcessMinidump::Initialize();

  MemoryHistoryASan::Initialize();

  InstrumentationRuntimeASan::Initialize();

  ThreadSanitizerRuntime::Initialize();

  InstrumentationRuntimeTSan::Initialize();

  UndefinedBehaviorSanitizerRuntime::Initialize();

  MainThreadCheckerRuntime::Initialize();
@@ -287,7 +287,7 @@ void SystemInitializerTest::Terminate() { 
  minidump::ProcessMinidump::Terminate();

  MemoryHistoryASan::Terminate();

  InstrumentationRuntimeASan::Terminate();

  ThreadSanitizerRuntime::Terminate();

  InstrumentationRuntimeTSan::Terminate();

  UndefinedBehaviorSanitizerRuntime::Terminate();

  MainThreadCheckerRuntime::Terminate();

  wasm::SymbolVendorWasm::Terminate();