[netty] 01/04: Add patch to build against jctools 2.0

Tony Mancill tmancill at moszumanska.debian.org
Sun Jul 23 05:23:29 UTC 2017


This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository netty.

commit 1abb2c9c54babcb690d7149b86daedd9a1efdc1c
Author: tony mancill <tmancill at debian.org>
Date:   Sat Jul 22 18:08:58 2017 -0700

    Add patch to build against jctools 2.0
---
 debian/patches/12-jctools2.patch | 20 ++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/12-jctools2.patch b/debian/patches/12-jctools2.patch
new file mode 100644
index 0000000..723fc58
--- /dev/null
+++ b/debian/patches/12-jctools2.patch
@@ -0,0 +1,20 @@
+--- a/common/src/main/java/io/netty/util/internal/PlatformDependent.java
++++ b/common/src/main/java/io/netty/util/internal/PlatformDependent.java
+@@ -21,7 +21,7 @@
+ import io.netty.util.internal.logging.InternalLogger;
+ import io.netty.util.internal.logging.InternalLoggerFactory;
+ import org.jctools.queues.MpscArrayQueue;
+-import org.jctools.queues.MpscChunkedArrayQueue;
++import org.jctools.queues.MpscGrowableArrayQueue;
+ import org.jctools.queues.SpscLinkedQueue;
+ import org.jctools.queues.atomic.MpscAtomicArrayQueue;
+ import org.jctools.queues.atomic.MpscLinkedAtomicQueue;
+@@ -835,7 +835,7 @@
+                 // up to the next power of two and so will overflow otherwise.
+                 final int capacity =
+                         Math.max(Math.min(maxCapacity, MAX_ALLOWED_MPSC_CAPACITY), MIN_MAX_MPSC_CAPACITY);
+-                return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity, true);
++                return new MpscGrowableArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
+             } else {
+                 return new MpscLinkedAtomicQueue<T>();
+             }
diff --git a/debian/patches/series b/debian/patches/series
index ba518a3..e7fbe9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 09-ignore-lz4.patch
 10-ignore-lzma.patch
 11-ignore-protobuf-nano.patch
+12-jctools2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git



More information about the pkg-java-commits mailing list