Merge "Import Jack and Jill Brest 1.1-a11"
diff --git a/tools/jack b/tools/jack
index 1390450..bfe20fb 100755
--- a/tools/jack
+++ b/tools/jack
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# v 1.1-a11
+#
set -o nounset
umask 077
@@ -57,6 +59,7 @@
#
if [ "$SERVER" != "true" ]; then
exec $JACK_VM_COMMAND -jar $JACK_JAR "$@"
+ echo "Cannot succeed to launch Jack" >&2
exit 255
fi
@@ -75,7 +78,7 @@
JACK_EXIT="$JACK_DIR/exit"
JACK_PWD="$PWD"
-mkdir "$SERVER_DIR" 2>/dev/null
+mkdir "$SERVER_DIR" 2>/dev/null
# Cleanup
trap 'rm -f "$JACK_OUT" "$JACK_ERR" "$JACK_CLI" "$JACK_EXIT" 2>/dev/null; rmdir "$JACK_DIR" 2>/dev/null' EXIT
@@ -89,7 +92,9 @@
touch "$JACK_CLI" "$JACK_EXIT"
# Try to cleanup if interrupted
-trap 'kill -9 $PID_OUT $PID_ERR 2>/dev/null; wait $PID_OUT $PID_ERR 2>/dev/null; exit 255' SIGHUP SIGINT SIGQUIT SIGTERM ERR
+abort () { kill -9 $PID_OUT $PID_ERR 2>/dev/null; wait $PID_OUT $PID_ERR 2>/dev/null; exit 255; }
+trap 'abort' SIGHUP SIGINT SIGQUIT SIGTERM ERR
+
# Redirect output and error
cat <"$JACK_OUT" >&1 &
PID_OUT=$!
@@ -103,17 +108,22 @@
done
echo >>"$JACK_CLI"
-set +o errexit
-trap ERR
-
#
# Launch the compilation
#
+set +o errexit
+trap ERR
+
+RETRY_LAUNCH=3
+RETRY_SESSION=3
+DELAY_CONNECT=3
+
+
# Launch compilation
-RETRY=3
+DATE_CONNECT=$(date +%s)
while true; do
- HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI")
+ HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --connect-timeout 5 --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI")
CURL_CODE=$?
JACK_CODE=$(cat "$JACK_EXIT")
if [ $CURL_CODE -eq 0 ]; then
@@ -121,39 +131,44 @@
break;
elif [ $CURL_CODE -eq 7 ]; then
# Failed to connect
- if [ $RETRY -eq 0 ]; then
- echo "Cannot launch background server"
- kill -QUIT $$
+ if [ $(date +%s) -ge $DATE_CONNECT ]; then
+ if [ $RETRY_LAUNCH -eq 0 ]; then
+ echo "Cannot launch background server" >&2
+ abort
+ else
+ let RETRY_LAUNCH=RETRY_LAUNCH-1
+ echo "Launching background server" $SERVER_PRG
+ $SERVER_PRG $SERVER_PORT_SERVICE $SERVER_PORT_ADMIN $SERVER_COUNT $SERVER_NB_COMPILE $SERVER_TIMEOUT >>$SERVER_LOG 2>&1 &
+ # New server, let's try a bit to connect
+ let DATE_CONNECT=$(date +%s)+$DELAY_CONNECT;
+ fi
else
- # Launch the server
- echo "Launching background server" $SERVER_PRG
- $SERVER_PRG $SERVER_PORT_SERVICE $SERVER_PORT_ADMIN $SERVER_COUNT $SERVER_NB_COMPILE $SERVER_TIMEOUT >>$SERVER_LOG 2>&1 &
- let RETRY=RETRY-1
- sleep 3
+ sleep 0.2 2>/dev/null
fi
+ # Trying with a new connection, let's retry session 3 times max
+ RETRY_SESSION=3
elif [ $CURL_CODE -eq 22 ]; then
- # Http code not OK, let's decode
+ # Http code not OK, let's decode and abort
if [ $HTTP_CODE -eq 401 ]; then
# 401: Unauthorized
- echo "Security problem, see server log" >&2
- kill -QUIT $$
+ echo "Security problem, see server log ($SERVER_LOG)" >&2
+ abort
elif [ $HTTP_CODE -eq 400 ]; then
# 400: Bad request
- echo "Bad request, see server log" >&2
- kill -QUIT $$
+ echo "Bad request, see server log ($SERVER_LOG)" >&2
+ abort
else
# Other
- echo "Internal unknown error, try other ports in ~/.jack, or see server log ($HTTP_CODE)" >&2
- kill -QUIT $$
+ echo "Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see server log ($SERVER_LOG)" >&2
+ abort
fi
else
- # In case of partial, timeout, empty, network error, let's retry
- if [ $RETRY -eq 0 ]; then
- echo "Communication error with server ($CURL_CODE)"
- kill -QUIT $$
+ # In case of partial, timeout, empty respond, network error, let's retry
+ if [ $RETRY_SESSION -eq 0 ]; then
+ echo "Communication error with server ($CURL_CODE)" >&2
+ abort
else
- let RETRY=RETRY-1
- sleep 1
+ let RETRY_SESSION=RETRY_SESSION-1
fi
fi
done
diff --git a/tools/jack-admin b/tools/jack-admin
new file mode 100755
index 0000000..a1bc7af
--- /dev/null
+++ b/tools/jack-admin
@@ -0,0 +1,164 @@
+#!/bin/bash
+#
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# v 1.1-a11
+#
+set -o nounset
+umask 077
+
+#
+# Settings
+#
+LOCAL_SETTING="$HOME/.jack"
+TMPDIR=${TMPDIR:=/tmp}
+SERVER_DIR=$TMPDIR/jack-$USER
+
+#
+# Load local settings
+#
+source "$LOCAL_SETTING" 2>/dev/null
+
+#
+# Create or update local settings if needed
+#
+if [[ ! -f "$LOCAL_SETTING" || $SETTING_VERSION -lt 2 ]]; then
+ echo "Writing local settings in" $LOCAL_SETTING
+ cat >"$LOCAL_SETTING.$$" <<-EOT
+ # Server settings
+ SERVER=${SERVER:=true}
+ SERVER_PORT_SERVICE=${SERVER_PORT_SERVICE:=8072}
+ SERVER_PORT_ADMIN=${SERVER_PORT_ADMIN:=8073}
+ SERVER_COUNT=${SERVER_COUNT:=1}
+ SERVER_NB_COMPILE=${SERVER_NB_COMPILE:=4}
+ SERVER_TIMEOUT=${SERVER_TIMEOUT:=60}
+ SERVER_LOG=\${SERVER_LOG:=\$SERVER_DIR/jack-\$SERVER_PORT_SERVICE.log}
+ JACK_VM_COMMAND=\${JACK_VM_COMMAND:=java}
+ # Internal, do not touch
+ SETTING_VERSION=2
+EOT
+ ln -f "$LOCAL_SETTING.$$" "$LOCAL_SETTING"
+ rm "$LOCAL_SETTING.$$"
+ source "$LOCAL_SETTING"
+fi
+
+#
+# Static setting
+#
+mkdir "$SERVER_DIR" 2>/dev/null
+
+#
+# Decoding argument
+#
+
+if [ $# -ne 1 ]
+then
+ echo "Usage : $0 [ start-server | stop-server | kill-server | list-server | server-log | server-stat ]"
+ exit 255
+fi
+
+case $1 in
+ stop-server)
+ echo "Stopping background server"
+ CMD="stop" ;;
+ server-stat)
+ echo "Getting statistic from background server"
+ CMD="stat" ;;
+ server-log)
+ echo "Log location of background server:"
+ echo $SERVER_LOG
+ exit 0 ;;
+ kill-server)
+ echo "Killing background server"
+ kill $(ps aux | grep JackSimpleServer | grep -v grep | awk '{print $2}')
+ exit $? ;;
+ list-server)
+ ps aux | grep JackSimpleServer | grep -v grep
+ exit $? ;;
+ start-server)
+ SERVER_PRG="$JACK_VM_COMMAND -cp $JACK_JAR com.android.jack.server.JackSimpleServer"
+ echo "Launching background server" $SERVER_PRG
+ $SERVER_PRG $SERVER_PORT_SERVICE $SERVER_PORT_ADMIN $SERVER_COUNT $SERVER_NB_COMPILE $SERVER_TIMEOUT >>$SERVER_LOG 2>&1 &
+ exit 0 ;;
+ *)
+ echo "Usage : $0 [ start-server | stop-server | kill-server | list-server | server-log | server-stat ]"
+ exit 255 ;;
+esac
+
+#
+# Send command
+#
+
+set +o errexit
+
+# Try to cleanup if interrupted
+# Cleanup
+JACK_EXIT="$SERVER_DIR/admin-$$"
+trap 'rm -f "$JACK_EXIT" 2>/dev/null;' EXIT
+
+RETRY_SESSION=3
+DELAY_CONNECT=3
+
+
+# Send command to Jack server
+DATE_CONNECT=$(date +%s)
+while true; do
+ HTTP_CODE=$(curl --fail --silent --output $JACK_EXIT --write-out %{http_code} --connect-timeout 5 --no-proxy 127.0.0.1:$SERVER_PORT_ADMIN http://127.0.0.1:$SERVER_PORT_ADMIN/$CMD)
+ CURL_CODE=$?
+ if [ $CURL_CODE -eq 0 ]; then
+ # No problem, let's go
+ break;
+ elif [ $CURL_CODE -eq 7 ]; then
+ # Failed to connect
+ if [ $(date +%s) -ge $DATE_CONNECT ]; then
+ echo "No Jack server running"
+ exit 255
+ else
+ sleep 0.2 2>/dev/null
+ fi
+ # Trying with a new connection, let's retry session 3 times max
+ RETRY_SESSION=3
+ elif [ $CURL_CODE -eq 22 ]; then
+ # Http code not OK, let's decode and abort
+ if [ $HTTP_CODE -eq 401 ]; then
+ # 401: Unauthorized
+ echo "Security problem, see server log" >&2
+ exit 255
+ elif [ $HTTP_CODE -eq 400 ]; then
+ # 400: Bad request
+ echo "Bad request, see server log" >&2
+ exit 255
+ else
+ # Other
+ echo "Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see server log" >&2
+ exit 255
+ fi
+ else
+ # In case of partial, timeout, empty respond, network error, let's retry
+ if [ $RETRY_SESSION -eq 0 ]; then
+ echo "Communication error with server ($CURL_CODE)" >&2
+ exit 255
+ else
+ let RETRY_SESSION=RETRY_SESSION-1
+ fi
+ fi
+done
+
+# Exit
+if [ -r $JACK_EXIT ]; then
+ cat <$JACK_EXIT 2>/dev/null
+fi
+
+exit 0
diff --git a/tools/jack-launcher.jar b/tools/jack-launcher.jar
new file mode 100644
index 0000000..fd0be2e
--- /dev/null
+++ b/tools/jack-launcher.jar
Binary files differ
diff --git a/tools/jack.jar b/tools/jack.jar
index 5d2b991..337a64c 100644
--- a/tools/jack.jar
+++ b/tools/jack.jar
Binary files differ
diff --git a/tools/jill.jar b/tools/jill.jar
index f4a0fab..a16ac47 100644
--- a/tools/jill.jar
+++ b/tools/jill.jar
Binary files differ