[med-svn] [Git][med-team/libatomic-queue][master] New upstream commit
Andreas Tille
gitlab at salsa.debian.org
Sat Oct 24 06:20:55 BST 2020
Andreas Tille pushed to branch master at Debian Med / libatomic-queue
Commits:
575db996 by Andreas Tille at 2020-10-24T07:20:40+02:00
New upstream commit
- - - - -
4 changed files:
- debian/changelog
- debian/patches/fix_unused_variable.patch
- debian/patches/generate-shared-library.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libatomic-queue (0.0+git20200609.b6da4a9-1) UNRELEASED; urgency=medium
+libatomic-queue (0.0+git20201007.df79403-1) UNRELEASED; urgency=medium
* Initial release (Closes: #963829)
=====================================
debian/patches/fix_unused_variable.patch
=====================================
@@ -4,30 +4,39 @@ Description: Fix unused variable
--- a/src/benchmarks.cc
+++ b/src/benchmarks.cc
-@@ -179,7 +179,7 @@ void throughput_producer(unsigned N, Que
+@@ -197,7 +197,7 @@ void throughput_producer(unsigned N, Que
cycles_t expected = 0;
t0->compare_exchange_strong(expected, __builtin_ia32_rdtsc(), std::memory_order_acq_rel, std::memory_order_relaxed);
- region_guard_t<Queue> guard;
+ //region_guard_t<Queue> guard;
+ ProducerOf<Queue> producer{*queue};
for(unsigned n = 1, stop = N + 1; n <= stop; ++n)
- queue->push(n);
- }
-@@ -189,7 +189,7 @@ void throughput_consumer_impl(unsigned N
+ producer.push(*queue, n);
+@@ -208,7 +208,7 @@ void throughput_consumer_impl(unsigned N
unsigned const stop = N + 1;
sum_t sum = 0;
- region_guard_t<Queue> guard;
+ //region_guard_t<Queue> guard;
+ ConsumerOf<Queue> consumer{*queue};
for(;;) {
- unsigned n = queue->pop();
- if(n == stop)
-@@ -388,7 +388,7 @@ void run_throughput_benchmarks(HugePages
- template<class Queue, bool Sender>
- void ping_pong_thread_impl(Queue* q1, Queue* q2, unsigned N, cycles_t* time) {
+ unsigned n = consumer.pop(*queue);
+@@ -408,7 +408,7 @@ void run_throughput_benchmarks(HugePages
+ template<class Queue>
+ void ping_pong_thread_impl(Queue* q1, Queue* q2, unsigned N, cycles_t* time, std::false_type /*sender*/) {
cycles_t t0 = __builtin_ia32_rdtsc();
- region_guard_t<Queue> guard;
+ //region_guard_t<Queue> guard;
+ ConsumerOf<Queue> consumer_q1{*q1};
+ ProducerOf<Queue> producer_q2{*q2};
+ for(unsigned i = 1, j = 0; j < N; ++i) {
+@@ -422,7 +422,7 @@ void ping_pong_thread_impl(Queue* q1, Qu
+ template<class Queue>
+ void ping_pong_thread_impl(Queue* q1, Queue* q2, unsigned N, cycles_t* time, std::true_type /*sender*/) {
+ cycles_t t0 = __builtin_ia32_rdtsc();
+- region_guard_t<Queue> guard;
++ //region_guard_t<Queue> guard;
+ ProducerOf<Queue> producer_q1{*q1};
+ ConsumerOf<Queue> consumer_q2{*q2};
for(unsigned i = 1, j = 0; j < N; ++i) {
- if(Sender) {
- q1->push(i);
=====================================
debian/patches/generate-shared-library.patch
=====================================
@@ -13,7 +13,7 @@ Description: Fix unused variable
cxx.gcc := g++
cc.gcc := gcc
-@@ -54,25 +55,30 @@ ldlibs.moodycamel :=
+@@ -61,19 +62,20 @@ ldlibs.moodycamel :=
cppflags.xenium := -I${abspath ../xenium}
ldlibs.xenium :=
@@ -35,20 +35,10 @@ Description: Fix unused variable
+${exes} : % : ${build_dir}/% ${build_dir_shared}/libatomic_queue.so
ln -sf ${<:${CURDIR}/%=%}
- ${build_dir}/libatomic_queue.a : $(addprefix ${build_dir}/,cpu_base_frequency.o huge_pages.o)
- -include ${build_dir}/cpu_base_frequency.d
- -include ${build_dir}/huge_pages.d
-
-+${build_dir_shared}/libatomic_queue.so : $(addprefix ${build_dir_shared}/,cpu_base_frequency.o huge_pages.o)
-+-include ${build_dir_shared}/cpu_base_frequency.d
-+-include ${build_dir_shared}/huge_pages.d
-+
- ${build_dir}/benchmarks : cppflags += ${cppflags.tbb} ${cppflags.moodycamel} ${cppflags.xenium}
- ${build_dir}/benchmarks : ldlibs += ${ldlibs.tbb} ${ldlibs.moodycamel} ${ldlibs.xenium} -ldl
- ${build_dir}/benchmarks : ${build_dir}/benchmarks.o ${build_dir}/libatomic_queue.a Makefile | ${build_dir}
-@@ -85,9 +91,10 @@ ${build_dir}/tests : ${build_dir}/tests.
+ benchmarks_src := benchmarks.cc cpu_base_frequency.cc huge_pages.cc
+@@ -95,9 +97,10 @@ ${build_dir}/example : ${example_src:%.c
$(strip ${LINK.EXE})
- -include ${build_dir}/tests.d
+ -include ${example_src:%.cc=${build_dir}/%.d}
-${build_dir}/%.so : cxxflags += -fPIC
-${build_dir}/%.so : Makefile | ${build_dir}
@@ -60,7 +50,7 @@ Description: Fix unused variable
${build_dir}/%.a : Makefile | ${build_dir}
$(strip ${LINK.A})
-@@ -108,6 +115,13 @@ ${build_dir}/%.o : src/%.cc Makefile | $
+@@ -122,6 +125,13 @@ ${build_dir}/%.o : src/%.cc Makefile | $
${build_dir}/%.o : src/%.c Makefile | ${build_dir}
$(strip ${COMPILE.C})
@@ -74,7 +64,7 @@ Description: Fix unused variable
%.S : cppflags += ${cppflags.tbb} ${cppflags.moodycamel} ${cppflags.xenium}
%.S : src/%.cc Makefile | ${build_dir}
$(strip ${COMPILE.S})
-@@ -118,6 +132,9 @@ ${build_dir}/%.o : src/%.c Makefile | ${
+@@ -132,6 +142,9 @@ ${build_dir}/%.o : src/%.c Makefile | ${
${build_dir} :
mkdir -p $@
=====================================
debian/rules
=====================================
@@ -18,12 +18,13 @@
override_dh_install:
dh_install
+ mv `find . -name "*.a"` `dirname $$(find . -name "*.so")`
d-shlibmove --commit \
--multiarch \
--devunversioned \
--exclude-la \
--movedev debian/tmp/usr/include/* usr/include \
--movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
- build_shared/release/gcc/libatomic_queue.so
+ $$(find . -name "*.so")
find debian -name lib*.la -delete
View it on GitLab: https://salsa.debian.org/med-team/libatomic-queue/-/commit/575db996542b9b5097afb389057d4f10fd67b551
--
View it on GitLab: https://salsa.debian.org/med-team/libatomic-queue/-/commit/575db996542b9b5097afb389057d4f10fd67b551
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201024/d6655774/attachment-0001.html>
More information about the debian-med-commit
mailing list