refactor: improve compile efficiency cont. again

Author: kylewanginchina

.gitignore

@@ -32,7 +32,7 @@ target/
 /agent/src/ebpf/kernel/*.ll
 /agent/src/ebpf/kernel/*.objdump
 /agent/src/ebpf/kernel/*.elf
-/agent/src/ebpf/kernel/*.elf.debug
+/agent/src/ebpf/.output/
 /agent/src/ebpf/user/socket_trace_bpf_5_2.c
 /agent/src/ebpf/user/socket_trace_bpf_core.c
 /agent/src/ebpf/user/socket_trace_bpf_common.c
@@ -54,6 +54,3 @@ target/
 /agent/src/ebpf/samples/rust/socket-tracer/src/ebpf.rs
 /agent/src/ebpf/.flamegraph.pl
 /agent/src/ebpf/kernel/*.tmp
-/agent/src/ebpf/kernel/.output/
-/agent/src/ebpf/.last_ebpf_build_target
-

agent/.gitignore

@@ -12,7 +12,7 @@ src/flow_generator/protocol_logs/mq/pulsar.proto.rs
 src/ebpf/data
 src/ebpf/.data_done
 src/ebpf/libtrace.a
-src/ebpf/staticobjs/
+src/ebpf/.output/
 src/ebpf/deepflow-ebpfctl
 src/ebpf/kernel/*.elf.tmp
 src/ebpf/kernel/socket_trace.ll

agent/build.rs

@@ -15,8 +15,7 @@
  */
 
 use std::{
-    env,
-    fs,
+    env, fs,
     path::{Path, PathBuf},
     process::Command,
     str,
@@ -171,7 +170,10 @@ fn set_build_libtrace() -> Result<()> {
         target_env
     );
     let root = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
-    let state_file = root.join("src/ebpf/.last_ebpf_build_target");
+    let state_file = root.join("src/ebpf/.output/.last_ebpf_build_target");
+    if let Some(parent) = state_file.parent() {
+        fs::create_dir_all(parent)?;
+    }
     let previous_target = fs::read_to_string(&state_file)
         .ok()
         .map(|s| s.trim().to_owned());
@@ -197,7 +199,8 @@ fn set_build_libtrace() -> Result<()> {
         Err(_) => true,
     };
     let objdump_value = if objdump_enabled { "1" } else { "0" };
-    let kernel_output_dir = format!(".output/{}", target_id);
+    let ebpf_output_dir = format!(".output/{}", target_id);
+    let kernel_output_dir = format!("../{}/kernel", ebpf_output_dir);
 
     let cargo_makeflags = env::var("CARGO_MAKEFLAGS").ok();
     let num_jobs = env::var("NUM_JOBS").ok();
@@ -213,6 +216,7 @@ fn set_build_libtrace() -> Result<()> {
         cmd.arg("--no-print-directory");
         cmd.arg(format!("VMLINUX_OBJDUMP={}", objdump_value));
         cmd.arg(format!("KERNEL_OUTPUT_DIR={}", kernel_output_dir));
+        cmd.arg(format!("OBJDIR={}", ebpf_output_dir));
         match target_env.as_str() {
             "gnu" => {}
             "musl" => {

agent/src/ebpf/Makefile

@@ -38,9 +38,9 @@ MUSL_CC ?= musl-gcc
 LLVM_STRIP ?= /usr/bin/llvm-strip
 LLVM_OBJDUMP ?= /usr/bin/llvm-objdump
 VMLINUX_OBJDUMP ?= 1
-OBJDIR ?= .
+OBJDIR ?= .output
 STATIC_OBJDIR := $(OBJDIR)/staticobjs
-KERNEL_OUTPUT_DIR ?= .output
+KERNEL_OUTPUT_DIR ?= ../.output/kernel
 
 -include user/extended/feature.top.mk
 
@@ -382,6 +382,7 @@ clean:
 	$(Q)$(MAKE) -C libs/jattach clean --no-print-directory
 	$(Q)rm -rf $(ELFFILES) data deepflow-ebpfctl $(STATIC_OBJDIR) $(LIBTRACE) *.a
 	$(Q)rm -rf kernel/$(KERNEL_OUTPUT_DIR)
+	$(Q)rm -rf .output
 	$(Q)rm -rf .profiler .socket-tracer
 	$(Q)rm -rf samples/rust/socket-tracer/target
 	$(Q)rm -rf samples/rust/profiler/target