修改binder和sharedmemory传输界线，解决临界崩溃问题

zhanggaoming · zhanggaoming · commit 5823a437fd3f · 2024-05-12T14:11:59.000+08:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-6.5-bin.zip
diff --git a/ipc-app-test/src/main/java/com/demo/ipc/CommonActivity.kt b/ipc-app-test/src/main/java/com/demo/ipc/CommonActivity.kt
@@ -22,7 +22,7 @@ class CommonActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_common)
-        IpcManager.config(Config.builder().configDebug(true).build())
+        IpcManager.config(Config.builder().configDebug(true).configSharedMemoryCapacity(2*1024*1024).build())
         IpcManager.init(this)
         IpcManager.open("com.demo.ipcdemo") {
             runOnUiThread {
diff --git a/ipc-app-test/src/main/java/com/demo/ipc/InfoServiceManager.kt b/ipc-app-test/src/main/java/com/demo/ipc/InfoServiceManager.kt
@@ -71,15 +71,15 @@ object InfoServiceManager : InfoService {
     }
 
     override fun getBigByteArray(): ByteArray {
-        return ByteArray(800_000)
+        return ByteArray(258_000)
     }
 
     private var asyncBigByteArrayCallback:Result<ByteArray>?=null
 
     override fun asyncGetBigByteArray(callBack: Result<ByteArray>) {
         asyncBigByteArrayCallback=callBack
         thread {
-            asyncBigByteArrayCallback?.onData(ByteArray(1024*1024*2))
+            asyncBigByteArrayCallback?.onData(ByteArray(254_998))
         }
     }
 }
diff --git a/ipc-core/src/main/java/com/zclever/ipc/core/Bridge.kt b/ipc-core/src/main/java/com/zclever/ipc/core/Bridge.kt
@@ -5,7 +5,7 @@ import android.os.Process
 
 const val REQUEST_TYPE_CREATE = 1
 const val REQUEST_TYPE_INVOKE = 2
-const val BINDER_MAX_TRANSFORM_JSON_LENGTH = 520_000 //根据parcel序列化结合接口设计，最大能传输的json字符串长度
+const val BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE = 510_000 //根据parcel序列化结合接口设计，最大能传输的json字节数据长度
 
 /**
  * 请求对象
diff --git a/ipc-core/src/main/java/com/zclever/ipc/core/client/ServiceInvocationHandler.kt b/ipc-core/src/main/java/com/zclever/ipc/core/client/ServiceInvocationHandler.kt
@@ -46,17 +46,19 @@ internal class ServiceInvocationHandler(
 
                 val requestParamJson = GsonInstance.toJson(RequestParam(paramValueMap))
 
-                debugD("invoke requestParamJson length ->${requestParamJson.length}, content->$requestParamJson")
-
 
                 var requestBase = RequestBase(
                     targetClazzName = targetClazzName,
                     functionKey = kotlinFunction.signature(),
                     callbackKey = if (callbackInstance) signature else "",
                 )
 
+                val paramByteArray = requestParamJson.encodeToByteArray()
+
+                debugD("invoke requestParamJson byte size ->${paramByteArray.size}, content->$requestParamJson")
+
                 val response =
-                    if (requestParamJson.length < BINDER_MAX_TRANSFORM_JSON_LENGTH) {//binder传输
+                    if (paramByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {//binder传输
 
                         synchronized(ClientCache.serverResponseSharedMemory!!) {//确保同步
 
@@ -80,29 +82,26 @@ internal class ServiceInvocationHandler(
 
                     } else {//共享内存传输参数
 
-                        requestParamJson.encodeToByteArray().let { paramByteArray ->
+                        synchronized(ClientCache.serverResponseSharedMemory!!) { //保证同步
 
-                            synchronized(ClientCache.serverResponseSharedMemory!!) { //保证同步
+                            ClientCache.clientSharedMemory!!.writeByteArray(paramByteArray) //把utf-8编码的字节数组写入共享内存区域
 
-                                ClientCache.clientSharedMemory!!.writeByteArray(paramByteArray) //把utf-8编码的字节数组写入共享内存区域
+                            val responseStr = connector.connect(             //写完共享内存通知服务端读取
+                                GsonInstance.toJson(requestBase.createNoParameterRequest(
+                                    paramByteArray.size
+                                ).apply { requestBase = this }), null
+                            )
 
-                                val responseStr = connector.connect(             //写完共享内存通知服务端读取
-                                    GsonInstance.toJson(requestBase.createNoParameterRequest(
-                                        paramByteArray.size
-                                    ).apply { requestBase = this }), null
-                                )
+                            var responseObj = GsonInstance.fromJson<Response>(responseStr)
 
-                                var responseObj = GsonInstance.fromJson<Response>(responseStr)
-
-                                if (responseObj.dataStr.isNullOrEmpty()) {
-                                    Response(
-                                        ClientCache.serverResponseSharedMemory!!.readJsonStr(
-                                            responseObj.dataByteSize
-                                        )
-                                    )//服务端返回共享内存写入结果后，客户端再读
-                                } else {
-                                    responseObj
-                                }
+                            if (responseObj.dataStr.isNullOrEmpty()) {
+                                Response(
+                                    ClientCache.serverResponseSharedMemory!!.readJsonStr(
+                                        responseObj.dataByteSize
+                                    )
+                                )//服务端返回共享内存写入结果后，客户端再读
+                            } else {
+                                responseObj
                             }
                         }
                     }
diff --git a/ipc-core/src/main/java/com/zclever/ipc/core/server/ServerCallBack.kt b/ipc-core/src/main/java/com/zclever/ipc/core/server/ServerCallBack.kt
@@ -22,15 +22,17 @@ internal class ServerCallBack(
 
         val dataJson = GsonInstance.toJson(data)
 
-        debugD("onData: $callbackKey,-------${ServiceCache.remoteClients.getClientByPid(pid)}，size->${dataJson.length}")
+        val dataJsonByteArray=dataJson.encodeToByteArray()
 
-        if (dataJson.length < BINDER_MAX_TRANSFORM_JSON_LENGTH) {
+        debugD("onData: $callbackKey,-------${ServiceCache.remoteClients.getClientByPid(pid)}，size->${dataJsonByteArray.size}")
 
+        if (dataJsonByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {
+            debugD("onData use binder")
             ServiceCache.remoteClients.getClientByPid(pid)
                 ?.onReceive(GsonInstance.toJson(CallbackResponse(callbackKey, dataJson)))
 
         } else {
-
+            debugD("onData use shared memory")
             val sharedMemory = ServiceCache.serverCallbackMemoryMap[pid]!!
 
             synchronized(sharedMemory) {
@@ -39,7 +41,7 @@ internal class ServerCallBack(
                             CallbackResponse(
                                 callbackKey,
                                 null,
-                                dataJson.encodeToByteArray()
+                                dataJsonByteArray
                                     .also { sharedMemory.writeByteArray(it) }.size
                             )
                         )
diff --git a/ipc-core/src/main/java/com/zclever/ipc/core/server/ServiceCenter.kt b/ipc-core/src/main/java/com/zclever/ipc/core/server/ServiceCenter.kt
@@ -100,11 +100,13 @@ class ServiceCenter : Service() {
 
                     val resultJson = invokeResult.toJson()
 
+                    val resultByteArray = resultJson.encodeToByteArray()
 
-                    if (resultJson.length < BINDER_MAX_TRANSFORM_JSON_LENGTH) {
+                    if (resultByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {
+                        debugD("return use binder")
                         Response(resultJson).toJson()
                     } else {
-                        val resultByteArray = resultJson.encodeToByteArray()
+                        debugD("return use shared memory")
 
                         ServiceCache.serverResponseMemoryMap[requestBase.pid]!!.writeByteArray(resultByteArray)
 

Original file line number	Diff line number	Diff line change
`@@ -71,15 +71,15 @@ object InfoServiceManager : InfoService {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`override fun getBigByteArray(): ByteArray {`
`74`		`- return ByteArray(800_000)`
	`74`	`+ return ByteArray(258_000)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`private var asyncBigByteArrayCallback:Result<ByteArray>?=null`
`78`	`78`
`79`	`79`	`override fun asyncGetBigByteArray(callBack: Result<ByteArray>) {`
`80`	`80`	`asyncBigByteArrayCallback=callBack`
`81`	`81`	`thread {`
`82`		`- asyncBigByteArrayCallback?.onData(ByteArray(102410242))`
	`82`	`+ asyncBigByteArrayCallback?.onData(ByteArray(254_998))`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`