Commit eb2bce93 authored by Teng Qin's avatar Teng Qin

Move StatusTuple definition to exception.h

parent b06d97c1
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "bcc_syms.h" #include "bcc_syms.h"
#include "bpf_module.h" #include "bpf_module.h"
#include "common.h"
#include "exception.h" #include "exception.h"
#include "libbpf.h" #include "libbpf.h"
#include "perf_reader.h" #include "perf_reader.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "BPFTable.h" #include "BPFTable.h"
#include "bcc_syms.h" #include "bcc_syms.h"
#include "bpf_module.h" #include "bpf_module.h"
#include "common.h"
#include "compat/linux/bpf.h" #include "compat/linux/bpf.h"
#include "libbpf.h" #include "libbpf.h"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "BPFTable.h" #include "BPFTable.h"
#include "bcc_syms.h" #include "bcc_syms.h"
#include "common.h"
#include "exception.h" #include "exception.h"
#include "libbpf.h" #include "libbpf.h"
#include "perf_reader.h" #include "perf_reader.h"
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <vector> #include <vector>
#include "bpf_module.h" #include "bpf_module.h"
#include "common.h"
#include "libbpf.h" #include "libbpf.h"
#include "perf_reader.h" #include "perf_reader.h"
......
...@@ -63,7 +63,7 @@ target_link_libraries(bcc-static b_frontend clang_frontend bcc-loader-static ${c ...@@ -63,7 +63,7 @@ target_link_libraries(bcc-static b_frontend clang_frontend bcc-loader-static ${c
install(TARGETS bcc-shared LIBRARY COMPONENT libbcc install(TARGETS bcc-shared LIBRARY COMPONENT libbcc
DESTINATION ${CMAKE_INSTALL_LIBDIR}) DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES bpf_common.h bpf_module.h bcc_syms.h common.h exception.h libbpf.h perf_reader.h BPF.h BPFTable.h COMPONENT libbcc install(FILES bpf_common.h bpf_module.h bcc_syms.h exception.h libbpf.h perf_reader.h BPF.h BPFTable.h COMPONENT libbcc
DESTINATION include/bcc) DESTINATION include/bcc)
install(DIRECTORY compat/linux/ COMPONENT libbcc install(DIRECTORY compat/linux/ COMPONENT libbcc
DESTINATION include/bcc/compat/linux DESTINATION include/bcc/compat/linux
......
...@@ -28,6 +28,4 @@ make_unique(Args &&... args) { ...@@ -28,6 +28,4 @@ make_unique(Args &&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
} }
typedef std::tuple<int, std::string> StatusTuple;
} // namespace ebpf } // namespace ebpf
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
namespace ebpf { namespace ebpf {
typedef std::tuple<int, std::string> StatusTuple;
template <typename... Args> template <typename... Args>
std::tuple<int, std::string> mkstatus(int ret, const char *fmt, Args... args) { std::tuple<int, std::string> mkstatus(int ret, const char *fmt, Args... args) {
char buf[1024]; char buf[1024];
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include "common.h" #include "common.h"
#include "exception.h"
#include "scope.h" #include "scope.h"
#define REVISION_MASK 0xfff #define REVISION_MASK 0xfff
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment