rtyler/avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

116: process http headers in native to reduce number of upcalls to java

Browse Source 
Contributed-by: jfdenise
Reviewed-by: asquare
This commit is contained in:
akhil 2013-12-17 10:50:13 -08:00
parent 78b98e2806
commit 10c9bba482
2 changed files with 27 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/net/java/avatar/js/http/ParserSettings.java
View File

@ -36,53 +36,33 @@ public final class ParserSettings extends HttpParserSettings {
public interface ParserFunction {
public int call();
}
public interface ParserHeadersFunction {
public int call(String url, String[] headers);
}
final ParserFunction onMessageBegin;
final ParserDataFunction onURL;
final ParserDataFunction onHeaderField;
final ParserDataFunction onHeaderValue;
final ParserFunction onHeadersComplete;
final ParserHeadersFunction onHeadersComplete;
final ParserDataFunction onBody;
final ParserFunction onMessageComplete;
final ParserHeadersFunction onHeaders;
public ParserSettings(final ParserFunction onMessageBegin,
final ParserDataFunction onURL,
final ParserDataFunction onHeaderField,
final ParserDataFunction onHeaderValue,
final ParserFunction onHeadersComplete,
public ParserSettings(final ParserHeadersFunction onHeadersComplete,
final ParserDataFunction onBody,
final ParserFunction onMessageComplete) {
this.onMessageBegin = onMessageBegin;
this.onURL = onURL;
this.onHeaderField = onHeaderField;
this.onHeaderValue = onHeaderValue;
final ParserFunction onMessageComplete,
final ParserHeadersFunction onHeaders) {
this.onHeadersComplete = onHeadersComplete;
this.onBody = onBody;
this.onMessageComplete = onMessageComplete;
this.onHeaders = onHeaders;
}
@Override
public int onMessageBegin() {
return onMessageBegin.call();
public int onHeadersComplete(String url, String[] headers) {
return onHeadersComplete.call(url, headers);
}
@Override
public int onURL(int offset, int length) {
return onURL.call(offset, length);
}
@Override
public int onHeaderField(int offset, int length) {
return onHeaderField.call(offset, length);
}
@Override
public int onHeaderValue(int offset, int length) {
return onHeaderValue.call(offset, length);
}
@Override
public int onHeadersComplete() {
return onHeadersComplete.call();
public int onHeaders(String url, String[] headers) {
return onHeaders.call(url, headers);
}
@Override

81
src/main/js/net/java/avatar/js/http_parser_wrap.js
View File

@ -49,53 +49,14 @@
});
var that = this;
var retrieveString = function(offset, length) {
var start = that._dataStart + offset;
var end = start + length;
return that._data.toString('utf8', start, end);
}
Object.defineProperty(this, '_settings', {
value : new ParserSettings(
// on_message_begin
function() {
that._url = null;
return 0;
},
// on_url
function(offset, length) {
var url = retrieveString(offset, length);
if (that._url) { // truncated url
that._url += new Buffer(url).toString();
} else {
that._url = new Buffer(url).toString();
}
return 0;
},
// on_header_field
function(offset, length) {
var field = retrieveString(offset, length);
if (that._hkeys === that._hvalues) { // new field
that._hkeys += 1;
that._headers.push(field);
} else { // truncated field
that._headers[that._headers.length - 1] += field;
}
},
// on_header_value
function(offset, length) {
var value = retrieveString(offset, length);
if (that._hvalues !== that._hkeys) { // new value
that._hvalues += 1;
that._headers.push(value);
} else { // truncated value
that._headers[that._headers.length - 1] += value;
}
},
// on_headers_complete
function() {
function(url, jheaders) {
var headers = Java.from(jheaders);
var info = {
headers : that._headers.slice(0),
headers : headers,
versionMinor : that._parser.minor(),
versionMajor : that._parser.major(),
shouldKeepAlive : that._parser.shouldKeepAlive(),
@ -103,16 +64,13 @@
};
if (that._type === HTTPParser.REQUEST) {
info.url = that._url;
info.url = url;
info.method = that._parser.method();
}
if (that._type === HTTPParser.RESPONSE) {
info.statusCode = that._parser.statusCode();
}
that._hkeys = that._hvalues = 0;
that._headers= [];
var response;
try {
response = that.onHeadersComplete(info);
@ -138,9 +96,6 @@
// on_message_complete
function() {
try {
if (that._hkeys) { // trailing headers
that.onHeaders(that._headers.slice(0), that._url);
}
that.onMessageComplete();
} catch (e) {
debug(e.stack);
@ -148,6 +103,10 @@
return -1;
}
return 0;
},
// on_headers
function(url, jheaders) {
that.onHeaders(Java.from(jheaders), url);
})
});
}
@ -159,34 +118,20 @@
var valueOf = java.lang.Enum.valueOf;
HTTPParser.prototype.reinitialize = function(type) {
if (this._parser) {
this._parser.free();
}
delete this._parser;
delete this._headers;
delete this._url;
this._got_exception = null;
Object.defineProperty(this, '_parser', {
value : new Parser(),
configurable : true
});
Object.defineProperty(this, '_url', {
value : undefined,
writable : true
});
Object.defineProperty(this, '_headers', {
value : [],
writable : true
});
Object.defineProperty(this, '_type', {
value : type,
writable : true
});
Object.defineProperty(this, '_hvalues', {
value : 0,
writable : true
});
Object.defineProperty(this, '_hkeys', {
value : 0,
writable : true
});
this._parser.init(valueOf(typeClass, type));
}