Commit 9965a71c authored by Max Lv's avatar Max Lv

Refine #594

parent 9e09e032
resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns) resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.18") addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.19")
resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
......
/* /*
* Shadowsocks - A shadowsocks client for Android * Shadowsocks - A shadowsocks client for Android
* Copyright (C) 2015 <max.c.lv@gmail.com> * Copyright (C) 2016 <max.c.lv@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -48,53 +48,45 @@ import java.util.concurrent.atomic.AtomicReference ...@@ -48,53 +48,45 @@ import java.util.concurrent.atomic.AtomicReference
import collection.JavaConversions._ import collection.JavaConversions._
object GuardedProcess { /**
private val TAG: String = classOf[GuardedProcess].getSimpleName * @author ayanamist@gmail.com
*/
class GuardedProcess (cmd: Seq[String], onRestartCallback: Runnable = null) extends Process {
@throws(classOf[IOException]) private val TAG = classOf[GuardedProcess].getSimpleName
private def startProcess(cmd: Seq[String]): Process = {
new ProcessBuilder(cmd).redirectErrorStream(true).start
}
}
class GuardedProcess extends Process { @volatile private var guardThread: Thread = null
private var guardThread: Thread = null @volatile private var isDestroyed: Boolean = false
@volatile @volatile private var process: Process = null
private var isDestroyed: Boolean = false
@volatile
private var process: Process = null
@throws(classOf[InterruptedException]) def start(): GuardedProcess = {
@throws(classOf[IOException])
def this(cmd: Seq[String], onRestartCallback: Runnable = null) { val atomicIoException = new AtomicReference[IOException](null)
this() val countDownLatch = new CountDownLatch(1)
initThread(cmd, onRestartCallback)
}
def initThread(cmd: Seq[String], onRestartCallback: Runnable): Unit = {
val atomicIoException: AtomicReference[IOException] = new AtomicReference[IOException](null)
val countDownLatch: CountDownLatch = new CountDownLatch(1)
guardThread = new Thread(new Runnable() { guardThread = new Thread(new Runnable() {
override def run(): Unit = { override def run() {
try { try {
while (!isDestroyed) { while (!isDestroyed) {
Log.i(GuardedProcess.TAG, "start process: " + cmd) Log.i(TAG, "start process: " + cmd)
val startTime: Long = java.lang.System.currentTimeMillis val startTime = java.lang.System.currentTimeMillis
process = GuardedProcess.startProcess(cmd)
process = new ProcessBuilder(cmd).redirectErrorStream(true).start
if (onRestartCallback != null && countDownLatch.getCount <= 0) { if (onRestartCallback != null && countDownLatch.getCount <= 0) {
onRestartCallback.run() onRestartCallback.run()
} }
countDownLatch.countDown() countDownLatch.countDown()
process.waitFor process.waitFor
if (java.lang.System.currentTimeMillis - startTime < 1000) { if (java.lang.System.currentTimeMillis - startTime < 1000) {
Log.w(GuardedProcess.TAG, "process exit too fast, stop guard: " + cmd) Log.w(TAG, "process exit too fast, stop guard: " + cmd)
return return
} }
} }
} } catch {
catch {
case ignored: InterruptedException => case ignored: InterruptedException =>
Log.i(GuardedProcess.TAG, "thread interrupt, destroy process: " + cmd) Log.i(TAG, "thread interrupt, destroy process: " + cmd)
process.destroy() process.destroy()
case e: IOException => case e: IOException =>
atomicIoException.compareAndSet(null, e) atomicIoException.compareAndSet(null, e)
...@@ -103,12 +95,16 @@ class GuardedProcess extends Process { ...@@ -103,12 +95,16 @@ class GuardedProcess extends Process {
} }
} }
}, "GuardThread-" + cmd) }, "GuardThread-" + cmd)
guardThread.start() guardThread.start()
countDownLatch.await() countDownLatch.await()
val ioException: IOException = atomicIoException.get val ioException: IOException = atomicIoException.get
if (ioException != null) { if (ioException != null) {
throw ioException throw ioException
} }
this
} }
def destroy() { def destroy() {
......
...@@ -196,7 +196,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -196,7 +196,7 @@ class ShadowsocksNatService extends BaseService {
} }
if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
sslocalProcess = new GuardedProcess(cmd) sslocalProcess = new GuardedProcess(cmd).start()
} }
def startTunnel() { def startTunnel() {
...@@ -222,7 +222,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -222,7 +222,7 @@ class ShadowsocksNatService extends BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
sstunnelProcess = new GuardedProcess(cmd) sstunnelProcess = new GuardedProcess(cmd).start()
} else { } else {
val conf = ConfigUtils val conf = ConfigUtils
...@@ -245,7 +245,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -245,7 +245,7 @@ class ShadowsocksNatService extends BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmdBuf.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmdBuf.mkString(" "))
sstunnelProcess = new GuardedProcess(cmdBuf) sstunnelProcess = new GuardedProcess(cmdBuf).start()
} }
} }
...@@ -268,7 +268,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -268,7 +268,7 @@ class ShadowsocksNatService extends BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmd) if (BuildConfig.DEBUG) Log.d(TAG, cmd)
pdnsdProcess = new GuardedProcess(cmd.split(" ").toSeq) pdnsdProcess = new GuardedProcess(cmd.split(" ").toSeq).start()
} }
def getVersionName: String = { def getVersionName: String = {
...@@ -292,7 +292,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -292,7 +292,7 @@ class ShadowsocksNatService extends BaseService {
}) })
if (BuildConfig.DEBUG) Log.d(TAG, cmd) if (BuildConfig.DEBUG) Log.d(TAG, cmd)
redsocksProcess = new GuardedProcess(cmd.split(" ").toSeq) redsocksProcess = new GuardedProcess(cmd.split(" ").toSeq).start()
} }
/** Called when the activity is first created. */ /** Called when the activity is first created. */
......
...@@ -296,7 +296,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -296,7 +296,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
sslocalProcess = new GuardedProcess(cmd) sslocalProcess = new GuardedProcess(cmd).start()
} }
def startDnsTunnel() = { def startDnsTunnel() = {
...@@ -321,7 +321,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -321,7 +321,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" ")) if (BuildConfig.DEBUG) Log.d(TAG, cmd.mkString(" "))
sstunnelProcess = new GuardedProcess(cmd) sstunnelProcess = new GuardedProcess(cmd).start()
} }
def startDnsDaemon() { def startDnsDaemon() {
...@@ -344,7 +344,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -344,7 +344,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if (BuildConfig.DEBUG) Log.d(TAG, cmd) if (BuildConfig.DEBUG) Log.d(TAG, cmd)
pdnsdProcess = new GuardedProcess(cmd.split(" ").toSeq) pdnsdProcess = new GuardedProcess(cmd.split(" ").toSeq).start()
} }
override def getContext = getBaseContext override def getContext = getBaseContext
...@@ -438,7 +438,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -438,7 +438,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override def run(): Unit = { override def run(): Unit = {
sendFd(fd) sendFd(fd)
} }
}) }).start()
fd fd
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment