[osv-dev] [COMMIT osv master] java: move java_api and jni_helpers to java modules

Thu, 16 Jan 2020 04:33:01 -0800 

From: Waldemar Kozaczuk <[email protected]>
Committer: Nadav Har'El <[email protected]>
Branch: master

java: move java_api and jni_helpers to java modules

The java_api.* and jni_helpers.* are actually only used by
java.cc and following httpserver java-related plugins:
- httpserver-jolokia-plugin
- httpserver-jvm-plugin
- josvsym

This patch moves the relevant code out from kernel
and makes it part of java.so.

Signed-off-by: Waldemar Kozaczuk <[email protected]>
Message-Id: <[email protected]>

---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -817,8 +817,6 @@ drivers += drivers/clock-common.o
 drivers += drivers/clockevent.o
 drivers += core/elf.o
 drivers += java/jvm/jvm_balloon.o
-drivers += java/jvm/java_api.o
-drivers += java/jvm/jni_helpers.o
 drivers += drivers/random.o
 drivers += drivers/zfs.o
 drivers += drivers/null.o
diff --git a/modules/httpserver-api/Makefile b/modules/httpserver-api/Makefile 
--- a/modules/httpserver-api/Makefile
+++ b/modules/httpserver-api/Makefile
@@ -107,7 +107,7 @@ check-http:
 check-ssl:
        # Test SSL
        cd $(src) && \
-       make image=httpserver-api.fg_ssl,certs,openjdk8-zulu-full,jetty && \
+       make image=httpserver-api.daemon_ssl,certs,openjdk8-zulu-full,jetty && \
PYTHONPATH=$(src)/scripts modules/httpserver-api/tests/testhttpserver-api.py \ 
                --cert modules/certs/build/client.pem \
                --key modules/certs/build/client.key \
diff --git a/modules/httpserver-api/module.py b/modules/httpserver-api/module.py 
--- a/modules/httpserver-api/module.py
+++ b/modules/httpserver-api/module.py
@@ -22,6 +22,7 @@
 # httpserver will run regardless of an explicit command line
 # passed with "run.py -e".
 daemon = api.run_on_init(_exe + ' &!')
+daemon_ssl = api.run_on_init(_exe + ' --ssl &!')

 fg = api.run(_exe)
diff --git a/modules/httpserver-jolokia-plugin/jolokia.cc b/modules/httpserver-jolokia-plugin/jolokia.cc 
--- a/modules/httpserver-jolokia-plugin/jolokia.cc
+++ b/modules/httpserver-jolokia-plugin/jolokia.cc
@@ -15,7 +15,7 @@
 #include <mutex>
 #include <memory>
 #include <regex>
-#include <java/jvm/jni_helpers.hh>
+#include "../java-base/jvm/jni_helpers.hh"
 #include "exception.hh"

 using namespace httpserver::json;
diff --git a/modules/httpserver-jvm-plugin/jvm.cc b/modules/httpserver-jvm-plugin/jvm.cc 
--- a/modules/httpserver-jvm-plugin/jvm.cc
+++ b/modules/httpserver-jvm-plugin/jvm.cc
@@ -7,7 +7,7 @@

 #include "jvm.hh"
 #include "autogen/jvm.json.hh"
-#include "jvm/java_api.hh"
+#include "../java-base/jvm/java_api.hh"
 #include <string>

 namespace httpserver {
diff --git a/modules/java-base/Makefile b/modules/java-base/Makefile
--- a/modules/java-base/Makefile
+++ b/modules/java-base/Makefile
@@ -3,7 +3,7 @@ include common.gmk
 ifeq ($(arch),aarch64)
 java-targets :=
 else
-java-targets := obj/jni/monitor.so
+java-targets := obj/jni/monitor.so obj/jvm/jni_helpers.o obj/jvm/java_api.o
 endif

 module: all
@@ -13,6 +13,7 @@ all: $(init) $(java-targets)
 init:
        @echo "  MKDIRS"
        $(call very-quiet, mkdir -p obj/jni)
+       $(call very-quiet, mkdir -p obj/jvm)
 .PHONY: init

 clean:
diff --git a/modules/java-base/common.gmk b/modules/java-base/common.gmk
--- a/modules/java-base/common.gmk
+++ b/modules/java-base/common.gmk
@@ -1,7 +1,5 @@
-
INCLUDES = -I$(src)/arch/$(arch) -I$(src) -I$(src)/include -I$(src)/arch/common 
 INCLUDES += -I$(src)/include/glibc-compat
-INCLUDES += -isystem $(src)/external/$(arch)/acpica/source/include
INCLUDES += $(shell $(CXX) -E -xc++ - -v </dev/null 2>&1 | awk '/^End/ {exit} /^ .*c\+\+/ {print "-isystem" $$0}') 
 INCLUDES += -isystem $(src)/include/api
 INCLUDES += -isystem $(src)/include/api/$(arch)
@@ -13,7 +11,9 @@ autodepend = -MD -MT $@ -MP
COMMON_FLAGS = -g -Wall -fPIC $(INCLUDES) -O2 $(autodepend) -DCONF_debug_memory=0 -D_KERNEL 
 CXXFLAGS  = -std=c++11 $(COMMON_FLAGS)
 CFLAGS = -std=gnu99 $(COMMON_FLAGS)
+
 src = $(shell readlink -f ../..)
+java-base-path := $(src)/modules/java-base

 RM := /bin/rm

diff --git a/modules/java-base/java.cc b/modules/java-base/java.cc
--- a/modules/java-base/java.cc
+++ b/modules/java-base/java.cc
@@ -14,9 +14,9 @@
 #include <osv/debug.hh>
 #include <java/jvm/jvm_balloon.hh>
 #include <osv/mempool.hh>
-#include <java/jvm/java_api.hh>
+#include "jvm/java_api.hh"
 #include "osv/version.hh"
-#include <java/jvm/jni_helpers.hh>
+#include "jvm/jni_helpers.hh"
 #include <osv/defer.hh>
 #include <osv/app.hh>
diff --git a/modules/java-base/jvm/java_api.cc b/modules/java-base/jvm/java_api.cc 
--- a/modules/java-base/jvm/java_api.cc
+++ b/modules/java-base/jvm/java_api.cc
null
diff --git a/modules/java-base/jvm/java_api.hh b/modules/java-base/jvm/java_api.hh 
--- a/modules/java-base/jvm/java_api.hh
+++ b/modules/java-base/jvm/java_api.hh
null
diff --git a/modules/java-base/jvm/jni_helpers.cc b/modules/java-base/jvm/jni_helpers.cc 
--- a/modules/java-base/jvm/jni_helpers.cc
+++ b/modules/java-base/jvm/jni_helpers.cc
null
diff --git a/modules/java-base/jvm/jni_helpers.hh b/modules/java-base/jvm/jni_helpers.hh 
--- a/modules/java-base/jvm/jni_helpers.hh
+++ b/modules/java-base/jvm/jni_helpers.hh
null
diff --git a/modules/java-isolated/Makefile b/modules/java-isolated/Makefile
--- a/modules/java-isolated/Makefile
+++ b/modules/java-isolated/Makefile
@@ -8,17 +8,20 @@ else
 java-targets := obj/java.so
 endif

-obj/java.o: $(SRC)/modules/java-base/java.cc | init
- $(call quiet, $(CXX) $(CXXFLAGS) -o $@ -c $(SRC)/modules/java-base/java.cc -MMD, CXX $@) 
+obj/java.o: $(java-base-path)/java.cc | init
+ $(call quiet, $(CXX) $(CXXFLAGS) -o $@ -c $(java-base-path)/java.cc -MMD, CXX $@) 
+
+obj/java.so: obj/java.o $(java-base-path)/obj/jvm/java_api.o $(java-base-path)/obj/jvm/jni_helpers.o 
+       $(call quiet, $(CXX) $(CXXFLAGS) -shared -o $@ $^, LINK $@)

 init:
        @echo "  MKDIRS"
        $(call very-quiet, mkdir -p obj)

 module: $(java-targets)
- cd $(SRC)/modules/java-base && mvn -q --projects :runjava-common,:runjava-isolated package -DskipTests=true + cd $(java-base-path) && mvn -q --projects :runjava-common,:runjava-isolated package -DskipTests=true 

 clean:
-       cd $(SRC)/modules/java-base && mvn -q clean
+       cd $(java-base-path) && mvn -q clean
        -rm -f dependency-reduced-pom.xml
        $(call very-quiet, $(RM) -rf obj)
diff --git a/modules/java-non-isolated/Makefile b/modules/java-non-isolated/Makefile 
--- a/modules/java-non-isolated/Makefile
+++ b/modules/java-non-isolated/Makefile
@@ -8,17 +8,20 @@ else
 java-targets := obj/java_non_isolated.so
 endif

-obj/java_non_isolated.o: $(SRC)/modules/java-base/java.cc | init
- $(call quiet, $(CXX) $(CXXFLAGS) -DRUN_JAVA_NON_ISOLATED -o $@ -c $(SRC)/modules/java-base/java.cc -MMD, CXX $@) 
+obj/java_non_isolated.o: $(java-base-path)/java.cc | init
+ $(call quiet, $(CXX) $(CXXFLAGS) -DRUN_JAVA_NON_ISOLATED -o $@ -c $(java-base-path)/java.cc -MMD, CXX $@) 
+
+obj/java_non_isolated.so: obj/java_non_isolated.o $(java-base-path)/obj/jvm/java_api.o $(java-base-path)/obj/jvm/jni_helpers.o 
+       $(call quiet, $(CXX) $(CXXFLAGS) -shared -o $@ $^, LINK $@)

 init:
        @echo "  MKDIRS"
        $(call very-quiet, mkdir -p obj)

 module: $(java-targets)
- cd $(SRC)/modules/java-base && mvn -q --projects :runjava-common,:runjava-non-isolated package -DskipTests=true + cd $(java-base-path) && mvn -q --projects :runjava-common,:runjava-non-isolated package -DskipTests=true 

 clean:
-       cd $(SRC)/modules/java-base && mvn -q clean
+       cd $(java-base-path) && mvn -q clean
        -rm -f dependency-reduced-pom.xml
        $(call very-quiet, $(RM) -rf obj)
diff --git a/modules/java-tests/Makefile b/modules/java-tests/Makefile
--- a/modules/java-tests/Makefile
+++ b/modules/java-tests/Makefile
@@ -10,6 +10,9 @@ endif
 obj/java_isolated.o: $(SRC)/modules/java-base/java.cc | init
$(call quiet, $(CXX) $(CXXFLAGS) -o $@ -c $(SRC)/modules/java-base/java.cc -MMD, CXX $@)
+obj/java_isolated.so: obj/java_isolated.o $(java-base-path)/obj/jvm/java_api.o $(java-base-path)/obj/jvm/jni_helpers.o 
+       $(call quiet, $(CXX) $(CXXFLAGS) -shared -o $@ $^, LINK $@)
+
 init:
        @echo "  MKDIRS"
        $(call very-quiet, mkdir -p obj)
diff --git a/modules/josvsym/josvsym.cc b/modules/josvsym/josvsym.cc
--- a/modules/josvsym/josvsym.cc
+++ b/modules/josvsym/josvsym.cc
@@ -5,7 +5,7 @@
 #include <thread>
 #include <initializer_list>
 #include <osv/tracecontrol.hh>
-#include <java/jvm/jni_helpers.hh>
+#include "../java-base/jvm/jni_helpers.hh"

 static jvmtiEnv * jvmti;
 static trace::generator_id id;

--
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/osv-dev/000000000000d304d4059c410507%40google.com.

Reply via email to