Merge pull request #35 from netty/more-examples

Port over more Netty examples

Author: chrisvest

Dockerfile

@@ -2,7 +2,7 @@
 FROM fedora:33
 RUN dnf -y install file findutils unzip zip libXtst-devel libXt-devel libXrender-devel libXrandr-devel \
            libXi-devel cups-devel fontconfig-devel alsa-lib-devel make autoconf diffutils git clang \
-           java-latest-openjdk-devel
+           java-latest-openjdk-devel automake libtool
 
 # Build panama-foreign openjdk
 WORKDIR /home/build
@@ -24,7 +24,7 @@ ENV PATH=/home/build/apache-maven-3.6.3/bin:$PATH
 # Prepare a snapshot of Netty 5
 RUN git clone -b master https://github.com/netty/netty.git netty
 WORKDIR /home/build/netty
-RUN mvn install -DskipTests -T1C -B -am -pl buffer,handler
+RUN mvn install -DskipTests -T1C -B -am
 WORKDIR /home/build
 
 # Prepare our own build

pom.xml

@@ -394,12 +394,25 @@
       <version>${netty.build.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${netty.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
       <version>${netty.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${netty.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-core</artifactId>

src/main/java/io/netty/buffer/api/CompositeBuffer.java

@@ -877,7 +877,7 @@ public byte readByte() {
 
     @Override
     public byte getByte(int roff) {
-        return prepRead(roff, Byte.BYTES).getByte(subOffset);
+        return prepGet(roff, Byte.BYTES).getByte(subOffset);
     }
 
     @Override
@@ -887,7 +887,7 @@ public int readUnsignedByte() {
 
     @Override
     public int getUnsignedByte(int roff) {
-        return prepRead(roff, Byte.BYTES).getUnsignedByte(subOffset);
+        return prepGet(roff, Byte.BYTES).getUnsignedByte(subOffset);
     }
 
     @Override
@@ -921,7 +921,7 @@ public char readChar() {
 
     @Override
     public char getChar(int roff) {
-        return prepRead(roff, 2).getChar(subOffset);
+        return prepGet(roff, 2).getChar(subOffset);
     }
 
     @Override
@@ -943,7 +943,7 @@ public short readShort() {
 
     @Override
     public short getShort(int roff) {
-        return prepRead(roff, Short.BYTES).getShort(subOffset);
+        return prepGet(roff, Short.BYTES).getShort(subOffset);
     }
 
     @Override
@@ -953,7 +953,7 @@ public int readUnsignedShort() {
 
     @Override
     public int getUnsignedShort(int roff) {
-        return prepRead(roff, Short.BYTES).getUnsignedShort(subOffset);
+        return prepGet(roff, Short.BYTES).getUnsignedShort(subOffset);
     }
 
     @Override
@@ -987,7 +987,7 @@ public int readMedium() {
 
     @Override
     public int getMedium(int roff) {
-        return prepRead(roff, 3).getMedium(subOffset);
+        return prepGet(roff, 3).getMedium(subOffset);
     }
 
     @Override
@@ -997,7 +997,7 @@ public int readUnsignedMedium() {
 
     @Override
     public int getUnsignedMedium(int roff) {
-        return prepRead(roff, 3).getMedium(subOffset);
+        return prepGet(roff, 3).getMedium(subOffset);
     }
 
     @Override
@@ -1031,7 +1031,7 @@ public int readInt() {
 
     @Override
     public int getInt(int roff) {
-        return prepRead(roff, Integer.BYTES).getInt(subOffset);
+        return prepGet(roff, Integer.BYTES).getInt(subOffset);
     }
 
     @Override
@@ -1041,7 +1041,7 @@ public long readUnsignedInt() {
 
     @Override
     public long getUnsignedInt(int roff) {
-        return prepRead(roff, Integer.BYTES).getUnsignedInt(subOffset);
+        return prepGet(roff, Integer.BYTES).getUnsignedInt(subOffset);
     }
 
     @Override
@@ -1075,7 +1075,7 @@ public float readFloat() {
 
     @Override
     public float getFloat(int roff) {
-        return prepRead(roff, Float.BYTES).getFloat(subOffset);
+        return prepGet(roff, Float.BYTES).getFloat(subOffset);
     }
 
     @Override
@@ -1097,7 +1097,7 @@ public long readLong() {
 
     @Override
     public long getLong(int roff) {
-        return prepRead(roff, Long.BYTES).getLong(subOffset);
+        return prepGet(roff, Long.BYTES).getLong(subOffset);
     }
 
     @Override
@@ -1119,7 +1119,7 @@ public double readDouble() {
 
     @Override
     public double getDouble(int roff) {
-        return prepRead(roff, Double.BYTES).getDouble(subOffset);
+        return prepGet(roff, Double.BYTES).getDouble(subOffset);
     }
 
     @Override
@@ -1242,6 +1242,17 @@ private void checkReadBounds(int index, int size) {
         }
     }
 
+    private BufferAccessors prepGet(int index, int size) {
+        checkGetBounds(index, size);
+        return chooseBuffer(index, size);
+    }
+
+    private void checkGetBounds(int index, int size) {
+        if (index < 0 || capacity < index + size) {
+            throw indexOutOfBounds(index, false);
+        }
+    }
+
     private BufferAccessors prepWrite(int size) {
         var buf = prepWrite(woff, size);
         woff += size;
@@ -1268,7 +1279,7 @@ private RuntimeException indexOutOfBounds(int index, boolean write) {
         }
         return new IndexOutOfBoundsException(
                 "Index " + index + " is out of bounds: [read 0 to " + woff + ", write 0 to " +
-                (capacity - 1) + "].");
+                capacity + "].");
     }
 
     private static IllegalStateException bufferIsClosed() {

src/main/java/io/netty/buffer/api/LifecycleTracer.java

@@ -83,10 +83,12 @@ void acquire(int acquires) {
         }
 
         void addTrace(Trace trace) {
-            if (traces.size() == MAX_TRACE_POINTS) {
-                traces.pollFirst();
+            synchronized (traces) {
+                if (traces.size() == MAX_TRACE_POINTS) {
+                    traces.pollFirst();
+                }
+                traces.addLast(trace);
             }
-            traces.addLast(trace);
         }
 
         @Override
@@ -118,9 +120,11 @@ public T transferOwnership(Drop<T> drop) {
 
         @Override
         <E extends Throwable> E attachTrace(E throwable) {
-            long timestamp = System.nanoTime();
-            for (Trace trace : traces) {
-                trace.attach(throwable, timestamp);
+            synchronized (traces) {
+                long timestamp = System.nanoTime();
+                for (Trace trace : traces) {
+                    trace.attach(throwable, timestamp);
+                }
             }
             return throwable;
         }