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

updated hpack for draft 10 name changes

This commit is contained in:
Greg Wilkins 2014-12-04 10:17:06 +01:00
parent 20ef482d6f
commit 4296d84a7b
3 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java
View File

@ -106,8 +106,8 @@ public class HpackContext
};
private static final Map<HttpField,Entry> __staticFieldMap = new HashMap<>();
private static final Trie<Entry> __staticNameMap = new ArrayTernaryTrie<>(true,512);
private static final Entry[] __headerEntryTable = new Entry[HttpHeader.UNKNOWN.ordinal()];
private static final Trie<StaticEntry> __staticNameMap = new ArrayTernaryTrie<>(true,512);
private static final StaticEntry[] __staticTableByHeader = new StaticEntry[HttpHeader.UNKNOWN.ordinal()];
private static final StaticEntry[] __staticTable=new StaticEntry[STATIC_TABLE.length];
static
{
@ -172,35 +172,35 @@ public class HpackContext
for (HttpHeader h : HttpHeader.values())
{
Entry entry = __staticNameMap.get(h.asString());
StaticEntry entry = __staticNameMap.get(h.asString());
if (entry!=null)
__headerEntryTable[h.ordinal()]=entry;
__staticTableByHeader[h.ordinal()]=entry;
}
}
private int _maxHeaderTableSizeInBytes;
private int _headerTableSizeInBytes;
private final HeaderTable _headerTable;
private int _maxDynamicTableSizeInBytes;
private int _dynamicTableSizeInBytes;
private final DynamicTable _dynamicTable;
private final Map<HttpField,Entry> _fieldMap = new HashMap<>();
private final Map<String,Entry> _nameMap = new HashMap<>();
HpackContext(int maxHeaderTableSize)
HpackContext(int maxDynamicTableSize)
{
_maxHeaderTableSizeInBytes=maxHeaderTableSize;
int guesstimateEntries = 10+maxHeaderTableSize/(32+10+10);
_headerTable=new HeaderTable(guesstimateEntries,guesstimateEntries+10);
_maxDynamicTableSizeInBytes=maxDynamicTableSize;
int guesstimateEntries = 10+maxDynamicTableSize/(32+10+10);
_dynamicTable=new DynamicTable(guesstimateEntries,guesstimateEntries+10);
if (LOG.isDebugEnabled())
LOG.debug(String.format("HdrTbl[%x] created max=%d",hashCode(),maxHeaderTableSize));
LOG.debug(String.format("HdrTbl[%x] created max=%d",hashCode(),maxDynamicTableSize));
}
public void resize(int newMaxHeaderTableSize)
public void resize(int newMaxDynamicTableSize)
{
if (LOG.isDebugEnabled())
LOG.debug(String.format("HdrTbl[%x] resized max=%d->%d",hashCode(),_maxHeaderTableSizeInBytes,newMaxHeaderTableSize));
_maxHeaderTableSizeInBytes=newMaxHeaderTableSize;
int guesstimateEntries = 10+newMaxHeaderTableSize/(32+10+10);
LOG.debug(String.format("HdrTbl[%x] resized max=%d->%d",hashCode(),_maxDynamicTableSizeInBytes,newMaxDynamicTableSize));
_maxDynamicTableSizeInBytes=newMaxDynamicTableSize;
int guesstimateEntries = 10+newMaxDynamicTableSize/(32+10+10);
evict();
_headerTable.resizeUnsafe(guesstimateEntries);
_dynamicTable.resizeUnsafe(guesstimateEntries);
}
public Entry get(HttpField field)
@ -224,16 +224,16 @@ public class HpackContext
if (index<__staticTable.length)
return __staticTable[index];
int d=_headerTable.size()-index+__staticTable.length-1;
int d=_dynamicTable.size()-index+__staticTable.length-1;
if (d>=0)
return _headerTable.getUnsafe(d);
return _dynamicTable.getUnsafe(d);
return null;
}
public Entry get(HttpHeader header)
{
Entry e = __headerEntryTable[header.ordinal()];
Entry e = __staticTableByHeader[header.ordinal()];
if (e==null)
return get(header.asString());
return e;
@ -241,22 +241,22 @@ public class HpackContext
public static Entry getStatic(HttpHeader header)
{
return __headerEntryTable[header.ordinal()];
return __staticTableByHeader[header.ordinal()];
}
public Entry add(HttpField field)
{
int slot=_headerTable.getNextSlotUnsafe();
int slot=_dynamicTable.getNextSlotUnsafe();
Entry entry=new Entry(slot,field);
int size = entry.getSize();
if (size>_maxHeaderTableSizeInBytes)
if (size>_maxDynamicTableSizeInBytes)
{
if (LOG.isDebugEnabled())
LOG.debug(String.format("HdrTbl[%x] !added size %d>%d",hashCode(),size,_maxHeaderTableSizeInBytes));
LOG.debug(String.format("HdrTbl[%x] !added size %d>%d",hashCode(),size,_maxDynamicTableSizeInBytes));
return null;
}
_headerTableSizeInBytes+=size;
_headerTable.addUnsafe(entry);
_dynamicTableSizeInBytes+=size;
_dynamicTable.addUnsafe(entry);
_fieldMap.put(field,entry);
_nameMap.put(StringUtil.asciiToLowerCase(field.getName()),entry);
@ -271,7 +271,7 @@ public class HpackContext
*/
public int size()
{
return _headerTable.size();
return _dynamicTable.size();
}
/**
@ -279,15 +279,15 @@ public class HpackContext
*/
public int getHeaderTableSize()
{
return _headerTableSizeInBytes;
return _dynamicTableSizeInBytes;
}
/**
* @return Max Header table size in Octets
*/
public int getMaxHeaderTableSize()
public int getMaxDynamicTableSize()
{
return _maxHeaderTableSizeInBytes;
return _maxDynamicTableSizeInBytes;
}
public int index(Entry entry)
@ -297,7 +297,7 @@ public class HpackContext
if (entry.isStatic())
return entry._slot;
return _headerTable.index(entry)+__staticTable.length-1;
return _dynamicTable.index(entry)+__staticTable.length-1;
}
public static int staticIndex(HttpHeader header)
@ -312,12 +312,12 @@ public class HpackContext
private void evict()
{
while (_headerTableSizeInBytes>_maxHeaderTableSizeInBytes)
while (_dynamicTableSizeInBytes>_maxDynamicTableSizeInBytes)
{
Entry entry = _headerTable.pollUnsafe();
Entry entry = _dynamicTable.pollUnsafe();
if (LOG.isDebugEnabled())
LOG.debug(String.format("HdrTbl[%x] evict %s",hashCode(),entry));
_headerTableSizeInBytes-=entry.getSize();
_dynamicTableSizeInBytes-=entry.getSize();
entry._slot=-1;
_fieldMap.remove(entry.getHttpField());
String lc=StringUtil.asciiToLowerCase(entry.getHttpField().getName());
@ -325,13 +325,13 @@ public class HpackContext
_nameMap.remove(lc);
}
if (LOG.isDebugEnabled())
LOG.debug(String.format("HdrTbl[%x] entries=%d, size=%d, max=%d",hashCode(),_headerTable.size(),_headerTableSizeInBytes,_maxHeaderTableSizeInBytes));
LOG.debug(String.format("HdrTbl[%x] entries=%d, size=%d, max=%d",hashCode(),_dynamicTable.size(),_dynamicTableSizeInBytes,_maxDynamicTableSizeInBytes));
}
@Override
public String toString()
{
return String.format("HpackContext@%x{entries=%d,size=%d,max=%d}",hashCode(),_headerTable.size(),_headerTableSizeInBytes,_maxHeaderTableSizeInBytes);
return String.format("HpackContext@%x{entries=%d,size=%d,max=%d}",hashCode(),_dynamicTable.size(),_dynamicTableSizeInBytes,_maxDynamicTableSizeInBytes);
}
@ -339,14 +339,14 @@ public class HpackContext
/* ------------------------------------------------------------ */
/**
*/
private class HeaderTable extends ArrayQueue<HpackContext.Entry>
private class DynamicTable extends ArrayQueue<HpackContext.Entry>
{
/* ------------------------------------------------------------ */
/**
* @param initCapacity
* @param growBy
*/
private HeaderTable(int initCapacity, int growBy)
private DynamicTable(int initCapacity, int growBy)
{
super(initCapacity,growBy);
}

14
jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackDecoder.java
View File

@ -44,18 +44,18 @@ public class HpackDecoder
private final HpackContext _context;
private final MetaDataBuilder _builder;
private int _localMaxHeaderTableSize;
private int _localMaxDynamicTableSize;
public HpackDecoder(int localMaxHeaderTableSize, int maxHeaderSize)
public HpackDecoder(int localMaxDynamicTableSize, int maxHeaderSize)
{
_context=new HpackContext(localMaxHeaderTableSize);
_localMaxHeaderTableSize=localMaxHeaderTableSize;
_context=new HpackContext(localMaxDynamicTableSize);
_localMaxDynamicTableSize=localMaxDynamicTableSize;
_builder = new MetaDataBuilder(maxHeaderSize);
}
public void setLocalMaxHeaderTableSize(int localMaxHeaderTableSize)
public void setLocalMaxDynamicTableSize(int localMaxdynamciTableSize)
{
_localMaxHeaderTableSize=localMaxHeaderTableSize;
_localMaxDynamicTableSize=localMaxdynamciTableSize;
}
public MetaData decode(ByteBuffer buffer)
@ -123,7 +123,7 @@ public class HpackDecoder
int size = NBitInteger.decode(buffer,5);
if (LOG.isDebugEnabled())
LOG.debug("decode resize="+size);
if (size>_localMaxHeaderTableSize)
if (size>_localMaxDynamicTableSize)
throw new IllegalArgumentException();
_context.resize(size);
continue;

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

@ -87,8 +87,8 @@ public class HpackEncoder
private final HpackContext _context;
private final boolean _debug;
private int _remoteMaxHeaderTableSize;
private int _localMaxHeaderTableSize;
private int _remoteMaxDynamicTableSize;
private int _localMaxDynamicTableSize;
public HpackEncoder()
{
@ -103,8 +103,8 @@ public class HpackEncoder
public HpackEncoder(int localMaxHeaderTableSize,int remoteMaxHeaderTableSize)
{
_context=new HpackContext(remoteMaxHeaderTableSize);
_remoteMaxHeaderTableSize=remoteMaxHeaderTableSize;
_localMaxHeaderTableSize=localMaxHeaderTableSize;
_remoteMaxDynamicTableSize=remoteMaxHeaderTableSize;
_localMaxDynamicTableSize=localMaxHeaderTableSize;
_debug=LOG.isDebugEnabled();
}
@ -115,12 +115,12 @@ public class HpackEncoder
public void setRemoteMaxHeaderTableSize(int remoteMaxHeaderTableSize)
{
_remoteMaxHeaderTableSize=remoteMaxHeaderTableSize;
_remoteMaxDynamicTableSize=remoteMaxHeaderTableSize;
}
public void setLocalMaxHeaderTableSize(int localMaxHeaderTableSize)
{
_localMaxHeaderTableSize=localMaxHeaderTableSize;
_localMaxDynamicTableSize=localMaxHeaderTableSize;
}
// TODO better handling of buffer size
@ -141,9 +141,9 @@ public class HpackEncoder
int pos = buffer.position();
// Check the header table sizes!
int maxHeaderTableSize=Math.min(_remoteMaxHeaderTableSize,_localMaxHeaderTableSize);
if (maxHeaderTableSize!=_context.getMaxHeaderTableSize())
encodeMaxHeaderTableSize(buffer,maxHeaderTableSize);
int maxDynamicTableSize=Math.min(_remoteMaxDynamicTableSize,_localMaxDynamicTableSize);
if (maxDynamicTableSize!=_context.getMaxDynamicTableSize())
encodeMaxDynamicTableSize(buffer,maxDynamicTableSize);
// Add Request/response meta fields
if (metadata.isRequest())
@ -176,13 +176,13 @@ public class HpackEncoder
LOG.debug(String.format("CtxTbl[%x] encoded %d octets",_context.hashCode(), buffer.position() - pos));
}
public void encodeMaxHeaderTableSize(ByteBuffer buffer, int maxHeaderTableSize)
public void encodeMaxDynamicTableSize(ByteBuffer buffer, int maxDynamicTableSize)
{
if (maxHeaderTableSize>_remoteMaxHeaderTableSize)
if (maxDynamicTableSize>_remoteMaxDynamicTableSize)
throw new IllegalArgumentException();
buffer.put((byte)0x20);
NBitInteger.encode(buffer,5,maxHeaderTableSize);
_context.resize(maxHeaderTableSize);
NBitInteger.encode(buffer,5,maxDynamicTableSize);
_context.resize(maxDynamicTableSize);
}
public void encode(ByteBuffer buffer, HttpField field)