Merge pull request opensearch-project#342 from javierhonduco/run-clan…

…g-format Format our C code
joshuali925 · Apr 13, 2022 · fa2861c · fa2861c
2 parents a02cbe2 + 527497c
commit fa2861c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   goreleaser:
-    name: Goreleaer Dry
+    name: Goreleaser Dry
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
@@ -68,6 +68,12 @@ jobs:
       - name: Install gofumpt
         run: go install mvdan.cc/gofumpt@latest
 
+      - name: Install clang-format
+        run: sudo apt-get install clang-format
+
+      - name: Show clang-format version
+        run: clang-format --version
+
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 

diff --git a/Makefile b/Makefile
@@ -241,7 +241,7 @@ README.md: $(OUT_DIR)/help.txt deploy/manifests
 	$(CMD_EMBEDMD) -w README.md
 
 .PHONY: format
-format: go/fmt
+format: go/fmt c/fmt
 
 .PHONY: c/fmt
 c/fmt:

diff --git a/parca-agent.bpf.c b/parca-agent.bpf.c
@@ -34,19 +34,19 @@
 // Max depth of each stack trace to track
 #define MAX_STACK_DEPTH 127
 
-#define BPF_MAP(_name, _type, _key_type, _value_type, _max_entries)	       \
-  struct {								       \
-      __uint(type, _type);						       \
-      __uint(max_entries, _max_entries);				       \
-      __type(key, _key_type);						       \
-      __type(value, _value_type);					       \
+#define BPF_MAP(_name, _type, _key_type, _value_type, _max_entries)            \
+  struct {                                                                     \
+    __uint(type, _type);                                                       \
+    __uint(max_entries, _max_entries);                                         \
+    __type(key, _key_type);                                                    \
+    __type(value, _value_type);                                                \
   } _name SEC(".maps");
 
 // Stack Traces are slightly different
 // in that the value is 1 big byte array
 // of the stack addresses
 typedef __u64 stack_trace_type[MAX_STACK_DEPTH];
-#define BPF_STACK_TRACE(_name, _max_entries)				       \
+#define BPF_STACK_TRACE(_name, _max_entries)                                   \
   BPF_MAP(_name, BPF_MAP_TYPE_STACK_TRACE, u32, stack_trace_type, _max_entries);
 
 #define BPF_HASH(_name, _key_type, _value_type)                                \