Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use buffers

This commit is contained in:
Greg Wilkins 2014-06-02 01:25:08 +02:00
parent ad26b27564
commit 76724d8dfd
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jetty-hpack/src/main/java/org/eclipse/jetty/hpack/Huffman.java
View File

@ -18,8 +18,8 @@
package org.eclipse.jetty.hpack;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
public class Huffman
{
@ -284,14 +284,14 @@ public class Huffman
/* (253) |11111111|11111111|11101100|1 */ {0x1ffffd9,25},
/* (254) |11111111|11111111|11101101|0 */ {0x1ffffda,25},
/* (255) |11111111|11111111|11101101|1 */ {0x1ffffdb,25},
/* (256) |11111111|11111111|11101110|0 */ {0x1ffffdc,25},
/*EOS (256) |11111111|11111111|11101110|0 */ {0x1ffffdc,25},
};
// Huffman decode tree stored in a flattened char array for good
// locality of reference.
static final char[] tree;
static final byte[] rowsym;
static final char[] rowsym;
static final byte[] rowbits;
static
@ -300,7 +300,7 @@ public class Huffman
for (int i=0;i<CODES.length;i++)
r+=(CODES[i][1]+7)/8;
tree=new char[r*256];
rowsym=new byte[r];
rowsym=new char[r];
rowbits=new byte[r];
r=0;
@ -328,7 +328,7 @@ public class Huffman
}
int terminal = ++r;
rowsym[r]=(byte)sym;
rowsym[r]=(char)sym;
int b = len & 0x07;
int terminalBits = b == 0?8:b;
@ -342,15 +342,17 @@ public class Huffman
}
static public byte[] decode(byte[] buf) throws IOException
static public String decode(ByteBuffer buf) throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
StringBuilder out = new StringBuilder(buf.remaining()*2);
int node = 0;
int current = 0;
int bits = 0;
for (int i = 0; i < buf.length; i++)
// TODO use buf array
while (buf.hasRemaining())
{
int b = buf[i] & 0xFF;
int b = buf.get() & 0xFF;
current = (current << 8) | b;
bits += 8;
while (bits >= 8)
@ -360,7 +362,7 @@ public class Huffman
if (rowbits[node]!=0)
{
// terminal node
baos.write(rowsym[node]);
out.append(rowsym[node]);
bits -= rowbits[node];
node = 0;
}
@ -382,11 +384,11 @@ public class Huffman
if (rowbits[node]==0)
throw new IllegalStateException();
baos.write(rowsym[node]);
out.append(rowsym[node]);
bits -= rowbits[node];
node = 0;
}
return baos.toByteArray();
return out.toString();
}
}

9
jetty-hpack/src/test/java/org/eclipse/jetty/hpack/HuffmanTest.java
View File

@ -18,8 +18,9 @@
package org.eclipse.jetty.hpack;
import org.junit.Assert;
import java.nio.ByteBuffer;
import org.junit.Assert;
import org.eclipse.jetty.util.TypeUtil;
import org.junit.Test;
@ -45,10 +46,8 @@ public class HuffmanTest
for (String[] test:tests)
{
byte[] encoded=TypeUtil.fromHexString(test[1]);
byte[] decoded=Huffman.decode(encoded);
String d=new String(decoded);
Assert.assertEquals(test[0],test[2],d);
String decoded=Huffman.decode(ByteBuffer.wrap(encoded));
Assert.assertEquals(test[0],test[2],decoded);
}
}

2
jetty-hpack/src/test/java/org/eclipse/jetty/hpack/NBitIntegerTest.java
View File

@ -18,8 +18,6 @@
package org.eclipse.jetty.hpack;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;