Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

* Treat SSL NOT_HANDSHAKING as FINISHED. #1707

Closed
wants to merge 4 commits into from
+33 −8
Closed

* Treat SSL NOT_HANDSHAKING as FINISHED. #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55ce9fe
* Treat SSL NOT_HANDSHAKING as FINISHED.
donv May 20, 2014
3e6634e
[Truffle] Add Rubinius report, and a couple of other tweaks.
chrisseaton May 20, 2014
a080791
* Treat SSL NOT_HANDSHAKING as FINISHED.
donv May 20, 2014
578637c
Merge branch 'ssl_treat_not_handshaking_as_finished' of jruby.org:jru…
donv May 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions bench/truffle/report/rbx.gnuplot
View file
Open in desktop
@@ -0,0 +1,25 @@
set terminal pdf enhanced size 10,6
set output 'rbx.pdf'

set style data histogram
set style histogram cluster gap 1

set title "JRuby+Truffle vs Rubinius 2.2.6"
set xlabel "Implementation" rotate by 270
set ylabel "Speedup Relative to Rubinius 2.2.6"
set key top left

set style fill solid border rgb 'black'
set auto x
set xtics nomirror rotate by -45
set yrange [0:*]

plot 'rbx.data' using 2:xtic(1) title col, \
'' using 3:xtic(1) title col, \
'' using 4:xtic(1) title col, \
'' using 5:xtic(1) title col, \
'' using 6:xtic(1) title col, \
'' using 7:xtic(1) title col, \
'' using 8:xtic(1) title col, \
'' using 9:xtic(1) title col, \
'' using 10:xtic(1) title col
12 changes: 7 additions & 5 deletions bench/truffle/report/report.rb
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@
exit exit
end end
else else
if ["topaz", "jruby", "jruby-master", "competition", "almost-all", "all", "interpreters", "summary", "other-vms", "head"].include? arg if ["rbx", "topaz", "jruby", "jruby-master", "competition", "almost-all", "all", "interpreters", "summary", "other-vms", "head"].include? arg
reports.push(arg) reports.push(arg)
else else
puts "unknown report " + arg puts "unknown report " + arg
Expand All @@ -53,6 +53,7 @@


report_references = { report_references = {
"topaz" => "topaz-dev", "topaz" => "topaz-dev",
"rbx" => "rbx-2.2.6",
"jruby" => "jruby-1.7.12-server-indy", "jruby" => "jruby-1.7.12-server-indy",
"jruby-master" => "jruby-master-server-indy", "jruby-master" => "jruby-master-server-indy",
"competition" => "jruby-1.7.12-server-indy", "competition" => "jruby-1.7.12-server-indy",
Expand Down Expand Up @@ -90,7 +91,8 @@
relevant_reports.push("summary") relevant_reports.push("summary")
relevant_reports.push("competition") relevant_reports.push("competition")
relevant_reports.push("other-vms") relevant_reports.push("other-vms")
rubies.push Ruby.new(name + "-interpreter", dir + "/bin/ruby -Xint", ["interpreters"]) relevant_reports.push("rbx")
rubies.push Ruby.new(name + "-interpreter", dir + "/bin/ruby -Xint", ["all", "interpreters"])
end end


if name == "2.1.2" if name == "2.1.2"
Expand Down Expand Up @@ -125,11 +127,11 @@
if not ENV["JRUBY_DIR"].nil? and not ENV["GRAAL_RELEASE_DIR"].nil? and Dir.exists? File.expand_path(ENV["JRUBY_DIR"]) and Dir.exists? File.expand_path(ENV["GRAAL_RELEASE_DIR"]) if not ENV["JRUBY_DIR"].nil? and not ENV["GRAAL_RELEASE_DIR"].nil? and Dir.exists? File.expand_path(ENV["JRUBY_DIR"]) and Dir.exists? File.expand_path(ENV["GRAAL_RELEASE_DIR"])
rubies.push Ruby.new("jruby-master-server-interpreter", "$JRUBY_DIR/bin/jruby --server -Xcompile.mode=OFF", ["almost-all", "all", "jruby", "jruby-master", "interpreters"]) rubies.push Ruby.new("jruby-master-server-interpreter", "$JRUBY_DIR/bin/jruby --server -Xcompile.mode=OFF", ["almost-all", "all", "jruby", "jruby-master", "interpreters"])
rubies.push Ruby.new("jruby-master-server", "$JRUBY_DIR/bin/jruby --server", ["almost-all", "all", "jruby", "jruby-master"]) rubies.push Ruby.new("jruby-master-server", "$JRUBY_DIR/bin/jruby --server", ["almost-all", "all", "jruby", "jruby-master"])
rubies.push Ruby.new("jruby-master-server-indy", "$JRUBY_DIR/bin/jruby --server -Xcompile.invokedynamic=true", ["almost-all", "all", "competition", "jruby", "jruby-master", "summary"]) rubies.push Ruby.new("jruby-master-server-indy", "$JRUBY_DIR/bin/jruby --server -Xcompile.invokedynamic=true", ["almost-all", "all", "jruby", "jruby-master", "summary"])
rubies.push Ruby.new("jruby-master-server-ir-interpreter", "$JRUBY_DIR/bin/jruby --server -X-CIR", ["all", "jruby", "jruby-master", "interpreters"]) rubies.push Ruby.new("jruby-master-server-ir-interpreter", "$JRUBY_DIR/bin/jruby --server -X-CIR", ["all", "jruby", "jruby-master", "interpreters"])
rubies.push Ruby.new("jruby-master-server-ir-compiler", "$JRUBY_DIR/bin/jruby --server -X+CIR", ["all", "jruby", "jruby-master"]) rubies.push Ruby.new("jruby-master-server-ir-compiler", "$JRUBY_DIR/bin/jruby --server -X+CIR", ["all", "jruby", "jruby-master"])
rubies.push Ruby.new("jruby-master+truffle-server-original", "JAVACMD=$GRAAL_RELEASE_DIR/bin/java $JRUBY_DIR/bin/jruby -J-original -X+T -Xtruffle.printRuntime=true", ["interpreters", "jruby", "jruby-master"]) rubies.push Ruby.new("jruby-master+truffle-server-original", "JAVACMD=$GRAAL_RELEASE_DIR/bin/java $JRUBY_DIR/bin/jruby -J-original -X+T -Xtruffle.printRuntime=true", ["all", "interpreters", "jruby", "jruby-master"])
rubies.push Ruby.new("jruby-master+truffle-server", "JAVACMD=$GRAAL_RELEASE_DIR/bin/java $JRUBY_DIR/bin/jruby -J-server -X+T -Xtruffle.printRuntime=true", ["almost-all", "all", "jruby", "jruby-master", "topaz", "competition", "other-vms", "head"]) rubies.push Ruby.new("jruby-master+truffle-server", "JAVACMD=$GRAAL_RELEASE_DIR/bin/java $JRUBY_DIR/bin/jruby -J-server -X+T -Xtruffle.printRuntime=true", ["almost-all", "all", "jruby", "jruby-master", "topaz", "rbx", "competition", "summary", "other-vms", "head"])
else else
puts "warning: couldn't find $JRUBY_DIR or $GRAAL_RELEASE_DIR" puts "warning: couldn't find $JRUBY_DIR or $GRAAL_RELEASE_DIR"
end end
Expand Down
4 changes: 1 addition & 3 deletions ext/openssl/src/main/java/org/jruby/ext/openssl/SSLSocket.java
View file
Open in desktop
Expand Up @@ -418,6 +418,7 @@ private void doHandshake(boolean blocking) throws IOException {


switch (hsStatus) { switch (hsStatus) {
case FINISHED: case FINISHED:
case NOT_HANDSHAKING:
if ( initialHandshake ) finishInitialHandshake(); if ( initialHandshake ) finishInitialHandshake();
return; return;
case NEED_TASK: case NEED_TASK:
Expand All @@ -444,9 +445,6 @@ private void doHandshake(boolean blocking) throws IOException {
netData.flip(); netData.flip();
flushData(blocking); flushData(blocking);
break; break;
case NOT_HANDSHAKING:
// Opposite side could close while unwrapping. Handle this as same as FINISHED
return;
default: default:
throw new IllegalStateException("Unknown handshaking status: " + hsStatus); throw new IllegalStateException("Unknown handshaking status: " + hsStatus);
} }
Expand Down