speedup some array creation internals + receive context on methods

Author: kares

src/main/java/org/jruby/ext/openssl/SSLContext.java

@@ -469,18 +469,17 @@ private RubyArray matchedCiphers(final ThreadContext context) {
             final Collection<CipherStrings.Def> cipherDefs =
                     CipherStrings.matchingCiphers(this.ciphers, supported, false);
 
-            final RubyArray cipherList = runtime.newArray( cipherDefs.size() );
-
-            for ( CipherStrings.Def def : cipherDefs ) {
-                final RubyArray cipher = runtime.newArray(4);
-                cipher.store(0, newUTF8String(runtime, def.name));
-                cipher.store(1, newUTF8String(runtime, sslVersionString(def.algorithms)));
-                cipher.store(2, runtime.newFixnum(def.algStrengthBits));
-                cipher.store(3, runtime.newFixnum(def.algBits));
-
-                cipherList.append(cipher);
+            final IRubyObject[] cipherList = new IRubyObject[ cipherDefs.size() ];
+
+            int i = 0; for ( CipherStrings.Def def : cipherDefs ) {
+                cipherList[i++] = runtime.newArrayNoCopy(
+                    newUTF8String(runtime, def.name), // 0
+                    newUTF8String(runtime, sslVersionString(def.algorithms)), // 1
+                    runtime.newFixnum(def.algStrengthBits), // 2
+                    runtime.newFixnum(def.algBits) // 3
+                );
             }
-            return cipherList;
+            return runtime.newArrayNoCopy(cipherList);
         }
         catch (GeneralSecurityException gse) {
             throw newSSLError(runtime, gse.getMessage());

src/main/java/org/jruby/ext/openssl/SSLSocket.java

@@ -927,14 +927,14 @@ public IRubyObject sysclose(final ThreadContext context) {
     }
 
     @JRubyMethod
-    public IRubyObject cert() {
-        final Ruby runtime = getRuntime();
+    public IRubyObject cert(final ThreadContext context) {
+        final Ruby runtime = context.runtime;
         if ( engine == null ) return runtime.getNil();
 
         try {
             Certificate[] cert = engine.getSession().getLocalCertificates();
             if ( cert != null && cert.length > 0 ) {
-                return X509Cert.wrap(runtime, cert[0]);
+                return X509Cert.wrap(context, cert[0]);
             }
         }
         catch (CertificateEncodingException e) {
@@ -943,15 +943,20 @@ public IRubyObject cert() {
         return runtime.getNil();
     }
 
+    // @Deprecated
+    public final IRubyObject cert() {
+        return cert(getRuntime().getCurrentContext());
+    }
+
     @JRubyMethod
-    public IRubyObject peer_cert() {
-        final Ruby runtime = getRuntime();
+    public IRubyObject peer_cert(final ThreadContext context) {
+        final Ruby runtime = context.runtime;
         if ( engine == null ) return runtime.getNil();
 
         try {
             Certificate[] cert = engine.getSession().getPeerCertificates();
             if ( cert.length > 0 ) {
-                return X509Cert.wrap(runtime, cert[0]);
+                return X509Cert.wrap(context, cert[0]);
             }
         }
         catch (CertificateEncodingException e) {
@@ -965,18 +970,23 @@ public IRubyObject peer_cert() {
         return runtime.getNil();
     }
 
+    // @Deprecated
+    public final IRubyObject peer_cert() {
+        return peer_cert(getRuntime().getCurrentContext());
+    }
+
     @JRubyMethod
-    public IRubyObject peer_cert_chain() {
-        final Ruby runtime = getRuntime();
+    public IRubyObject peer_cert_chain(final ThreadContext context) {
+        final Ruby runtime = context.runtime;
         if ( engine == null ) return runtime.getNil();
 
         try {
             javax.security.cert.Certificate[] certs = engine.getSession().getPeerCertificateChain();
-            RubyArray arr = runtime.newArray(certs.length);
+            IRubyObject[] cert_chain = new IRubyObject[ certs.length ];
             for ( int i = 0; i < certs.length; i++ ) {
-                arr.append( X509Cert.wrap(runtime, certs[i]) );
+                cert_chain[i] = X509Cert.wrap(context, certs[i]);
             }
-            return arr;
+            return runtime.newArrayNoCopy(cert_chain);
         }
         catch (javax.security.cert.CertificateEncodingException e) {
             throw X509Cert.newCertificateError(getRuntime(), e);
@@ -989,6 +999,11 @@ public IRubyObject peer_cert_chain() {
         return runtime.getNil();
     }
 
+    // @Deprecated
+    public final IRubyObject peer_cert_chain() {
+        return peer_cert_chain(getRuntime().getCurrentContext());
+    }
+
     @JRubyMethod
     public IRubyObject cipher() {
         if ( engine == null ) return getRuntime().getNil();

src/main/java/org/jruby/ext/openssl/X509Cert.java

@@ -151,13 +151,23 @@ public static IRubyObject wrap(Ruby runtime, Certificate cert)
         return wrap(runtime.getCurrentContext(), cert.getEncoded());
     }
 
+    static X509Cert wrap(ThreadContext context, Certificate cert)
+        throws CertificateEncodingException {
+        return wrap(context, cert.getEncoded());
+    }
+
     // this is the javax.security counterpart of the previous wrap method
     public static IRubyObject wrap(Ruby runtime, javax.security.cert.Certificate cert)
         throws javax.security.cert.CertificateEncodingException {
         return wrap(runtime.getCurrentContext(), cert.getEncoded());
     }
 
-    static IRubyObject wrap(final ThreadContext context, final byte[] encoded) {
+    static X509Cert wrap(ThreadContext context, javax.security.cert.Certificate cert)
+        throws javax.security.cert.CertificateEncodingException {
+        return wrap(context, cert.getEncoded());
+    }
+
+    static X509Cert wrap(final ThreadContext context, final byte[] encoded) {
         //final Ruby runtime = context.runtime;
         //final RubyString enc = StringHelper.newString(runtime, encoded);
         //return _Certificate(runtime).callMethod(context, "new", enc);