Make debuginfod availability non-abi-breaking

Author: peadar

context.cc

@@ -7,13 +7,25 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <elfutils/debuginfod.h>
 
 namespace pstack {
 
+void Context::DidClose::operator() ( struct debuginfod_client *client )
+{
+#ifdef DEBUGINFOD
+    debuginfod_end( client );
+#endif
+}
+
 Context::Context()
     : debugDirectories { "/usr/lib/debug", "/usr/lib/debug/usr" }
     , debug(&std::cerr), output(&std::cout)
 {
+#ifdef DEBUGINFOD
+    if (!options.noDebuginfod)
+       debuginfod.reset( debuginfod_begin() );
+#endif
 }
 
 int dwarfLookups, elfLookups, dwarfHits, elfHits;

elf.cc

@@ -12,6 +12,7 @@
 #include <iomanip>
 #include <iostream>
 #include <cstring>
+#include <elfutils/debuginfod.h>
 
 #include <unistd.h>
 

libpstack/context.h

@@ -3,12 +3,11 @@
 #include <string_view>
 #include <memory>
 #include <vector>
-#ifdef DEBUGINFOD
-#include <elfutils/debuginfod.h>
-#endif
 #include <limits>
 #include <fcntl.h>
 
+struct debuginfod_client;
+
 namespace pstack {
 class Reader;
 
@@ -26,12 +25,10 @@ struct PstackOptions {
     bool dolocals = false;
     bool nothreaddb = false; // don't use threaddb.
     bool nodienames = false; // don't use names from DWARF dies in backtraces.
-    bool noExtDebug = false; // if set, don't look for exernal ELF info, i.e., usinb debuglink, or buildid.
-#ifdef DEBUGINFOD
-    bool doDebuginfod = true; // if set, don't look for exernal ELF info, i.e., usinb debuglink, or buildid.
-#endif
+    bool noExtDebug = false; // don't look for exernal ELF info, i.e., using debuglink, or buildid.
+    bool noDebuginfod = false; // don't use debuginfod client library.
     int maxdepth = std::numeric_limits<int>::max();
-    int maxframes = 20;
+    int maxframes = 30;
 };
 
 class Context {
@@ -45,14 +42,11 @@ class Context {
    std::ostream *debug{};
    std::ostream *output{};
    PstackOptions options{};
-#ifdef DEBUGINFOD
    struct DidClose {
-      void operator() ( debuginfod_client *client ) {
-         debuginfod_end( client );
-      }
+      void operator() ( struct debuginfod_client *client );
+
    };
    std::unique_ptr<debuginfod_client, DidClose> debuginfod;
-#endif
    int verbose{};
    std::vector<std::pair<std::string, std::string>> pathReplacements;
    std::string dirname(const std::string &);

pstack.cc

@@ -219,7 +219,6 @@ emain(int argc, char **argv, Context &context)
 #endif
     std::string execName;
     bool printAllStacks = false;
-    bool disableDebuginfod = false;
     int exitCode = -1; // used for options that exit immediately to signal exit.
     std::string subprocessCmd;
 
@@ -364,7 +363,7 @@ emain(int argc, char **argv, Context &context)
 
 #ifdef DEBUGINFOD
     .add("no-debuginfod", Flags::LONGONLY,
-          "disable debuginfod client", Flags::setf( disableDebuginfod ) )
+          "disable debuginfod client", Flags::setf( context.options.noDebuginfod ) )
 #endif
 
     .parse(argc, argv);
@@ -375,10 +374,7 @@ emain(int argc, char **argv, Context &context)
     // any instance of a non-core ELF image will override default behaviour of
     // discovering the executable
     Elf::Object::sptr exec;
-#ifdef DEBUGINFOD
-    if (!disableDebuginfod)
-       context.debuginfod.reset( debuginfod_begin() );
-#endif
+
     if (execName != "")
          exec = context.getImageForName(execName);