kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Eliminate callback objects and indirection altogether.

Browse source 
There's only ever one implementation of these, so just call them
directly.
This commit is contained in:
Charles Oliver Nutter 2019-10-05 16:05:35 -05:00
parent 080861c025
commit 46709adcd3
No known key found for this signature in database
GPG key ID: 8E26FF248BC7AEAD
3 changed files with 110 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ext/puma_http11/http11_parser.java.rl
View file

@ -22,43 +22,34 @@ public class Http11Parser {
action start_value { parser.mark = fpc; } action start_value { parser.mark = fpc; }
action write_value { action write_value {
if(parser.http_field != null) { Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
parser.http_field.call(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
}
} }
action request_method { action request_method {
if(parser.request_method != null) Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
parser.request_method.call(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
} }
action request_uri { action request_uri {
if(parser.request_uri != null) Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
parser.request_uri.call(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
} }
action fragment { action fragment {
if(parser.fragment != null) Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
parser.fragment.call(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
} }
action start_query {parser.query_start = fpc; } action start_query {parser.query_start = fpc; }
action query_string { action query_string {
if(parser.query_string != null) Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, fpc-parser.query_start);
parser.query_string.call(runtime, parser.data, parser.buffer, parser.query_start, fpc-parser.query_start);
} }
action http_version { action http_version {
if(parser.http_version != null) Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
parser.http_version.call(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
} }
action request_path { action request_path {
if(parser.request_path != null) Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
parser.request_path.call(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
} }
action done { action done {
parser.body_start = fpc + 1; parser.body_start = fpc + 1;
if(parser.header_done != null) http.header_done(runtime, parser.data, parser.buffer, fpc + 1, pe - fpc - 1);
parser.header_done.call(runtime, parser.data, parser.buffer, fpc + 1, pe - fpc - 1);
fbreak; fbreak;
} }
@ -90,15 +81,6 @@ public class Http11Parser {
RubyHash data; RubyHash data;
ByteList buffer; ByteList buffer;
public FieldCB http_field;
public ElementCB request_method;
public ElementCB request_uri;
public ElementCB fragment;
public ElementCB request_path;
public ElementCB query_string;
public ElementCB http_version;
public ElementCB header_done;
public void init() { public void init() {
cs = 0; cs = 0;
@ -115,7 +97,7 @@ public class Http11Parser {
public final HttpParser parser = new HttpParser(); public final HttpParser parser = new HttpParser();
public int execute(Ruby runtime, ByteList buffer, int off) { public int execute(Ruby runtime, Http11 http, ByteList buffer, int off) {
int p, pe; int p, pe;
int cs = parser.cs; int cs = parser.cs;
int len = buffer.length(); int len = buffer.length();

42
ext/puma_http11/org/jruby/puma/Http11.java
View file

@ -70,14 +70,6 @@ public class Http11 extends RubyObject {
super(runtime,clazz); super(runtime,clazz);
this.runtime = runtime; this.runtime = runtime;
this.hp = new Http11Parser(); this.hp = new Http11Parser();
this.hp.parser.http_field = http_field;
this.hp.parser.request_method = request_method;
this.hp.parser.request_uri = request_uri;
this.hp.parser.fragment = fragment;
this.hp.parser.request_path = request_path;
this.hp.parser.query_string = query_string;
this.hp.parser.http_version = http_version;
this.hp.parser.header_done = header_done;
this.hp.parser.init(); this.hp.parser.init();
} }
@ -96,8 +88,7 @@ public class Http11 extends RubyObject {
return (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError"); return (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
} }
private static Http11Parser.FieldCB http_field = new Http11Parser.FieldCB() { public static void http_field(Ruby runtime, RubyHash req, ByteList buffer, int field, int flen, int value, int vlen) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int field, int flen, int value, int vlen) {
RubyString f; RubyString f;
IRubyObject v; IRubyObject v;
validateMaxLength(runtime, flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR); validateMaxLength(runtime, flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
@ -130,59 +121,44 @@ public class Http11 extends RubyObject {
vs.cat(b); vs.cat(b);
} }
} }
};
private static Http11Parser.ElementCB request_method = new Http11Parser.ElementCB() { public static void request_method(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, REQUEST_METHOD_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, REQUEST_METHOD_BYTELIST),val);
} }
};
private static Http11Parser.ElementCB request_uri = new Http11Parser.ElementCB() { public static void request_uri(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
validateMaxLength(runtime, length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR); validateMaxLength(runtime, length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR);
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, REQUEST_URI_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, REQUEST_URI_BYTELIST),val);
} }
};
private static Http11Parser.ElementCB fragment = new Http11Parser.ElementCB() { public static void fragment(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
validateMaxLength(runtime, length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR); validateMaxLength(runtime, length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR);
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, FRAGMENT_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, FRAGMENT_BYTELIST),val);
} }
};
private static Http11Parser.ElementCB request_path = new Http11Parser.ElementCB() { public static void request_path(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
validateMaxLength(runtime, length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR); validateMaxLength(runtime, length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR);
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, REQUEST_PATH_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, REQUEST_PATH_BYTELIST),val);
} }
};
private static Http11Parser.ElementCB query_string = new Http11Parser.ElementCB() { public static void query_string(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
validateMaxLength(runtime, length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR); validateMaxLength(runtime, length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR);
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, QUERY_STRING_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, QUERY_STRING_BYTELIST),val);
} }
};
private static Http11Parser.ElementCB http_version = new Http11Parser.ElementCB() { public static void http_version(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length)); RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
req.fastASet(RubyString.newStringShared(runtime, HTTP_VERSION_BYTELIST),val); req.fastASet(RubyString.newStringShared(runtime, HTTP_VERSION_BYTELIST),val);
} }
};
private Http11Parser.ElementCB header_done = new Http11Parser.ElementCB() { public void header_done(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
public void call(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
body = RubyString.newStringShared(runtime, new ByteList(buffer, at, length)); body = RubyString.newStringShared(runtime, new ByteList(buffer, at, length));
} }
};
@JRubyMethod @JRubyMethod
public IRubyObject initialize() { public IRubyObject initialize() {
@ -214,7 +190,7 @@ public class Http11 extends RubyObject {
parser.data = (RubyHash) req_hash; parser.data = (RubyHash) req_hash;
hp.execute(runtime, d,from); hp.execute(runtime, this, d,from);
validateMaxLength(runtime, parser.nread,MAX_HEADER_LENGTH, MAX_HEADER_LENGTH_ERR); validateMaxLength(runtime, parser.nread,MAX_HEADER_LENGTH, MAX_HEADER_LENGTH_ERR);

66
ext/puma_http11/org/jruby/puma/Http11Parser.java
View file

@ -11,7 +11,7 @@ public class Http11Parser {
/** Machine **/ /** Machine **/
// line 67 "ext/puma_http11/http11_parser.java.rl" // line 58 "ext/puma_http11/http11_parser.java.rl"
/** Data **/ /** Data **/
@ -185,7 +185,7 @@ static final int puma_parser_error = 0;
static final int puma_parser_en_main = 1; static final int puma_parser_en_main = 1;
// line 71 "ext/puma_http11/http11_parser.java.rl" // line 62 "ext/puma_http11/http11_parser.java.rl"
public static interface ElementCB { public static interface ElementCB {
public void call(Ruby runtime, RubyHash data, ByteList buffer, int at, int length); public void call(Ruby runtime, RubyHash data, ByteList buffer, int at, int length);
@ -208,25 +208,16 @@ static final int puma_parser_en_main = 1;
RubyHash data; RubyHash data;
ByteList buffer; ByteList buffer;
public FieldCB http_field;
public ElementCB request_method;
public ElementCB request_uri;
public ElementCB fragment;
public ElementCB request_path;
public ElementCB query_string;
public ElementCB http_version;
public ElementCB header_done;
public void init() { public void init() {
cs = 0; cs = 0;
// line 225 "ext/puma_http11/org/jruby/puma/Http11Parser.java" // line 218 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
{ {
cs = puma_parser_start; cs = puma_parser_start;
} }
// line 106 "ext/puma_http11/http11_parser.java.rl" // line 90 "ext/puma_http11/http11_parser.java.rl"
body_start = 0; body_start = 0;
content_len = 0; content_len = 0;
@ -239,7 +230,7 @@ static final int puma_parser_en_main = 1;
public final HttpParser parser = new HttpParser(); public final HttpParser parser = new HttpParser();
public int execute(Ruby runtime, ByteList buffer, int off) { public int execute(Ruby runtime, Http11 http, ByteList buffer, int off) {
int p, pe; int p, pe;
int cs = parser.cs; int cs = parser.cs;
int len = buffer.length(); int len = buffer.length();
@ -253,7 +244,7 @@ static final int puma_parser_en_main = 1;
parser.buffer = buffer; parser.buffer = buffer;
// line 257 "ext/puma_http11/org/jruby/puma/Http11Parser.java" // line 250 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
{ {
int _klen; int _klen;
int _trans = 0; int _trans = 0;
@ -358,67 +349,58 @@ case 1:
case 5: case 5:
// line 24 "ext/puma_http11/http11_parser.java.rl" // line 24 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.http_field != null) { Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
parser.http_field.call(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
}
} }
break; break;
case 6: case 6:
// line 29 "ext/puma_http11/http11_parser.java.rl" // line 27 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.request_method != null) Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
parser.request_method.call(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
} }
break; break;
case 7: case 7:
// line 33 "ext/puma_http11/http11_parser.java.rl" // line 30 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.request_uri != null) Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
parser.request_uri.call(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
} }
break; break;
case 8: case 8:
// line 37 "ext/puma_http11/http11_parser.java.rl" // line 33 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.fragment != null) Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
parser.fragment.call(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
} }
break; break;
case 9: case 9:
// line 42 "ext/puma_http11/http11_parser.java.rl" // line 37 "ext/puma_http11/http11_parser.java.rl"
{parser.query_start = p; } {parser.query_start = p; }
break; break;
case 10: case 10:
// line 43 "ext/puma_http11/http11_parser.java.rl" // line 38 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.query_string != null) Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, p-parser.query_start);
parser.query_string.call(runtime, parser.data, parser.buffer, parser.query_start, p-parser.query_start);
} }
break; break;
case 11: case 11:
// line 48 "ext/puma_http11/http11_parser.java.rl" // line 42 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.http_version != null) Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
parser.http_version.call(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
} }
break; break;
case 12: case 12:
// line 53 "ext/puma_http11/http11_parser.java.rl" // line 46 "ext/puma_http11/http11_parser.java.rl"
{ {
if(parser.request_path != null) Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
parser.request_path.call(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
} }
break; break;
case 13: case 13:
// line 58 "ext/puma_http11/http11_parser.java.rl" // line 50 "ext/puma_http11/http11_parser.java.rl"
{ {
parser.body_start = p + 1; parser.body_start = p + 1;
if(parser.header_done != null) http.header_done(runtime, parser.data, parser.buffer, p + 1, pe - p - 1);
parser.header_done.call(runtime, parser.data, parser.buffer, p + 1, pe - p - 1);
{ p += 1; _goto_targ = 5; if (true) continue _goto;} { p += 1; _goto_targ = 5; if (true) continue _goto;}
} }
break; break;
// line 422 "ext/puma_http11/org/jruby/puma/Http11Parser.java" // line 406 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
} }
} }
} }
@ -438,7 +420,7 @@ case 5:
break; } break; }
} }
// line 132 "ext/puma_http11/http11_parser.java.rl" // line 116 "ext/puma_http11/http11_parser.java.rl"
parser.cs = cs; parser.cs = cs;
parser.nread += (p - off); parser.nread += (p - off);