commit 3d43823e17818b3c5f45831f830884917b181454
author Piotr Jastrzebski <haaawk@google.com> Tue May 05 09:57:00 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Nov 11 11:34:50 2015 +0000
tree ce1c904417521cc16ace412c3368068dc7adbc57
parent 79126799e8d17a5da735cf252d2865254cdd295f

Use OpenJdk implementation of java.nio.channels.{spi}.*

- Unsafe : Add supporting methods (addressSize, pageSize,
  allocateMemory, freeMemory, setMemory and various getters
  equivalent to the existing libcore Memory classes).
- NioUtils : Rewrite nioutils methods in terms of OpenJdk classes.
- DeleteOnExitHook : Access java.lang.Shutdown directly.
- FileDescriptor : Add getInt$, setInt$ and setSocket.
- NativeBuffers : Copy byte-by-byte instead of using Unsafe.copyMemory.
- FileInputStream : Add a custom implementation of available() instead
  of using IO_Available.

General : Switch JNI code to explicit registration rather than
implicit registration.

General : Track renaming of Unsafe methods (to add the $ suffix). This
might be unnecessary and will be reverted in a future change.

Change-Id: I7e63340d266dbd4b1c425b13710c05dce1086d4b

ojluni/src/main/native/FileOutputStream_md.c

diff --git a/ojluni/src/main/native/FileOutputStream_md.c b/ojluni/src/main/native/FileOutputStream_md.c
index efd5864..8f81885 100755
--- a/ojluni/src/main/native/FileOutputStream_md.c
+++ b/ojluni/src/main/native/FileOutputStream_md.c
@@ -32,6 +32,10 @@
 #include "java_io_FileOutputStream.h"
 
 #include <fcntl.h>
+#include "JNIHelp.h"
+
+#define NATIVE_METHOD(className, functionName, signature) \
+{ #functionName, signature, (void*)(className ## _ ## functionName) }
 
 /*******************************************************************/
 /*  BEGIN JNI ********* BEGIN JNI *********** BEGIN JNI ************/
@@ -44,7 +48,7 @@
  */
 
 JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_initIDs(JNIEnv *env, jclass fdClass) {
+FileOutputStream_initIDs(JNIEnv *env, jclass fdClass) {
     fos_fd = (*env)->GetFieldID(env, fdClass, "fd", "Ljava/io/FileDescriptor;");
 }
 
@@ -53,24 +57,36 @@
  */
 
 JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_open(JNIEnv *env, jobject this,
+FileOutputStream_open(JNIEnv *env, jobject this,
                                    jstring path, jboolean append) {
     fileOpen(env, this, path, fos_fd,
              O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC));
 }
 
 JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_write(JNIEnv *env, jobject this, jint byte, jboolean append) {
+FileOutputStream_write(JNIEnv *env, jobject this, jint byte, jboolean append) {
     writeSingle(env, this, byte, append, fos_fd);
 }
 
 JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_writeBytes(JNIEnv *env,
+FileOutputStream_writeBytes(JNIEnv *env,
     jobject this, jbyteArray bytes, jint off, jint len, jboolean append) {
     writeBytes(env, this, bytes, off, len, append, fos_fd);
 }
 
 JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_close0(JNIEnv *env, jobject this) {
+FileOutputStream_close0(JNIEnv *env, jobject this) {
     fileClose(env, this, fos_fd);
 }
+
+static JNINativeMethod gMethods[] = {
+  NATIVE_METHOD(FileOutputStream, initIDs, "()V"),
+  NATIVE_METHOD(FileOutputStream, open, "(Ljava/lang/String;Z)V"),
+  NATIVE_METHOD(FileOutputStream, write, "(IZ)V"),
+  NATIVE_METHOD(FileOutputStream, writeBytes, "([BIIZ)V"),
+  NATIVE_METHOD(FileOutputStream, close0, "()V"),
+};
+
+void register_java_io_FileOutputStream(JNIEnv* env) {
+  jniRegisterNativeMethods(env, "java/io/FileOutputStream", gMethods, NELEM(gMethods));
+}