Skip to content

fix bpftune Makefile to support parallel make #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-maguire merged 1 commit into from
Jul 13, 2023
Merged

fix bpftune Makefile to support parallel make #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix bpftune Makefile to support parallel make 
make -j6 was failing; turns out we were bundling making of
legacy and non-legacy objects in the same targets. it is better
to split these into separate targets and add dependencies for
all. with this change in place "make -j6" succeeds.

Reported-by: https://github.com/srcshelton
Signed-off-by: Alan Maguire <[email protected]>
  • Loading branch information
@alan-maguire
alan-maguire committed Jul 13, 2023
commit 5983b913e14791d93a5ac2aa8b77470e7b84a8d9
22 changes: 15 additions & 7 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ TUNER_LIBS = $(patsubst %,$(OPATH)%.so,$(TUNERS))
BPF_TUNERS = $(patsubst %,%.bpf.o,$(TUNERS))

BPF_OBJS = $(BPF_TUNERS) probe.bpf.o
LEGACY_BPF_OBJS = $(patsubst %.bpf.o,%.bpf.legacy.o,$(BPF_OBJS))

BPF_SKELS = $(patsubst %,%.skel.h,$(TUNERS)) probe.skel.h
LEGACY_BPF_SKELS = $(patsubst %.skel.h,%.skel.legacy.h,$(BPF_SKELS))

.DELETE_ON_ERROR:

Expand All @@ -105,7 +107,7 @@ all: analyze $(OPATH) $(OPATH)bpftune $(TUNER_LIBS)
$(OPATH):
mkdir $(OPATH)

analyze: $(BPF_SKELS)
analyze: $(BPF_SKELS) $(LEGACY_BPF_SKELS)
$(CLANG) --analyze $(INCLUDES) libbpftune.c bpftune.c $(TUNER_SRCS)
clean:
$(call QUIET_CLEAN, bpftune)
Expand Down Expand Up @@ -144,7 +146,9 @@ $(OPATH)libbpftune.so: libbpftune.c ../include/bpftune/libbpftune.h $(OPATH)libb
rm -f $(@) ; \
ln -sr $(@).$(VERSION) $(@)

$(TUNER_LIBS): $(OPATH)libbpftune.so $(BPF_SKELS) $(TUNER_OBJS)
$(TUNER_OBJS): $(BPF_SKELS) $(LEGACY_BPF_SKELS)

$(TUNER_LIBS): $(OPATH)libbpftune.so $(TUNER_OBJS)
$(CC) $(CFLAGS) -shared -o $(@) $(patsubst $(OPATH)%.so,%.c,$(@)) \
$(LDLIBS) -lbpftune $(LDFLAGS)

Expand All @@ -158,13 +162,17 @@ $(OPATH)bpftune.o: $(OPATH)libbpftune.so
$(QUIET_GEN)$(BPFTOOL) gen skeleton $< > $@

$(BPF_OBJS): $(patsubst %.o,%.c,$(BPF_OBJS))
$(CLANG) $(BPF_CFLAGS) -D__TARGET_ARCH_$(SRCARCH) -O2 -target bpf \
$(CLANG) $(BPF_CFLAGS) -D__TARGET_ARCH_$(SRCARCH) -O2 -target bpf \
$(INCLUDES) -c $(patsubst %.o,%.c,$(@)) -o $(@);

$(LEGACY_BPF_OBJS): $(patsubst %.legacy.o,%.c,$(LEGACY_BPF_OBJS))
$(CLANG) $(BPF_CFLAGS) -D__TARGET_ARCH_$(SRCARCH) -DBPFTUNE_LEGACY -O2 -target bpf \
$(INCLUDES) -c $(patsubst %.o,%.c,$(@)) \
-o $(patsubst %.o,%.legacy.o,$(@))
$(INCLUDES) -c $(patsubst %.legacy.o,%.c,$(@)) \
-o $(@)

$(BPF_SKELS): $(BPF_OBJS)
$(BPFTOOL) gen skeleton $(subst .skel.h,.bpf.o,$@) > $@ ;\
$(BPFTOOL) gen skeleton $(subst .skel.h,.bpf.legacy.o,$@) > $(subst .skel.h,.skel.legacy.h,$@)
$(BPFTOOL) gen skeleton $(subst .skel.h,.bpf.o,$@) > $@

$(LEGACY_BPF_SKELS): $(LEGACY_BPF_OBJS)
$(BPFTOOL) gen skeleton $(subst .skel.legacy.h,.bpf.legacy.o,$@) > $(subst .skel.h,.skel.legacy.h,$@)