Merge pull request #166 from tzezula/native-image-afux

[164] Support http-stream protocol in substrate/native java.

Author: rikgibson

build.sh

@@ -45,8 +45,9 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 )
 
 (
+    workdir=$(pwd)/runtime
     cd images/build-native
-    ./docker-build.sh
+    ./docker-build.sh ${workdir}
 )
 
 

images/build-native/Dockerfile

@@ -6,7 +6,7 @@ RUN set -x \
     && apt-get -y install gcc g++ git make openjdk-8-doc openjdk-8-source python zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JVMCI_VERSION 0.47
+ENV JVMCI_VERSION 0.49
 
 WORKDIR /build
 
@@ -20,7 +20,7 @@ RUN set -x \
     && cp -r $(/build/mx/mx --primary-suite graal-jvmci-8 jdkhome) /build/jvmcijdk8
 
 RUN git clone https://github.com/oracle/graal.git \
-    && git -C graal checkout dca98069dc57c458b8bcb3392cf9e66316dd37b6
+    && git -C graal checkout vm-1.0.0-rc9
 WORKDIR /build/graal/vm
 RUN export JAVA_HOME=/build/jvmcijdk8 \
     && /build/mx/mx --dy /substratevm --force-bash-launchers=true --disable-polyglot --disable-libpolyglot build
@@ -38,6 +38,7 @@ RUN set -x \
     && apt-get -y install gcc zlib1g-dev
 
 COPY --from=build /build/graal/vm/latest_graalvm/graalvm /usr/local/graalvm
+COPY src/main/c/libfnunixsocket.so /function/runtime/lib/
 
 
 ENV GRAALVM_HOME=/usr/local/graalvm

images/build-native/docker-build.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ -z "$1" ]
+then
+    echo "Needs runtime folder as an argument"
+    exit 1
+fi
 native_version=$(cat native.version)
 set -e
 
@@ -7,6 +12,10 @@ if docker pull ${native_image} ; then
    echo ${native_image} already exists, skipping native build
    exit 0
 fi
-
-docker build -t "fnproject/fn-java-native:${native_version}" .
+workdir=${1}
+dockerfiledir=$(pwd)
+(
+  cd ${workdir}
+  docker build -f ${dockerfiledir}/Dockerfile -t "fnproject/fn-java-native:${native_version}" .
+)
 echo "fnproject/fn-java-native:${native_version}" > native_build.image

images/build-native/native.version

@@ -1 +1 @@
-0.1.0
+0.2.0

images/init-native/Dockerfile

@@ -12,18 +12,22 @@ LABEL maintainer="tomas.zezula@oracle.com"
 WORKDIR /function
 COPY --from=build /function/target/*.jar target/
 COPY --from=build /function/src/main/conf/reflection.json reflection.json
+COPY --from=build /function/src/main/conf/jni.json jni.json
 RUN /usr/local/graalvm/bin/native-image \
     --static \
+    --delay-class-initialization-to-runtime=com.fnproject.fn.runtime.ntv.UnixSocketNative \
     -H:Name=func \
     -H:+ReportUnsupportedElementsAtRuntime \
     -H:ReflectionConfigurationFiles=reflection.json \
+    -H:JNIConfigurationFiles=jni.json \
     -classpath "target/*"\
     com.fnproject.fn.runtime.EntryPoint
 
 
-FROM scratch
+FROM busybox:glibc
 LABEL maintainer="tomas.zezula@oracle.com"
 WORKDIR /function
 COPY --from=build-native-image /function/func func
+COPY --from=build-native-image /function/runtime/lib/* .
 ENTRYPOINT ["./func", "-XX:MaximumHeapSizePercent=80"]
 CMD [ "com.example.fn.HelloFunction::handleRequest" ]

images/init-native/func.init.yaml

@@ -1,2 +1,2 @@
 runtime: docker
-format: http
+format: http-stream

images/init-native/src/main/conf/jni.json

@@ -0,0 +1,22 @@
+[
+  {
+    "name" : "com.fnproject.fn.runtime.ntv.UnixSocketNative",
+    "methods" : [
+        { "name" : "socket" },
+        { "name" : "bind" },
+        { "name" : "connect" },
+        { "name" : "listen" },
+        { "name" : "accept" },
+        { "name" : "recv" },
+        { "name" : "send" },
+        { "name" : "close" },
+        { "name" : "setSendTimeout" },
+        { "name" : "getSendTimeout" },
+        { "name" : "setRecvTimeout" },
+        { "name" : "getRecvTimeout" },
+        { "name" : "setSendBufSize" },
+        { "name" : "setRecvBufSize" },
+        { "name" : "shutdown"}
+    ]
+  }
+]

images/init-native/src/main/conf/reflection.json

@@ -1,10 +1,9 @@
-
 [
   {
     "name" : "com.example.fn.HelloFunction",
     "methods" : [
-        { "name" : "handleRequest" },
-        { "name" : "<init>"}
+      { "name" : "handleRequest" },
+      { "name" : "<init>" }
     ]
   }
 ]