On Sat, 2024-12-28 at 23:29 -0300, Leonardo Brás wrote: > Gitlab-CI is failing[1] on building CodeSamples due to liburcu v0.15 > deprecating[2] support for liburcu-signal: > > %%% > * Deprecation of liburcu-signal > > Users can migrate to liburcu-memb with a kernel implementing the > membarrier(2) system call to have similar read-side performance without > requiring use of a reserved signal, and with improved grace period > performance. > %%% > > So, in order to avoid breaking builds with liburcu >=0.15 while keeping > support for older systems without sys_membarrier(), check for the existance > of liburcu-signal before adding it to the build command. > > Signed-off-by: Leonardo Bras <[email protected]> > --- > CodeSamples/datastruct/Issaquah/Makefile | 5 ++-- > CodeSamples/datastruct/existence/Makefile | 34 ++++++++++++----------- > CodeSamples/datastruct/hash/Makefile | 7 +++-- > CodeSamples/datastruct/skiplist/Makefile | 5 ++-- > CodeSamples/defer/Makefile | 7 +++-- > 5 files changed, 32 insertions(+), 26 deletions(-) > > diff --git a/CodeSamples/datastruct/Issaquah/Makefile > b/CodeSamples/datastruct/Issaquah/Makefile > index c3b724d7..6a51ff90 100644 > --- a/CodeSamples/datastruct/Issaquah/Makefile > +++ b/CodeSamples/datastruct/Issaquah/Makefile > @@ -26,29 +26,30 @@ include $(top)/depends.mk > ifeq ($(strip $(target)),) > all: > @echo "### None in datastruct/Issaquah/ can be built on arch: > '$(arch)'." > else > all: $(PROGS) > endif > > include $(top)/recipes.mk > > GCC_ARGS += -fcommon > +LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) > > # NOTE: For decent scalability on update-side tests as of early 2015, > # use something like jemalloc() instead of glibc malloc(). > # If you install jemalloc at /home/paulmck/jemalloc, you will > # need the following additional arguments to cc: > # -I/home/paulmck/jemalloc/include > # -L/home/paulmck/jemalloc/lib > # -Wl,--rpath,/home/paulmck/jemalloc/lib > # -DUSE_JEMALLOC > # Verify by using the nm command and searching output for malloc. > > existence_test: existence.c existence_test.c > - cc $(GCC_ARGS) -o existence_test existence.c existence_test.c -lpthread > -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o existence_test existence.c existence_test.c -lpthread > -lurcu $(LURCU_SIG) > > treetorture: tree.c existence.c spinlockmult.c $(LIB)/random.c ../../api.h > treetorture.h treetorturetrace.h $(LIB)/random.h existence.h tree.h > - cc $(GCC_ARGS) -o treetorture tree.c existence.c spinlockmult.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o treetorture tree.c existence.c spinlockmult.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > clean: > rm -f $(PROGS) > diff --git a/CodeSamples/datastruct/existence/Makefile > b/CodeSamples/datastruct/existence/Makefile > index 19891c0f..ac1fb198 100644 > --- a/CodeSamples/datastruct/existence/Makefile > +++ b/CodeSamples/datastruct/existence/Makefile > @@ -22,62 +22,64 @@ PROGS = existence_test \ > existence_3hash_uperf \ > existence_3skiplist_test \ > existence_3skiplist_uperf \ > kaleidoscope_test \ > kaleidoscope_3hash_test \ > kaleidoscope_3skiplist_test \ > kaleidoscope_skiphash_test \ > procon_test > LIB = ../../lib > > +LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) > + > all: $(PROGS) > > # NOTE: For decent scalability on update-side tests as of early 2015, > # use something like jemalloc() instead of glibc malloc(). > # If you install jemalloc at /home/paulmck/jemalloc, you will > # need the following additional arguments to cc: > # -I/home/paulmck/jemalloc/include > # -L/home/paulmck/jemalloc/lib > # -Wl,--rpath,/home/paulmck/jemalloc/lib > # -DUSE_JEMALLOC > # Verify by using the nm command and searching output for malloc. > # > # So it is quite a bit easier to just use the default locations. ;-) > > existence_test: existence.h existence_test.c procon.h > - cc $(GCC_ARGS) -o existence_test existence_test.c -lpthread -lurcu > -lurcu-signal > + cc $(GCC_ARGS) -o existence_test existence_test.c -lpthread -lurcu > $(LURCU_SIG) > > existence_3hash_test: existence.h hash_exists.h keyvalue.h > existence_3hash_test.c procon.h > - cc $(GCC_ARGS) -o existence_3hash_test existence_3hash_test.c -lpthread > -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o existence_3hash_test existence_3hash_test.c -lpthread > -lurcu $(LURCU_SIG) > > existence_3hash_uperf: existence.h hash_exists.h keyvalue.h > existence_3hash_uperf.c procon.h > - # cc -O0 -Wall -ggdb -fno-inline -o existence_3hash_uperf > existence_3hash_uperf.c -ltcmalloc -lpthread -lurcu -lurcu-signal > - cc $(GCC_ARGS) -o existence_3hash_uperf existence_3hash_uperf.c > -ltcmalloc -lpthread -lurcu -lurcu-signal > + # cc -O0 -Wall -ggdb -fno-inline -o existence_3hash_uperf > existence_3hash_uperf.c -ltcmalloc -lpthread -lurcu $(LURCU_SIG) > + cc $(GCC_ARGS) -o existence_3hash_uperf existence_3hash_uperf.c > -ltcmalloc -lpthread -lurcu $(LURCU_SIG) > > existence_3skiplist_test: existence.h skiplist_exists.h keyvalue.h > existence_3skiplist_test.c procon.h > - cc -g -O0 -o existence_3skiplist_test existence_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > - # cc $(GCC_ARGS) -o existence_3skiplist_test existence_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc -g -O0 -o existence_3skiplist_test existence_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > + # cc $(GCC_ARGS) -o existence_3skiplist_test existence_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > existence_3skiplist_uperf: existence.h hash_exists.h keyvalue.h > existence_3skiplist_uperf.c procon.h > - # cc -O0 -Wall -ggdb -fno-inline -o existence_3skiplist_uperf > existence_3skiplist_uperf.c -ltcmalloc $(LIB)/random.c -lpthread -lurcu > -lurcu-signal > - cc $(GCC_ARGS) -o existence_3skiplist_uperf existence_3skiplist_uperf.c > -ltcmalloc $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + # cc -O0 -Wall -ggdb -fno-inline -o existence_3skiplist_uperf > existence_3skiplist_uperf.c -ltcmalloc $(LIB)/random.c -lpthread -lurcu > $(LURCU_SIG) > + cc $(GCC_ARGS) -o existence_3skiplist_uperf existence_3skiplist_uperf.c > -ltcmalloc $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > kaleidoscope_test: kaleidoscope.h kaleidoscope_test.c procon.h > - cc $(GCC_ARGS) -o kaleidoscope_test kaleidoscope_test.c -lpthread > -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o kaleidoscope_test kaleidoscope_test.c -lpthread > -lurcu $(LURCU_SIG) > > kaleidoscope_3hash_test: kaleidoscope.h hash_exists.h keyvalue.h > kaleidoscope_3hash_test.c procon.h > - cc $(GCC_ARGS) -o kaleidoscope_3hash_test kaleidoscope_3hash_test.c > -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o kaleidoscope_3hash_test kaleidoscope_3hash_test.c > -lpthread -lurcu $(LURCU_SIG) > > kaleidoscope_3skiplist_test: kaleidoscope.h skiplist_exists.h keyvalue.h > kaleidoscope_3skiplist_test.c procon.h > - cc -g -O0 -o kaleidoscope_3skiplist_test kaleidoscope_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > - # cc $(GCC_ARGS) -o kaleidoscope_3skiplist_test > kaleidoscope_3skiplist_test.c $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc -g -O0 -o kaleidoscope_3skiplist_test kaleidoscope_3skiplist_test.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > + # cc $(GCC_ARGS) -o kaleidoscope_3skiplist_test > kaleidoscope_3skiplist_test.c $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > kaleidoscope_skiphash_test: kaleidoscope.h skiplist_exists.h keyvalue.h > kaleidoscope_skiphash_test.c procon.h > - cc -g -O0 -o kaleidoscope_skiphash_test kaleidoscope_skiphash_test.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > - # cc $(GCC_ARGS) -o kaleidoscope_skiphash_test > kaleidoscope_skiphash_test.c $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc -g -O0 -o kaleidoscope_skiphash_test kaleidoscope_skiphash_test.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > + # cc $(GCC_ARGS) -o kaleidoscope_skiphash_test > kaleidoscope_skiphash_test.c $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > procon_test: procon.h procon_test.c > - cc -O0 -g -o procon_test procon_test.c -lpthread -lurcu -lurcu-signal > - # cc $(GCC_ARGS) -o procon_test procon_test.c -lpthread -lurcu > -lurcu-signal > + cc -O0 -g -o procon_test procon_test.c -lpthread -lurcu $(LURCU_SIG) > + # cc $(GCC_ARGS) -o procon_test procon_test.c -lpthread -lurcu > $(LURCU_SIG) > > clean: > rm -f $(PROGS) > diff --git a/CodeSamples/datastruct/hash/Makefile > b/CodeSamples/datastruct/hash/Makefile > index a56255a2..7f244e09 100644 > --- a/CodeSamples/datastruct/hash/Makefile > +++ b/CodeSamples/datastruct/hash/Makefile > @@ -26,40 +26,41 @@ include $(top)/depends.mk > ifeq ($(strip $(target)),) > all: > @echo "### None in datastruct/hash/ can be built on arch: '$(arch)'." > else > all: $(PROGS) > endif > > include $(top)/recipes.mk > > GCC_ARGS += -fcommon > +LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) > > hash_bkt: hash_bkt.c ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -o hash_bkt hash_bkt.c $(LIB)/random.c > -lpthread > > hash_bkt_ref: hash_bkt_ref.c ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -o hash_bkt_ref hash_bkt_ref.c > $(LIB)/random.c -lpthread > > hash_bkt_qsbr: hash_bkt_rcu.c ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -DPERFBOOK_RCU_QSBR -o hash_bkt_qsbr > hash_bkt_rcu.c $(LIB)/random.c -lpthread -lurcu -lurcu-qsbr > > hash_bkt_rcu: hash_bkt_rcu.c ../../api.h hashtorture.h > - cc $(GCC_ARGS) -DTEST_HASH -o hash_bkt_rcu hash_bkt_rcu.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -DTEST_HASH -o hash_bkt_rcu hash_bkt_rcu.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > hash_bkt_hazptr: hash_bkt_hazptr.c ../../defer/hazptr.c ../../defer/hazptr.h > ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -o hash_bkt_hazptr hash_bkt_hazptr.c > ../../defer/hazptr.c $(LIB)/random.c -lpthread > > hash_global: hash_global.c ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -o hash_global hash_global.c $(LIB)/random.c > -lpthread > > hash_resize: hash_resize.c ../../api.h hashtorture.h > - cc $(GCC_ARGS) -DTEST_HASH -o hash_resize hash_resize.c $(LIB)/random.c > -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -DTEST_HASH -o hash_resize hash_resize.c $(LIB)/random.c > -lpthread -lurcu $(LURCU_SIG) > > hash_resize_s: hash_resize_s.c ../../api.h hashtorture.h > - cc $(GCC_ARGS) -DTEST_HASH -o hash_resize_s hash_resize_s.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -DTEST_HASH -o hash_resize_s hash_resize_s.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > hash_unsync: hash_unsync.c ../../api.h hashtorture.h > cc $(GCC_ARGS) -DTEST_HASH -o hash_unsync hash_unsync.c $(LIB)/random.c > -lpthread > > clean: > rm -f $(PROGS) > diff --git a/CodeSamples/datastruct/skiplist/Makefile > b/CodeSamples/datastruct/skiplist/Makefile > index 3a555691..eda1af11 100644 > --- a/CodeSamples/datastruct/skiplist/Makefile > +++ b/CodeSamples/datastruct/skiplist/Makefile > @@ -24,19 +24,20 @@ top := ../.. > include $(top)/depends.mk > > ifeq ($(strip $(target)),) > all: > @echo "### None in datastruct/skiplist/ can be built on arch: > '$(arch)'." > else > all: $(PROGS) > endif > > include $(top)/recipes.mk > +LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) > > skiplist: skiplist.c ../../api.h skiplisttorture.h skiplist.h > - cc $(GCC_ARGS) -DTEST_SKIPLIST -I $(LIB) -g -o skiplist skiplist.c > $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -DTEST_SKIPLIST -I $(LIB) -g -o skiplist skiplist.c > $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > skiplist_glock: skiplist_glock.c ../../api.h skiplisttorture.h skiplist.h > - cc $(GCC_ARGS) -DTEST_SKIPLIST -I $(LIB) -g -o skiplist_glock > skiplist_glock.c $(LIB)/random.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -DTEST_SKIPLIST -I $(LIB) -g -o skiplist_glock > skiplist_glock.c $(LIB)/random.c -lpthread -lurcu $(LURCU_SIG) > > clean: > rm -f $(PROGS) > diff --git a/CodeSamples/defer/Makefile b/CodeSamples/defer/Makefile > index 3cf3e5a5..abfbe202 100644 > --- a/CodeSamples/defer/Makefile > +++ b/CodeSamples/defer/Makefile > @@ -55,39 +55,40 @@ include $(top)/depends.mk > ifeq ($(strip $(target)),) > all: $(ARCH_INDEPENDENT) > @echo "### $(ARCH_DEPENDENT) in defer/ can't be built on arch: > '$(arch)'." > else > all: $(PROGS) > endif > > include $(top)/recipes.mk > > GCC_ARGS += -fcommon > +LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) > > # Note that bug_srcu_a is disabled until completed. > bug_srcu_a: bug_srcu_a.c srcu.c ../api.h > cc $(GCC_ARGS) -o bug_srcu_a -DTEST bug_srcu_a.c -lurcu -lpthread > > bug_rcu_dp: bug_rcu_dp.c ../api.h > cc $(GCC_ARGS) -o bug_rcu_dp -DTEST bug_rcu_dp.c -lurcu -lpthread > > gettimestamp: gettimestamp.c ../api.h rcutorture.h > cc $(GCC_ARGS) -o gettimestamp -DTEST gettimestamp.c -lpthread > > gettimestampmp: gettimestampmp.c ../api.h rcutorture.h > cc $(GCC_ARGS) -o gettimestampmp -DTEST gettimestampmp.c -lpthread > > hazptr: hazptr.c hazptr.h ../api.h hazptrtorture.h > cc $(GCC_ARGS) -o hazptr -DTEST hazptr.c -lpthread > > ptxroute: ptxroute.c ../api.h > - cc $(GCC_ARGS) -o ptxroute ptxroute.c -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o ptxroute ptxroute.c -lpthread -lurcu $(LURCU_SIG) > > rcu: rcu.c rcu.h ../api.h rcutorture.h > cc $(GCC_ARGS) -o rcu -DTEST rcu.c -lpthread > > rcu64: rcu64.c rcu64.h ../api.h rcutorture.h > cc $(GCC_ARGS) -o rcu64 -DTEST rcu64.c -lpthread > > rcu64_atomicgp: rcu64_atomicgp.c rcu64_atomicgp.h ../api.h rcutorture.h > cc $(GCC_ARGS) -o rcu64_atomicgp -DTEST rcu64_atomicgp.c -lpthread > > @@ -124,32 +125,32 @@ rcu_rcpls: rcu_rcpls.c rcu_rcpls.h ../api.h rcutorture.h > rcu_sig: rcu_sig.c rcu_sig.h ../api.h rcutorture.h > cc $(GCC_ARGS) -o rcu_sig -DTEST rcu_sig.c -lpthread > > rcu_ts: rcu_ts.c rcu_ts.h ../api.h rcutorture.h > cc $(GCC_ARGS) -o rcu_ts -DTEST rcu_ts.c -lpthread > > route_hazptr: route_hazptr.c hazptr.c hazptr.h ../api.h ../lib/random.h > ../lib/random.c routetorture.h > cc $(GCC_ARGS) -o route_hazptr route_hazptr.c hazptr.c ../lib/random.c > -lpthread > > route_rcu: route_rcu.c ../api.h ../lib/random.h ../lib/random.c > routetorture.h > - cc $(GCC_ARGS) -o route_rcu route_rcu.c ../lib/random.c -lpthread > -lurcu -lurcu-signal > + cc $(GCC_ARGS) -o route_rcu route_rcu.c ../lib/random.c -lpthread > -lurcu $(LURCU_SIG) > > route_rcu_qsbr: route_rcu.c ../api.h ../lib/random.h ../lib/random.c > routetorture.h > cc $(GCC_ARGS) -o route_rcu_qsbr -DDO_QSBR route_rcu.c ../lib/random.c > -lpthread -lurcu-qsbr > > route_refcnt: route_refcnt.c ../api.h ../lib/random.h ../lib/random.c > routetorture.h > cc $(GCC_ARGS) -o route_refcnt route_refcnt.c ../lib/random.c -lpthread > > route_seq: route_seq.c ../api.h ../lib/random.h ../lib/random.c > routetorture.h > cc $(GCC_ARGS) -o route_seq route_seq.c ../lib/random.c -lpthread > > route_seqlock: route_seqlock.c ../api.h seqlock.h ../lib/random.h > ../lib/random.c routetorture.h > cc $(GCC_ARGS) -o route_seqlock route_seqlock.c ../lib/random.c > -lpthread > > seqlocktorture: seqlocktorture.c seqlock.h ../api.h > cc $(GCC_ARGS) -o seqlocktorture seqlocktorture.c -lpthread > > singleton: singleton.c ../api.h ../lib/random.h ../lib/random.c > - cc $(GCC_ARGS) -Wall -g -o singleton singleton.c ../lib/random.c > -lpthread -lurcu -lurcu-signal > + cc $(GCC_ARGS) -Wall -g -o singleton singleton.c ../lib/random.c > -lpthread -lurcu $(LURCU_SIG) > > clean: > rm -f $(PROGS) >
This was approved for v0.15 by this pipeline: https://gitlab.com/linux-kernel/perfbook/-/pipelines/1605171467 Akira, please test for older versions. Thanks! Leo
