From aa63ea9e61b6a65df40769612b744cbd08b057ae Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 16 Jun 2018 09:37:36 +0200
Subject: [PATCH] snake_case xbt/backtrace.hpp

---
 include/xbt/backtrace.hpp   | 3 ++-
 src/xbt/backtrace.cpp       | 2 +-
 src/xbt/backtrace_dummy.cpp | 8 ++++++--
 src/xbt/backtrace_linux.cpp | 8 ++++++--
 src/xbt/exception.cpp       | 6 +++---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 754bd5fb22..ae378b7216 100644
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -29,7 +29,8 @@ XBT_PUBLIC std::vector<xbt_backtrace_location_t> backtrace();
  *
  *  Try ro resolve symbols and source code location.
  */
-XBT_PUBLIC std::vector<std::string> resolveBacktrace(xbt_backtrace_location_t const* loc, std::size_t count);
+XBT_PUBLIC std::vector<std::string> resolve_backtrace(xbt_backtrace_location_t const* loc, std::size_t count);
+XBT_ATTRIB_DEPRECATED_v323("Please use xbt::resolve_backtrace()") XBT_PUBLIC std::vector<std::string> resolveBacktrace(xbt_backtrace_location_t const* loc, std::size_t count);
 }
 }
 
diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index c05076a8d9..0fc1168abe 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -32,7 +32,7 @@ static bool startWith(std::string str, const char* prefix)
 void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count)
 {
 #ifdef HAVE_BACKTRACE
-  std::vector<std::string> backtrace = simgrid::xbt::resolveBacktrace(loc, count);
+  std::vector<std::string> backtrace = simgrid::xbt::resolve_backtrace(loc, count);
   if (backtrace.empty()) {
     fprintf(stderr, "(backtrace not set)\n");
     return;
diff --git a/src/xbt/backtrace_dummy.cpp b/src/xbt/backtrace_dummy.cpp
index 655a4c2200..95bf87aaa8 100644
--- a/src/xbt/backtrace_dummy.cpp
+++ b/src/xbt/backtrace_dummy.cpp
@@ -23,8 +23,12 @@ int xbt_backtrace_no_malloc(void **array, int size) {
 namespace simgrid {
 namespace xbt {
 
-std::vector<std::string> resolveBacktrace(
-  xbt_backtrace_location_t const* loc, std::size_t count)
+std::vector<std::string> resolveBacktrace(xbt_backtrace_location_t const* loc, std::size_t count) // deprecated
+{
+  return resolve_backtrace(loc, count);
+}
+
+std::vector<std::string> resolve_backtrace(xbt_backtrace_location_t const* loc, std::size_t count)
 {
   return std::vector<std::string>();
 }
diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp
index 5df45b93ba..3c8ecb3820 100644
--- a/src/xbt/backtrace_linux.cpp
+++ b/src/xbt/backtrace_linux.cpp
@@ -136,10 +136,14 @@ static std::string get_binary_path()
   return "";
 }
 
+std::vector<std::string> resolveBacktrace(xbt_backtrace_location_t const* loc, std::size_t count) // deprecated
+{
+  return resolve_backtrace(loc, count);
+}
+
 //FIXME: This code could be greatly improved/simplifyied with
 //   http://cairo.sourcearchive.com/documentation/1.9.4/backtrace-symbols_8c-source.html
-std::vector<std::string> resolveBacktrace(
-  xbt_backtrace_location_t const* loc, std::size_t count)
+std::vector<std::string> resolve_backtrace(xbt_backtrace_location_t const* loc, std::size_t count)
 {
   std::vector<std::string> result;
 
diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index e57759dece..ba9bbcf07e 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -44,8 +44,8 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
 
     // Do we have a backtrace?
     if (with_context != nullptr && not simgrid::config::get_value<bool>("exception/cutpath")) {
-      auto backtrace = simgrid::xbt::resolveBacktrace(
-        with_context->backtrace().data(), with_context->backtrace().size());
+      auto backtrace =
+          simgrid::xbt::resolve_backtrace(with_context->backtrace().data(), with_context->backtrace().size());
       for (std::string const& s : backtrace)
         XBT_LOG(prio, "  -> %s", s.c_str());
     }
@@ -76,7 +76,7 @@ static void showBacktrace(std::vector<xbt_backtrace_location_t>& bt)
     XBT_LOG(xbt_log_priority_critical, "Display of current backtrace disabled by --cfg=exception/cutpath.");
     return;
   }
-  std::vector<std::string> res = resolveBacktrace(&bt[0], bt.size());
+  std::vector<std::string> res = resolve_backtrace(&bt[0], bt.size());
   XBT_LOG(xbt_log_priority_critical, "Current backtrace:");
   for (std::string const& s : res)
     XBT_LOG(xbt_log_priority_critical, "  -> %s", s.c_str());
-- 
2.20.1