[jboss-xnio] 06/09: Add no-wildfly-common.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Aug 5 10:39:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository jboss-xnio.
commit 70aeb70f36818ec649985454b837498b2030944a
Author: Markus Koschany <apo at debian.org>
Date: Thu Aug 4 21:05:19 2016 +0200
Add no-wildfly-common.patch
---
debian/patches/no-wildfly-common.patch | 135 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 136 insertions(+)
diff --git a/debian/patches/no-wildfly-common.patch b/debian/patches/no-wildfly-common.patch
new file mode 100644
index 0000000..e681aad
--- /dev/null
+++ b/debian/patches/no-wildfly-common.patch
@@ -0,0 +1,135 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 4 Aug 2016 21:04:50 +0200
+Subject: no wildfly common
+
+---
+ api/src/main/java/org/xnio/AutomaticReference.java | 2 +-
+ api/src/main/java/org/xnio/Buffers.java | 10 +++++-----
+ api/src/main/java/org/xnio/ByteBufferPool.java | 20 ++++++++++----------
+ api/src/main/java/org/xnio/Option.java | 2 +-
+ 4 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/api/src/main/java/org/xnio/AutomaticReference.java b/api/src/main/java/org/xnio/AutomaticReference.java
+index 1504c28..548fa4f 100644
+--- a/api/src/main/java/org/xnio/AutomaticReference.java
++++ b/api/src/main/java/org/xnio/AutomaticReference.java
+@@ -27,7 +27,7 @@ import java.util.Collections;
+ import java.util.IdentityHashMap;
+ import java.util.Set;
+
+-import org.wildfly.common.ref.CleanerReference;
++//import org.wildfly.common.ref.CleanerReference;
+
+ /**
+ * An automatic reference is a phantom reference which is automatically freed by a background thread when it is
+diff --git a/api/src/main/java/org/xnio/Buffers.java b/api/src/main/java/org/xnio/Buffers.java
+index ec7099b..2873f16 100644
+--- a/api/src/main/java/org/xnio/Buffers.java
++++ b/api/src/main/java/org/xnio/Buffers.java
+@@ -41,9 +41,9 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+ import static org.xnio._private.Messages.msg;
+
+-import org.wildfly.common.ref.CleanerReference;
+-import org.wildfly.common.ref.Reaper;
+-import org.wildfly.common.ref.Reference;
++//import org.wildfly.common.ref.CleanerReference;
++//import org.wildfly.common.ref.Reaper;
++//import org.wildfly.common.ref.Reference;
+
+ /**
+ * Buffer utility methods.
+@@ -1966,12 +1966,12 @@ public final class Buffers {
+ ByteBuffer oldBuf = this.buf;
+ if (oldBuf == null) return;
+ final ByteBuffer buf = oldBuf.duplicate();
+- new CleanerReference<ByteBuffer, Void>(this.buf, null, new Reaper<ByteBuffer, Void>() {
++ /*new CleanerReference<ByteBuffer, Void>(this.buf, null, new Reaper<ByteBuffer, Void>() {
+ public void reap(final Reference<ByteBuffer, Void> reference) {
+ // free the duplicate
+ ByteBufferPool.free(buf);
+ }
+- });
++ });*/
+ this.buf = null;
+ }
+
+diff --git a/api/src/main/java/org/xnio/ByteBufferPool.java b/api/src/main/java/org/xnio/ByteBufferPool.java
+index d16155a..e2d2574 100644
+--- a/api/src/main/java/org/xnio/ByteBufferPool.java
++++ b/api/src/main/java/org/xnio/ByteBufferPool.java
+@@ -25,8 +25,8 @@ import java.nio.MappedByteBuffer;
+ import java.util.ArrayDeque;
+ import java.util.concurrent.ConcurrentLinkedQueue;
+
+-import org.wildfly.common.Assert;
+-import org.wildfly.common.cpu.CacheInfo;
++//import org.wildfly.common.Assert;
++//import org.wildfly.common.cpu.CacheInfo;
+
+ /**
+ * A fast source of pooled buffers.
+@@ -71,7 +71,7 @@ public abstract class ByteBufferPool {
+
+ static final int LOCAL_QUEUE_SIZE = 0x10;
+
+- static final int CACHE_LINE_SIZE = max(64, CacheInfo.getSmallestDataCacheLineSize());
++ //static final int CACHE_LINE_SIZE = max(64, CacheInfo.getSmallestDataCacheLineSize());
+
+ /**
+ * The large direct buffer pool. This pool produces buffers of {@link #LARGE_SIZE}.
+@@ -185,8 +185,8 @@ public abstract class ByteBufferPool {
+ * @param len the number of buffers to fill in the array
+ */
+ public void allocate(ByteBuffer[] array, int offs, int len) {
+- Assert.checkNotNullParam("array", array);
+- Assert.checkArrayBounds(array, offs, len);
++ //Assert.checkNotNullParam("array", array);
++ //Assert.checkArrayBounds(array, offs, len);
+ final LocalBufferCache localCache = threadLocal.get();
+ int outstanding = localCache.outstanding;
+ final ArrayDeque<ByteBuffer> queue = localCache.queue;
+@@ -216,7 +216,7 @@ public abstract class ByteBufferPool {
+ * @param buffer the buffer to free
+ */
+ public static void free(ByteBuffer buffer) {
+- Assert.checkNotNullParam("buffer", buffer);
++ //Assert.checkNotNullParam("buffer", buffer);
+ final int size = buffer.capacity();
+ if (Integer.bitCount(size) == 1 && ! buffer.isReadOnly()) {
+ if (buffer.isDirect()) {
+@@ -250,7 +250,7 @@ public abstract class ByteBufferPool {
+ * @param len the number of buffers to free
+ */
+ public static void free(ByteBuffer[] array, int offs, int len) {
+- Assert.checkArrayBounds(array, offs, len);
++ //Assert.checkArrayBounds(array, offs, len);
+ for (int i = 0; i < len; i ++) {
+ ByteBuffer buffer = array[offs + i];
+ if (buffer == null) {
+@@ -337,9 +337,9 @@ public abstract class ByteBufferPool {
+ ByteBuffer result = Buffers.slice(parentBuffer, size);
+ while (parentBuffer.hasRemaining()) {
+ // avoid false sharing between buffers
+- if (size < CACHE_LINE_SIZE) {
+- Buffers.skip(parentBuffer, CACHE_LINE_SIZE - size);
+- }
++ //if (size < CACHE_LINE_SIZE) {
++ // Buffers.skip(parentBuffer, CACHE_LINE_SIZE - size);
++ //}
+ super.doFree(Buffers.slice(parentBuffer, size));
+ }
+ return result;
+diff --git a/api/src/main/java/org/xnio/Option.java b/api/src/main/java/org/xnio/Option.java
+index 6f54b5e..84ec721 100644
+--- a/api/src/main/java/org/xnio/Option.java
++++ b/api/src/main/java/org/xnio/Option.java
+@@ -426,7 +426,7 @@ public abstract class Option<T> implements Serializable {
+ static <T, E extends Enum<E>> Option.ValueParser<T> getEnumParser(final Class<T> enumType) {
+ return new ValueParser<T>() {
+ public T parseValue(final String string, final ClassLoader classLoader) throws IllegalArgumentException {
+- return enumType.cast(Enum.<E>valueOf(asEnum(enumType), string.trim()));
++ return null;
+ }
+ };
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2775e34..7fc3c8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
disable-apiviz-plugin.patch
+no-wildfly-common.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-xnio.git
More information about the pkg-java-commits
mailing list