cc: Style fixes

diff --git a/src/cc/bcc_syms.cc b/src/cc/bcc_syms.cc
index a700e81..445576b 100644 (file)
--- a/src/cc/bcc_syms.cc
+++ b/src/cc/bcc_syms.cc
@@ -31,9 +31,8 @@ ino_t ProcStat::getinode_() {
   return (!stat(procfs_.c_str(), &s)) ? s.st_ino : -1;
 }
 
-ProcStat::ProcStat(int pid) :
-  procfs_(tfm::format("/proc/%d/exe", pid)),
-  inode_(getinode_()) {}
+ProcStat::ProcStat(int pid)
+    : procfs_(tfm::format("/proc/%d/exe", pid)), inode_(getinode_()) {}
 
 void KSyms::_add_symbol(const char *symname, uint64_t addr, void *p) {
   KSyms *ks = static_cast<KSyms *>(p);

diff --git a/src/cc/frontends/clang/b_frontend_action.cc b/src/cc/frontends/clang/b_frontend_action.cc
index f3b59d6..f782dcc 100644 (file)
--- a/src/cc/frontends/clang/b_frontend_action.cc
+++ b/src/cc/frontends/clang/b_frontend_action.cc
@@ -472,20 +472,20 @@ bool BTypeVisitor::VisitCallExpr(CallExpr *Call) {
           text = to_string(numcpu);
           rewriter_.ReplaceText(SourceRange(Call->getLocStart(), Call->getLocEnd()), text);
         } else if (Decl->getName() == "bpf_usdt_readarg_p") {
-        text = "({ u64 __addr = 0x0; ";
-        text += "_bpf_readarg_" + current_fn_ + "_" + args[0] + "(" +
-         args[1] + ", &__addr, sizeof(__addr));";
-        text += "bpf_probe_read(" + args[2] + ", " + args[3] +
-         ", (void *)__addr);";
-        text += "})";
-        rewriter_.ReplaceText(
-          SourceRange(Call->getLocStart(), Call->getLocEnd()), text);
+          text = "({ u64 __addr = 0x0; ";
+          text += "_bpf_readarg_" + current_fn_ + "_" + args[0] + "(" +
+                  args[1] + ", &__addr, sizeof(__addr));";
+          text += "bpf_probe_read(" + args[2] + ", " + args[3] +
+                  ", (void *)__addr);";
+          text += "})";
+          rewriter_.ReplaceText(
+              SourceRange(Call->getLocStart(), Call->getLocEnd()), text);
         } else if (Decl->getName() == "bpf_usdt_readarg") {
-        text = "_bpf_readarg_" + current_fn_ + "_" + args[0] + "(" +
-         args[1] + ", " + args[2] + ", sizeof(*(" + args[2] + ")))";
-        rewriter_.ReplaceText(
-          SourceRange(Call->getLocStart(), Call->getLocEnd()), text);
-       }
+          text = "_bpf_readarg_" + current_fn_ + "_" + args[0] + "(" + args[1] +
+                 ", " + args[2] + ", sizeof(*(" + args[2] + ")))";
+          rewriter_.ReplaceText(
+              SourceRange(Call->getLocStart(), Call->getLocEnd()), text);
+        }
       }
     }
   }

diff --git a/src/cc/usdt.cc b/src/cc/usdt.cc
index f34079d..2d7d8f6 100644 (file)
--- a/src/cc/usdt.cc
+++ b/src/cc/usdt.cc
@@ -53,8 +53,8 @@ bool Probe::in_shared_object() {
 
 bool Probe::resolve_global_address(uint64_t *global, const uint64_t addr) {
   if (in_shared_object()) {
-    return (pid_ && !bcc_resolve_global_addr(
-          *pid_, bin_path_.c_str(), addr, global));
+    return (pid_ &&
+            !bcc_resolve_global_addr(*pid_, bin_path_.c_str(), addr, global));
   }
 
   *global = addr;
@@ -154,16 +154,16 @@ bool Probe::usdt_getarg(std::ostream &stream) {
     std::string cptr = tfm::format("*((%s *)dest)", ctype);
 
     tfm::format(stream,
-        "static inline int _bpf_readarg_%s_%d("
-        "struct pt_regs *ctx, void *dest, size_t len) {\n"
-        "  if (len != sizeof(%s)) return -1;\n",
-        attached_to_.value(), arg_n + 1, ctype);
+                "static inline int _bpf_readarg_%s_%d("
+                "struct pt_regs *ctx, void *dest, size_t len) {\n"
+                "  if (len != sizeof(%s)) return -1;\n",
+                attached_to_.value(), arg_n + 1, ctype);
 
     if (locations_.size() == 1) {
       Location &location = locations_.front();
       stream << "  ";
-      if (!location.arguments_[arg_n].assign_to_local(stream, cptr,
-                                                      bin_path_, pid_))
+      if (!location.arguments_[arg_n].assign_to_local(stream, cptr, bin_path_,
+                                                      pid_))
         return false;
       stream << "\n  return 0;\n}\n";
     } else {
@@ -175,8 +175,8 @@ bool Probe::usdt_getarg(std::ostream &stream) {
           return false;
 
         tfm::format(stream, "  case 0x%xULL: ", global_address);
-        if (!location.arguments_[arg_n].assign_to_local(stream, cptr,
-                                                        bin_path_, pid_))
+        if (!location.arguments_[arg_n].assign_to_local(stream, cptr, bin_path_,
+                                                        pid_))
           return false;
 
         stream << " return 0;\n";
@@ -211,8 +211,8 @@ void Context::add_probe(const char *binpath, const struct bcc_elf_usdt *probe) {
     }
   }
 
-  probes_.emplace_back(new Probe(binpath, probe->provider,
-        probe->name, probe->semaphore, pid_));
+  probes_.emplace_back(
+      new Probe(binpath, probe->provider, probe->name, probe->semaphore, pid_));
   probes_.back()->add_location(probe->pc, probe->arg_fmt);
 }
 
@@ -282,8 +282,7 @@ Context::Context(int pid) : pid_(pid), pid_stat_(pid), loaded_(false) {
 
 Context::~Context() {
   if (pid_stat_ && !pid_stat_->is_stale()) {
-    for (auto &p : probes_)
-      p->disable();
+    for (auto &p : probes_) p->disable();
   }
 }
 }

diff --git a/tests/cc/test_usdt_probes.cc b/tests/cc/test_usdt_probes.cc
index 9d709ba..9d5730e 100644 (file)
--- a/tests/cc/test_usdt_probes.cc
+++ b/tests/cc/test_usdt_probes.cc
@@ -39,7 +39,7 @@ TEST_CASE("test finding a probe in our own process", "[usdt]") {
   REQUIRE(ctx.num_probes() >= 1);
 
   SECTION("our test probe") {
-       auto probe = ctx.get("sample_probe_1");
+    auto probe = ctx.get("sample_probe_1");
     REQUIRE(probe);
 
     REQUIRE(probe->in_shared_object() == false);