update openjdk and python scripts

LibOS/shim/test/apps/openjdk/Makefile

@@ -9,13 +9,16 @@ exec_target = java.manifest
 
 clean-extra = clean-classes
 
-compact_rule = sys.stack.size = 1M\nsys.brk.size = 16M\nglibc.heap_size =  4M\nsgx.enclave_size = 2G\nsgx.thread_num = 16\nsgx.heap_min = 0x80000000
-large_rule   = sys.stack.size = 4M\nsys.brk.size = 64M\nglibc.heap_size = 16M\nsgx.enclave_size = 8G\nsgx.thread_num = 32\nsgx.heap_min = 0x40000000
+ifeq ($(HUGE),)
+RESOURCE_RULE = sys.stack.size = 256K\nsys.brk.size = 16M\nglibc.heap_size =  4M\nsgx.enclave_size = 256M\nsgx.thread_num = 12
+else
+RESOURCE_RULE = sys.stack.size = 4M\nsys.brk.size = 64M\nglibc.heap_size = 16M\nsgx.enclave_size = 8G\nsgx.thread_num = 32
+endif
 
 extra_rules = \
 	-e 's:\$$(DEBUGTYPE):$(if $(DEBUG),inline,none):g' \
 	-e 's:\$$(JAVA_HOME):$(JAVA_HOME):g' \
-	-e 's:\$$(RESOURCE_RULE):$(if $(COMPACT),$(compact_rule),$(large_rule)):g'
+	-e 's:\$$(RESOURCE_RULE):$(RESOURCE_RULE):g'
 
 level = ../../
 include ../../Makefile
@@ -23,53 +26,8 @@ include ../../Makefile
 TEST_CLASS = $(patsubst %.java,%,$(wildcard classes/*.java))
 
 USE_UBUNTU_SRC = no
-VERSION := 7
-
-ifeq ($(USE_UBUNTU_SRC),yes)
-
-ifeq ($(JRE_VERSION),7)
-JAVA_DIR = openjdk-7-7u79-2.5.5
-JAVA_HOME = openjdk-7-jre
-endif
-
-ifeq ($(JRE_VERSION),6)
-JAVA_DIR = openjdk-6-6b32-1.13.4
-JAVA_HOME = openjdk-6-jre
-endif
-
-ifndef JAVA_DIR
-$(error Unknown JRE Version)
-endif
-
-INSTALL_DIR = $(JAVA_DIR)/openjdk.build
-JRE_DIR = $(INSTALL_DIR)/j2sdk-image/jre
-JDK_DIR = $(INSTALL_DIR)/j2sdk-image
-JAVAC = $(JDK_DIR)/bin/javac
-TARGET = $(JAVA_HOME)/bin/java $(JAVAC)
-
-%/Makefile: %.tar.gz
-	tar -xzf $<
-	cd $(dir $@) && ./configure \
-		--prefix=$(shell readlink -f $(INSTALL_DIR)) \
-		--disable-docs \
-		--enable-optimizations
-
-$(JRE_DIR)/bin/java $(JAVAC): $(JAVA_DIR)/Makefile
-	cd $(JAVA_DIR) && make -j$(NPROCS) all $(MAKE_FLAGS)
-
-$(JAVA_HOME)/bin/java: $(JRE_DIR)/bin/java
-	rm -rf $(JAVA_HOME)
-	cp -rf $(JRE_DIR) $(JAVA_HOME)
-	find $(JAVA_HOME) -type f -executable -exec strip --strip-debug {} \;
-
-distclean: clean
-	rm -rf $(INSTALL_DIR) $(JAVA_HOME)
-
-else # USE_UBUNTU_SRC = no
-
-ifeq ($(VERSION),7)
-
-ICEDTEA_URL = http://icedtea.wildebeest.org/download/drops/icedtea7/2.7.0/
+VERSION = 7
+ICEDTEA_URL = http://icedtea.wildebeest.org/download/drops/icedtea7/2.6.4/
 JAVA_DIR = openjdk-7
 JAVA_SRC = $(JAVA_DIR) $(JAVA_DIR)/hotspot $(JAVA_DIR)/jdk $(JAVA_DIR)/jdk/src/share/lib/security/nss.cfg
 JAVA_HOME = openjdk-7-jre
@@ -87,7 +45,7 @@ $(JAVA_DIR)/hotspot: hotspot.tar.bz2 | $(JAVA_DIR)
 $(JAVA_DIR)/jdk: jdk.tar.bz2 | $(JAVA_DIR)
 	tar -xjf $<
 	rm -rf $@
-	cd $(shell tar -tjf $< | sed -e 's@/.*@@' | head -n 1) && patch -p1 < ../smaller-jdk.patch
+	cd $(shell tar -tjf $< | sed -e 's@/.*@@' | head -n 1) && patch -p1 < ../JDK-8015880.patch
 	mv $(shell tar -tjf $< | sed -e 's@/.*@@' | head -n 1) $@
 
 openjdk.tar.bz2 hotspot.tar.bz2 jdk.tar.bz2:
@@ -96,7 +54,6 @@ openjdk.tar.bz2 hotspot.tar.bz2 jdk.tar.bz2:
 $(JAVA_DIR)/jdk/src/share/lib/security/nss.cfg: $(JAVA_DIR)/jdk/src/share/lib/security/nss.cfg.in | $(JAVA_DIR)/jdk
 	sed 's:@NSS_LIBDIR@:/usr/lib/x86_64-linux-gnu:g' $< > $@
 
-endif
 
 HOST_JAVA_HOME=$(subst /jre/bin/java,,$(shell readlink -f $(shell which java)))
 INSTALL_DIR = $(JAVA_DIR)/build/linux-amd64
@@ -132,8 +89,6 @@ $(JAVA_HOME)/bin/java: $(JRE_DIR)/bin/java
 distclean: clean
 	rm -rf $(JAVA_DIR) $(JAVA_HOME)
 
-endif
-
 build-java: $(JAVA_HOME)/bin/java $(JAVAC)
 
 java_home:

LibOS/shim/test/apps/openjdk/java.manifest.template

@@ -38,13 +38,20 @@ sgx.trusted_libs.libjava = file:$(JAVA_HOME)/lib/amd64/libjava.so
 sgx.trusted_libs.libjli = file:$(JAVA_HOME)/lib/amd64/jli/libjli.so
 sgx.trusted_libs.libjvm = file:$(JAVA_HOME)/lib/amd64/server/libjvm.so
 sgx.trusted_libs.libzip = file:$(JAVA_HOME)/lib/amd64/libzip.so
+sgx.trusted_libs.libnet = file:$(JAVA_HOME)/lib/amd64/libnet.so
+sgx.trusted_libs.libnio = file:$(JAVA_HOME)/lib/amd64/libnio.so
 sgx.trusted_libs.libnssc = file:/lib/x86_64-linux-gnu/libnss_compat.so.2
 sgx.trusted_libs.libnssf = file:/lib/x86_64-linux-gnu/libnss_files.so.2
 sgx.trusted_libs.libnssn = file:/lib/x86_64-linux-gnu/libnss_nis.so.2
 
 sgx.trusted_files.jvmcfg = file:$(JAVA_HOME)/lib/amd64/jvm.cfg
-sgx.trusted_files.meta_index = file:$(JAVA_HOME)/lib/meta-index
+sgx.trusted_files.meta = file:$(JAVA_HOME)/lib/meta-index
+sgx.trusted_files.tzdb = file:$(JAVA_HOME)/lib/tzdb.dat
+sgx.trusted_files.currency = file:$(JAVA_HOME)/lib/currency.data
+sgx.trusted_files.rt = file:$(JAVA_HOME)/lib/rt.jar
+sgx.trusted_files.resources = file:$(JAVA_HOME)/lib/resources.jar
 
+sgx.allowed_files.ext = file:$(JAVA_HOME)/lib/ext
 sgx.allowed_files.classes = file:classes
 sgx.allowed_files.tmp = file:/tmp
 sgx.allowed_files.xml_out = file:xml_out

LibOS/shim/test/apps/openjdk/run-compact-java

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-JAVA_FLAGS="-Xmx512m -Xms4m -XX:NewSize=1m -XX:MaxNewSize=4m -Xss4m -XX:+UseSerialGC -XX:-UsePerfData -XX:+DisableExplicitGC -XX:PermSize=16m -XX:MaxPermSize=64m -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=30"
-
-if [ "$1" = "-native" ]
-then
-	shift
-	JAVA=/usr/bin/java
-else
-	JAVA=$(/usr/bin/dirname $(readlink -f ${BASH_SOURCE[0]}))/java.manifest
-fi
-
-set -x
-
-exec $JAVA $JAVA_FLAGS $*

LibOS/shim/test/apps/openjdk/smaller-jdk.patch

@@ -1,26 +0,0 @@
---- jdk/make/sun/Makefile	2015-07-14 17:43:29.000000000 -0400
-+++ jdk.new/make/sun/Makefile	2015-10-31 16:30:15.837466876 -0400
-@@ -85,11 +85,17 @@ else
-   DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR)
-   DISPLAY_TOOLS = applet
- endif
--SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
--                     $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
--                     jawt font jpeg cmm $(DISPLAY_TOOLS) beans
--SUBDIRS_management = management
--SUBDIRS_misc       = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
-+
-+#SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
-+#                     $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
-+#                     jawt font jpeg cmm $(DISPLAY_TOOLS) beans
-+#SUBDIRS_management = management
-+#SUBDIRS_misc       = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
-+#SUBDIRS_tools      = native2ascii serialver tools jconsole
-+
-+SUBDIRS_desktop    =
-+SUBDIRS_management =
-+SUBDIRS_misc       = rmi tracing
- SUBDIRS_tools      = native2ascii serialver tools jconsole
- 
- ifndef OPENJDK
-Only in openjdk-7/jdk/src/share/lib/security: nss.cfg

LibOS/shim/test/apps/python/scripts/test-http.py

@@ -1,6 +1,6 @@
 import urllib2
 
-request = urllib2.Request("http://google.com/")
+request = urllib2.Request("http://" + argv[1] + ":" + argv[2] + "/index.html")
 opener = urllib2.build_opener()
 response = opener.open(request, timeout=10)
 while True: