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 <jwkozaczuk@gmail.com>
Message-Id: <20200116042111.4833-1-jwkozaczuk@gmail.com>

Author: wkozaczuk

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

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 \

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)
 

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;

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 {

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:

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
 

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>