From 526a6f13686bf1f1350a38ce6cd34f9453bdb347 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Fri, 10 Aug 2018 19:24:53 +0800 Subject: [PATCH 01/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 323d8430..13af865b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

[![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-2.2.4-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) +[![Release Version](https://img.shields.io/badge/release-2.3.4-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) From 6ec4cb1b123bc3321fc0a2d8261fb645456538f1 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Fri, 10 Aug 2018 19:25:16 +0800 Subject: [PATCH 02/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13af865b..e1dd3fb1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

[![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-2.3.4-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) +[![Release Version](https://img.shields.io/badge/release-2.3.0-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) From c0cb3d8c8f9aa69d023ddde0aecd4fcde6c704dd Mon Sep 17 00:00:00 2001 From: buyuntao Date: Mon, 20 Aug 2018 16:45:48 +0800 Subject: [PATCH 03/15] Update README_CN.md update version --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index 63bc3517..394e4c34 100644 --- a/README_CN.md +++ b/README_CN.md @@ -6,7 +6,7 @@ [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-2.2.4-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) +[![Release Version](https://img.shields.io/badge/release-2.3.0-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) From fd9522aa4580de6a98d58c6992094462914cb815 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Mon, 20 Aug 2018 16:56:23 +0800 Subject: [PATCH 04/15] Update readme Update readme --- README_CN.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README_CN.md b/README_CN.md index 394e4c34..2e18c4d3 100644 --- a/README_CN.md +++ b/README_CN.md @@ -57,6 +57,10 @@ RePlugin是一套完整的、稳定的、适合全面使用的，占坑类插件 让插件化能**飞入寻常应用家**，做到稳定、灵活、自由，大小项目兼用。 +## 最新特性 + +解决了Android P（Android 9.0）相关适配问题，全面支持Android P（Android 9.0）正式版。 + ## RePlugin 架构图

From d436f087056431158da5c5b981ec7a6eaec4549c Mon Sep 17 00:00:00 2001 From: buyuntao Date: Mon, 20 Aug 2018 17:00:18 +0800 Subject: [PATCH 05/15] Update readme Update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e1dd3fb1..ae2b9328 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,9 @@ At present, almost **all Apps with hundreds of millions users from 360, and many ## Our Vision Make RePlugin be used in all kinds of ordinary Apps; and provide stable, flexible, liberal plug-ins which adopt for both large and small projects. +## Our Vision +Solved the Android P (Android 9.0) related adaptation issues, fully support the official version of Android P (Android 9.0). + ## RePlugin Architecture

From 4d6737d67d92dd426ee5f82f83e25fb38b269d38 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Mon, 20 Aug 2018 17:01:32 +0800 Subject: [PATCH 06/15] Update readme Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae2b9328..fec0a688 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ At present, almost **all Apps with hundreds of millions users from 360, and many ## Our Vision Make RePlugin be used in all kinds of ordinary Apps; and provide stable, flexible, liberal plug-ins which adopt for both large and small projects. -## Our Vision +## Latest features Solved the Android P (Android 9.0) related adaptation issues, fully support the official version of Android P (Android 9.0). ## RePlugin Architecture From 007dab5fe5ec11c6ce3b28f6b465021d4888eeca Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 29 Aug 2018 14:25:43 +0800 Subject: [PATCH 07/15] update readme notice --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fec0a688..436bfeb3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) [![Release Version](https://img.shields.io/badge/release-2.3.0-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) - +## 活动通知 +移动技术最新活动通知：9月1号360移动技术开放日 http://t.cn/RDiNru9 ## RePlugin —— A flexible, stable, easy-to-use Android Plug-in Framework From 5da39dedf616c0b5b3593f90d43ec07eb53b25f6 Mon Sep 17 00:00:00 2001 From: YuTianTina Date: Fri, 12 Oct 2018 17:29:22 +0800 Subject: [PATCH 08/15] fix when jar does not exist in repacage then pass --- .../replugin/gradle/plugin/inner/ReClassTransform.groovy | 4 ++++ .../com/qihoo360/replugin/gradle/plugin/inner/Util.groovy | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/ReClassTransform.groovy b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/ReClassTransform.groovy index 2f257de6..be576dff 100644 --- a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/ReClassTransform.groovy +++ b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/ReClassTransform.groovy @@ -240,6 +240,10 @@ public class ReClassTransform extends Transform { jar = new File(jarPath) } + if(!jar.exists()){ + return + } + String destName = input.name def hexName = DigestUtils.md5Hex(jar.absolutePath) if (destName.endsWith('.jar')) { diff --git a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/Util.groovy b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/Util.groovy index ce7d506b..d833a68c 100644 --- a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/Util.groovy +++ b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/inner/Util.groovy @@ -128,7 +128,12 @@ public class Util { * 压缩 dirPath 到 zipFilePath */ def static zipDir(String dirPath, String zipFilePath) { - new AntBuilder().zip(destfile: zipFilePath, basedir: dirPath) + File dir = new File(dirPath) + if(dir.exists()){ + new AntBuilder().zip(destfile: zipFilePath, basedir: dirPath) + }else{ + println ">>> Zip file is empty! Ignore" + } } /** From e0c1552c50435c5e48cee172f485e7c20d2d8691 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:00:49 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E3=80=90buyuntao=E3=80=91Solve=20the=20A?= =?UTF-8?q?NR=20problem=20related=20to=20sendIntent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qihoo360/loader2/PluginProcessMain.java | 63 +++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java index 4751e567..23d290c2 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java @@ -479,7 +479,7 @@ static final IPluginClient probePluginClient(String plugin, int process, PluginB continue; } - /* 是否是用户自定义进程 */ + /* 是否是用户自定义进程 */ } else if (PluginProcessHost.isCustomPluginProcess(process)) { if (!TextUtils.equals(r.plugin, getProcessStringByIndex(process))) { continue; @@ -543,6 +543,7 @@ static final IPluginClient probePluginClientByPid(int pid, PluginBinderInfo info * @param intent */ static final void sendIntent2Process(String target, Intent intent, boolean sync) { + Map map = new HashMap<>(); synchronized (PROCESSES) { for (ProcessClientRecord r : ALL.values()) { if (target == null || target.length() <= 0) { @@ -555,20 +556,24 @@ static final void sendIntent2Process(String target, Intent intent, boolean sync) if (!isBinderAlive(r)) { continue; } + map.put(r.name, r); + } + } + + for (ProcessClientRecord r : map.values()) { + if (!isBinderAlive(r)) { + continue; + } + try { if (LOG) { LogDebug.d(PLUGIN_TAG, "sendIntent2Process name=" + r.name); } - try { - if (sync) { - r.client.sendIntentSync(intent); - } else { - r.client.sendIntent(intent); - } - } catch (Throwable e) { - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "s.i2pr e: n=" + r.name + ": " + e.getMessage(), e); - } + if (sync) { + r.client.sendIntentSync(intent); + } else { + r.client.sendIntent(intent); } + } catch (Throwable e) { } } } @@ -581,6 +586,7 @@ static final void sendIntent2Plugin(String target, Intent intent, boolean sync) if (target == null || target.length() <= 0) { return; } + Map map = new HashMap<>(); synchronized (PROCESSES) { for (ProcessClientRecord r : ALL.values()) { if (TextUtils.equals(r.plugin, target)) { @@ -591,16 +597,22 @@ static final void sendIntent2Plugin(String target, Intent intent, boolean sync) if (!isBinderAlive(r)) { continue; } - try { - if (sync) { - r.client.sendIntentSync(intent); - } else { - r.client.sendIntent(intent); - } - } catch (Throwable e) { - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "s.i2pl e: " + e.getMessage(), e); - } + map.put(r.name, r); + } + } + for (ProcessClientRecord r : map.values()) { + if (!isBinderAlive(r)) { + continue; + } + try { + if (sync) { + r.client.sendIntentSync(intent); + } else { + r.client.sendIntent(intent); + } + } catch (Throwable e) { + if (LOGR) { + LogRelease.e(PLUGIN_TAG, "s.i2pl e: " + e.getMessage(), e); } } } @@ -660,11 +672,11 @@ static final int sumActivities() { } /** - * @deprecated 待优化 - * 插件进程调度 * @param plugin * @param process * @return + * @deprecated 待优化 + * 插件进程调度 */ @Deprecated static final int allocProcess(String plugin, int process) { @@ -691,6 +703,7 @@ static final int allocProcess(String plugin, int process) { /** * 常驻进程调用 + * * @param pid * @param process * @param index @@ -863,9 +876,9 @@ private static final void handleBinderDied(ProcessClientRecord p, PluginManagerS } /** - * @deprecated 待优化 * @param plugin * @return + * @deprecated 待优化 */ @Deprecated private static final int allocProcessLocked(String plugin) { @@ -942,7 +955,7 @@ private static final int allocProcessLocked(String plugin) { LogDebug.d(PLUGIN_TAG, "alloc plugin process: found stoped plugin process: index=" + r.index); LogDebug.i(PLUGIN_TAG, "stoped st=" + r.state + " i=" + r.index + " orig.p=" + r.plugin); } - // 标记为分配状态 + // 标记为分配状态 r.allocate(plugin); // 确保进程为空 int pid = lookupPluginProcess(processes, r.index); From 18295e67842a9f1893a4f9c121c74a426448151f Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:05:41 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E3=80=90buyuntao=E3=80=91Optimize=20the?= =?UTF-8?q?=20logic=20of=20regReceivers=20in=20loadDex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/qihoo360/loader2/Loader.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/Loader.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/Loader.java index 518bc8e7..aa054aa3 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/Loader.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/Loader.java @@ -17,6 +17,7 @@ package com.qihoo360.loader2; import android.content.Context; +import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ComponentInfo; @@ -382,12 +383,18 @@ final boolean loadDex(ClassLoader parent, int load) { private void regReceivers() throws android.os.RemoteException { String plugin = mPluginObj.mInfo.getName(); + Map> map = ManifestParser.INS.getReceiverFilterMap(plugin); + + if (map == null || map.size() == 0) { + return; + } + if (mPluginHost == null) { mPluginHost = getPluginHost(); } if (mPluginHost != null) { - mPluginHost.regReceiver(plugin, ManifestParser.INS.getReceiverFilterMap(plugin)); + mPluginHost.regReceiver(plugin, map); } } From a72bc75c81d8ef8eea200f6aefb319491b78400d Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:14:51 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E3=80=90buyuntao=E3=80=91Fix=20broadcast?= =?UTF-8?q?=20duplicate=20registration=20issues,=20improve=20initializatio?= =?UTF-8?q?n=20and=20synchronization=20broadcast=20efficiency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qihoo360/loader2/PmBase.java | 65 ++++++++++--------- .../java/com/qihoo360/replugin/RePlugin.java | 7 ++ 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java index d5041940..9728c702 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java @@ -173,6 +173,34 @@ class PmBase { */ private static final byte[] LOCKER = new byte[0]; + /** + * 广播接收器，声明为成员变量以避免重复创建 + */ + private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + if (TextUtils.isEmpty(action)) { + return; + } + + if (action.equals(intent.getAction())) { + PluginInfo info = intent.getParcelableExtra("obj"); + if (info != null) { + switch (action) { + case ACTION_NEW_PLUGIN: + // 非常驻进程上下文 + newPluginFound(info, intent.getBooleanExtra(RePluginConstants.KEY_PERSIST_NEED_RESTART, false)); + break; + case ACTION_UNINSTALL_PLUGIN: + pluginUninstalled(info); + break; + } + } + } + } + }; + /** * 类映射 */ @@ -619,36 +647,15 @@ final void callAppCreate() { if (!IPC.isPersistentProcess()) { // 由于常驻进程已经在内部做了相关的处理，此处仅需要在UI进程注册并更新即可 - registerReceiverAction(ACTION_NEW_PLUGIN); - registerReceiverAction(ACTION_UNINSTALL_PLUGIN); - } - } - - /** - * @param action - */ - private final void registerReceiverAction(final String action) { - IntentFilter filter = new IntentFilter(action); - LocalBroadcastManager.getInstance(mContext).registerReceiver(new BroadcastReceiver() { - - @Override - public void onReceive(Context context, Intent intent) { - if (action.equals(intent.getAction())) { - PluginInfo info = intent.getParcelableExtra("obj"); - if (info != null) { - switch (action) { - case ACTION_NEW_PLUGIN: - // 非常驻进程上下文 - newPluginFound(info, intent.getBooleanExtra(RePluginConstants.KEY_PERSIST_NEED_RESTART, false)); - break; - case ACTION_UNINSTALL_PLUGIN: - pluginUninstalled(info); - break; - } - } - } + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction(ACTION_NEW_PLUGIN); + intentFilter.addAction(ACTION_UNINSTALL_PLUGIN); + try { + LocalBroadcastManager.getInstance(mContext).registerReceiver(mBroadcastReceiver, intentFilter); + } catch (Exception e) { + // } - }, filter); + } } /** diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePlugin.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePlugin.java index 888421dd..721449e7 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePlugin.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/replugin/RePlugin.java @@ -66,6 +66,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import static com.qihoo360.replugin.helper.LogDebug.LOG; @@ -915,6 +916,8 @@ public static class App { static boolean sAttached; + static AtomicBoolean sCreated = new AtomicBoolean(false); + /** * 当Application的attachBaseContext调用时需调用此方法

* 使用插件框架默认的方案 @@ -997,6 +1000,10 @@ public static void onCreate() { throw new IllegalStateException(); } + if (!sCreated.compareAndSet(false, true)) { + return; + } + Tasks.init(); PMF.callAppCreate(); From 8d15cb95f5c11cf3535cabf60590d5774aaa1b76 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:22:38 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E3=80=90hanyongbai=E3=80=91#Synchronize#?= =?UTF-8?q?=20Optimize=20Lock=20for=20read/write=20ALL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qihoo360/loader2/PluginProcessMain.java | 383 +++++++++++------- .../java/com/qihoo360/loader2/PmBase.java | 4 +- 2 files changed, 236 insertions(+), 151 deletions(-) diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java index 23d290c2..a01e1997 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java @@ -21,7 +21,9 @@ import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; +import android.support.annotation.NonNull; import android.text.TextUtils; +import android.util.Log; import com.qihoo360.i.IPluginManager; import com.qihoo360.mobilesafe.api.Tasks; @@ -44,6 +46,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.locks.ReentrantReadWriteLock; import static com.qihoo360.replugin.helper.LogDebug.LOG; import static com.qihoo360.replugin.helper.LogDebug.MAIN_TAG; @@ -55,6 +58,8 @@ */ public class PluginProcessMain { + public static final String TAG = PluginProcessMain.class.getSimpleName(); + private static final int STATE_UNUSED = 0; private static final int STATE_ALLOCATED = 1; @@ -90,6 +95,8 @@ public class PluginProcessMain { * processName -> ProcessClientRecord */ private static final Map ALL = new HashMap(); + // 因为大多数时间ALL都是读(写仅仅发生在进程开始和死亡)，因此每次使用都是独占锁本身就非常消耗性能。 + private static final ReentrantReadWriteLock PROCESS_CLIENT_LOCK = new ReentrantReadWriteLock(); static { for (int i = 0; i < Constant.STUB_PROCESS_COUNT; i++) { @@ -471,36 +478,39 @@ static final long getPersistentCookie() { * @param info * @return */ - static final IPluginClient probePluginClient(String plugin, int process, PluginBinderInfo info) { - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (process == IPluginManager.PROCESS_UI) { - if (!TextUtils.equals(r.plugin, Constant.PLUGIN_NAME_UI)) { - continue; - } + static final IPluginClient probePluginClient(final String plugin, final int process, final PluginBinderInfo info) { + return readProcessClientLock(new Action() { + @Override + public IPluginClient call() { + for (ProcessClientRecord r : ALL.values()) { + if (process == IPluginManager.PROCESS_UI) { + if (!TextUtils.equals(r.plugin, Constant.PLUGIN_NAME_UI)) { + continue; + } - /* 是否是用户自定义进程 */ - } else if (PluginProcessHost.isCustomPluginProcess(process)) { - if (!TextUtils.equals(r.plugin, getProcessStringByIndex(process))) { - continue; + /* 是否是用户自定义进程 */ + } else if (PluginProcessHost.isCustomPluginProcess(process)) { + if (!TextUtils.equals(r.plugin, getProcessStringByIndex(process))) { + continue; + } + } else { + if (!TextUtils.equals(r.plugin, plugin)) { + continue; + } } - } else { - if (!TextUtils.equals(r.plugin, plugin)) { - continue; + if (!isBinderAlive(r)) { + return null; } + if (!r.binder.pingBinder()) { + return null; + } + info.pid = r.pid; + info.index = r.index; + return r.client; } - if (!isBinderAlive(r)) { - return null; - } - if (!r.binder.pingBinder()) { - return null; - } - info.pid = r.pid; - info.index = r.index; - return r.client; + return null; } - } - return null; + }); } /** @@ -518,48 +528,54 @@ private static String getProcessStringByIndex(int index) { * @param info * @return */ - static final IPluginClient probePluginClientByPid(int pid, PluginBinderInfo info) { - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (r.pid != pid) { - continue; - } - if (!isBinderAlive(r)) { - return null; - } - if (!r.binder.pingBinder()) { - return null; + static final IPluginClient probePluginClientByPid(final int pid, final PluginBinderInfo info) { + return readProcessClientLock(new Action() { + @Override + public IPluginClient call() { + for (ProcessClientRecord r : ALL.values()) { + if (r.pid != pid) { + continue; + } + if (!isBinderAlive(r)) { + return null; + } + if (!r.binder.pingBinder()) { + return null; + } + info.pid = r.pid; + info.index = r.index; + return r.client; } - info.pid = r.pid; - info.index = r.index; - return r.client; + return null; } - } - return null; + }); } /** * @param target * @param intent */ - static final void sendIntent2Process(String target, Intent intent, boolean sync) { - Map map = new HashMap<>(); - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (target == null || target.length() <= 0) { - // 所有 - } else if (TextUtils.equals(r.name, target)) { - // 特定目标 - } else { - continue; - } - if (!isBinderAlive(r)) { - continue; + static final void sendIntent2Process(final String target, Intent intent, boolean sync) { + final Map map = readProcessClientLock(new Action>() { + @Override + public Map call() { + Map map = new HashMap<>(); + for (ProcessClientRecord r : ALL.values()) { + if (target == null || target.length() <= 0) { + // 所有 + } else if (TextUtils.equals(r.name, target)) { + // 特定目标 + } else { + continue; + } + if (!isBinderAlive(r)) { + continue; + } + map.put(r.name, r); } - map.put(r.name, r); + return map; } - } - + }); for (ProcessClientRecord r : map.values()) { if (!isBinderAlive(r)) { continue; @@ -579,27 +595,33 @@ static final void sendIntent2Process(String target, Intent intent, boolean sync) } /** + * TODO: 为何逻辑同：{@link #sendIntent2Process(String, Intent, boolean)}不一致? 即：target为空时此处不做操作，那里给所有进程发消息。 + * * @param target * @param intent */ - static final void sendIntent2Plugin(String target, Intent intent, boolean sync) { + static final void sendIntent2Plugin(final String target, Intent intent, boolean sync) { if (target == null || target.length() <= 0) { return; } - Map map = new HashMap<>(); - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (TextUtils.equals(r.plugin, target)) { - // 特定目标 - } else { - continue; - } - if (!isBinderAlive(r)) { - continue; + final Map map = readProcessClientLock(new Action>() { + @Override + public Map call() { + final Map map = new HashMap<>(1 << 4); + for (ProcessClientRecord r : ALL.values()) { + if (TextUtils.equals(r.plugin, target)) { + // 特定目标 + } else { + continue; + } + if (!isBinderAlive(r)) { + continue; + } + map.put(r.name, r); } - map.put(r.name, r); + return map; } - } + }); for (ProcessClientRecord r : map.values()) { if (!isBinderAlive(r)) { continue; @@ -622,16 +644,18 @@ static final void sendIntent2Plugin(String target, Intent intent, boolean sync) * @param name * @return */ - static final boolean isProcessAlive(String name) { - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (!TextUtils.equals(r.name, name)) { - continue; + static final boolean isProcessAlive(final String name) { + return readProcessClientLock(new Action() { + @Override + public Boolean call() { + for (ProcessClientRecord r : ALL.values()) { + if (TextUtils.equals(r.name, name)) { + return isBinderAlive(r); + } } - return isBinderAlive(r); + return false; } - } - return false; + }); } private static boolean isBinderAlive(ProcessClientRecord r) { @@ -648,27 +672,30 @@ private static boolean isBinderAlive(ProcessClientRecord r) { } static final int sumActivities() { - int sum = 0; - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (!isBinderAlive(r)) { - continue; - } - int rc = 0; - try { - rc = r.client.sumActivities(); - if (rc == -1) { - return -1; + return readProcessClientLock(new Action() { + @Override + public Integer call() { + int sum = 0; + for (ProcessClientRecord r : ALL.values()) { + if (!isBinderAlive(r)) { + continue; } - sum += rc; - } catch (Throwable e) { - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "ppm.sa e: " + e.getMessage(), e); + int rc = 0; + try { + rc = r.client.sumActivities(); + if (rc == -1) { + return -1; + } + sum += rc; + } catch (Throwable e) { + if (LOGR) { + LogRelease.e(PLUGIN_TAG, "ppm.sa e: " + e.getMessage(), e); + } } } + return sum; } - } - return sum; + }); } /** @@ -712,27 +739,32 @@ static final int allocProcess(String plugin, int process) { * @return */ static final String attachProcess(int pid, String process, int index, IBinder binder, IPluginClient client, String def, PluginManagerServer pms) { + final String plugin; synchronized (PROCESSES) { - String plugin = attachProcessLocked(pid, process, index, binder, client, def); - - ProcessClientRecord pr = new ProcessClientRecord(pms); - pr.name = process; - pr.plugin = plugin; - pr.pid = pid; - pr.index = index; - pr.binder = binder; - pr.client = client; - ALL.put(process, pr); - try { - pr.binder.linkToDeath(pr, 0); - } catch (Throwable e) { - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "ap l2d: " + e.getMessage(), e); - } + plugin = attachProcessLocked(pid, process, index, binder, client, def); + } + final ProcessClientRecord pr = new ProcessClientRecord(pms); + pr.name = process; + pr.plugin = plugin; + pr.pid = pid; + pr.index = index; + pr.binder = binder; + pr.client = client; + try { + pr.binder.linkToDeath(pr, 0); + } catch (Throwable e) { + if (LOGR) { + LogRelease.e(PLUGIN_TAG, "ap l2d: " + e.getMessage(), e); } - - return plugin; } + writeProcessClientLock(new Action() { + @Override + public Void call() { + ALL.put(pr.name, pr); + return null; + } + }); + return plugin; } /** @@ -824,55 +856,58 @@ static final void cancelPluginProcessLoop() { } // Added by Jiongxuan Zhang - static final int getPidByProcessName(String processName) { + static final int getPidByProcessName(final String processName) { // 获取的是常驻进程自己？直接返回 if (TextUtils.equals(processName, IPC.getCurrentProcessName())) { return IPC.getCurrentProcessId(); } // 在“进程列表”中寻找“线索” - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (!TextUtils.equals(r.name, processName)) { - continue; - } - if (!isBinderAlive(r)) { - continue; + return readProcessClientLock(new Action() { + @Override + public Integer call() { + for (ProcessClientRecord r : ALL.values()) { + if (!TextUtils.equals(r.name, processName)) { + continue; + } + if (!isBinderAlive(r)) { + continue; + } + return r.pid; } - return r.pid; + return -1; } - } - return -1; + }); } // Added by Jiongxuan Zhang - static final String getProcessNameByPid(int pid) { + static final String getProcessNameByPid(final int pid) { // 获取的是常驻进程自己？直接返回 if (pid == IPC.getCurrentProcessId()) { return IPC.getCurrentProcessName(); } - - synchronized (PROCESSES) { - for (ProcessClientRecord r : ALL.values()) { - if (r.pid != pid) { - continue; - } - if (!isBinderAlive(r)) { - continue; + return readProcessClientLock(new Action() { + @Override + public String call() { + for (ProcessClientRecord r : ALL.values()) { + if (r.pid != pid) { + continue; + } + if (!isBinderAlive(r)) { + continue; + } + return r.name; } - return r.name; + return null; } - } - return null; + }); } private static final void handleBinderDied(ProcessClientRecord p, PluginManagerServer pms) { if (LOG) { LogDebug.d(PLUGIN_TAG, "plugin process has died: plugin=" + p.plugin + " index=" + p.index + " pid=" + p.pid); } - synchronized (PROCESSES) { - handleBinderDiedLocked(p, pms); - } + handleBinderDiedLocked(p, pms); } /** @@ -1427,24 +1462,72 @@ private static final int lookupPluginProcess(List process return -1; } - private static final void handleBinderDiedLocked(ProcessClientRecord p, PluginManagerServer pms) { + private static final void handleBinderDiedLocked(final ProcessClientRecord p, final PluginManagerServer pms) { // TODO 优化 - for (ProcessClientRecord r : ALL.values()) { - if (r == p) { - ALL.remove(r.name); - break; + writeProcessClientLock(new Action() { + @Override + public Void call() { + for (ProcessClientRecord r : ALL.values()) { + if (r == p) { //20180911:防止因为同一进程重启后导致将新的record给删了? + ALL.remove(r.name); + break; + } + } + return null; } - } + }); - // TODO 优化 - for (ProcessRecord r : PROCESSES) { - if (r.binder == p.binder) { - r.setStoped(); - break; + synchronized (PROCESSES) { + // TODO 优化 + for (ProcessRecord r : PROCESSES) { + if (r.binder == p.binder) { + r.setStoped(); + break; + } } } // 通知 PluginManagerServer 客户端进程链接已断开 pms.onClientProcessKilled(p.name); } + + /// + + private static T writeProcessClientLock(@NonNull final Action action) { + final long start = System.currentTimeMillis(); +// final String stack = OptUtil.stack2Str(Thread.currentThread().getStackTrace()[3]); + try { + PROCESS_CLIENT_LOCK.writeLock().lock(); + if (LogDebug.LOG) { + Log.d(TAG, String.format("%s(%sms@%s) WRITING", Thread.currentThread().getStackTrace()[3], System.currentTimeMillis() - start, Thread.currentThread())); + } + return action.call(); + } finally { + PROCESS_CLIENT_LOCK.writeLock().unlock(); + if (LogDebug.LOG) { + Log.d(TAG, String.format("%s(%sms@%s) WRITING DONE", Thread.currentThread().getStackTrace()[3], System.currentTimeMillis() - start, Thread.currentThread())); + } + } + } + + private static T readProcessClientLock(@NonNull final Action action) { + final long start = System.currentTimeMillis(); +// final String stack = OptUtil.stack2Str(Thread.currentThread().getStackTrace()[3]); + try { + PROCESS_CLIENT_LOCK.readLock().lock(); + if (LogDebug.LOG) { + Log.d(TAG, String.format("%s(%sms@%s) READING", Thread.currentThread().getStackTrace()[3], System.currentTimeMillis() - start, Thread.currentThread())); + } + return action.call(); + } finally { + PROCESS_CLIENT_LOCK.readLock().unlock(); + if (LogDebug.LOG) { + Log.d(TAG, String.format("%s(%sms@%s) READING DONE", Thread.currentThread().getStackTrace()[3], System.currentTimeMillis() - start, Thread.currentThread())); + } + } + } + + private interface Action { + T call(); + } } diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java index 9728c702..67b3ed66 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java @@ -653,7 +653,9 @@ final void callAppCreate() { try { LocalBroadcastManager.getInstance(mContext).registerReceiver(mBroadcastReceiver, intentFilter); } catch (Exception e) { - // + if (LOGR) { + LogRelease.e(PLUGIN_TAG, "p m hlc a r e: " + e.getMessage(), e); + } } } } From bdcb90d8b3427c50d6f48617b3f42e16a010a488 Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:34:27 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E3=80=90buyuntao=E3=80=91Split=20and=20o?= =?UTF-8?q?ptimize=20the=20logic=20related=20to=20the=20pit=20process,=20a?= =?UTF-8?q?nd=20the=20process=20allocates=20relevant=20lock=20optimization?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qihoo360/loader2/PluginProcessMain.java | 913 ++---------------- .../java/com/qihoo360/loader2/PmBase.java | 6 +- .../qihoo360/loader2/StubProcessManager.java | 544 +++++++++++ 3 files changed, 635 insertions(+), 828 deletions(-) create mode 100644 replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java index a01e1997..c1ade55c 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PluginProcessMain.java @@ -16,7 +16,6 @@ package com.qihoo360.loader2; -import android.app.ActivityManager.RunningAppProcessInfo; import android.content.Context; import android.content.Intent; import android.os.IBinder; @@ -26,9 +25,6 @@ import android.util.Log; import com.qihoo360.i.IPluginManager; -import com.qihoo360.mobilesafe.api.Tasks; -import com.qihoo360.replugin.RePluginInternal; -import com.qihoo360.replugin.base.AMSUtils; import com.qihoo360.replugin.base.IPC; import com.qihoo360.replugin.component.process.PluginProcessHost; import com.qihoo360.replugin.helper.LogDebug; @@ -54,183 +50,66 @@ import static com.qihoo360.replugin.helper.LogRelease.LOGR; /** + * 进程管理类 * @author RePlugin Team */ public class PluginProcessMain { public static final String TAG = PluginProcessMain.class.getSimpleName(); - - private static final int STATE_UNUSED = 0; - - private static final int STATE_ALLOCATED = 1; - - private static final int STATE_RUNNING = 2; - -// private static final int STATE_MARKED = 3; - - private static final int STATE_STOPED = 4; - /** - * + * 常驻进程使用，非常驻进程为null buyuntao */ private static IPluginHost sPluginHostLocal; /** - * + * 非常驻进程使用，常驻进程为null，用于非常驻进程连接常驻进程 buyuntao */ private static IPluginHost sPluginHostRemote; - /** - * + * 提供binder保存功能，无其他逻辑 */ static HashMap sBinders = new HashMap(); - - /** - * TODO 待重构 PROCESSES & ALL - */ - private static final ProcessRecord PROCESSES[] = new ProcessRecord[Constant.STUB_PROCESS_COUNT]; - /** - * TODO 待重构 PROCESSES & ALL - * processName -> ProcessClientRecord + * 当前运行的所有进程的列表（常驻进程除外） */ private static final Map ALL = new HashMap(); - // 因为大多数时间ALL都是读(写仅仅发生在进程开始和死亡)，因此每次使用都是独占锁本身就非常消耗性能。 - private static final ReentrantReadWriteLock PROCESS_CLIENT_LOCK = new ReentrantReadWriteLock(); - - static { - for (int i = 0; i < Constant.STUB_PROCESS_COUNT; i++) { - ProcessRecord r = new ProcessRecord(i, STATE_UNUSED); - PROCESSES[i] = r; - } - } - /** - * + * ALL的读写锁，用于并发时的性能提升 */ + private static final ReentrantReadWriteLock PROCESS_CLIENT_LOCK = new ReentrantReadWriteLock(); private static final Object COOKIE_LOCK = new Object(); - - /** - * - */ private static boolean sPersisistCookieInitialized; - /** * 常驻进程cookie，用来控制卫士进程组是否需要退出等 */ private static long sPersisistCookie; - static final int CHECK_STAGE1_DELAY = 17 * 1000; - - private static final int CHECK_STAGE2_DELAY = 11 * 1000; - - private static final int CHECK_STAGE3_DELAY = 3 * 1000; - - private static final Runnable CHECK = new Runnable() { - - @Override - public void run() { - doPluginProcessLoop(); - } - }; - - private static final class ProcessRecord { - - final int index; - - int state; - - long mobified; - - String plugin; - - int pid; - - IBinder binder; - - IPluginClient client; - - int activities; - - int services; - - int binders; - - ProcessRecord(int index, int state) { - this.index = index; - this.state = state; - } - - void allocate(String plugin) { - this.state = STATE_ALLOCATED; - this.mobified = System.currentTimeMillis(); - this.plugin = plugin; - this.pid = 0; - this.binder = null; - this.client = null; - this.activities = 0; - this.services = 0; - this.binders = 0; - } - - void setRunning(int pid) { - this.state = STATE_RUNNING; - this.pid = pid; - } - - void setClient(IBinder binder, IPluginClient client) { - this.binder = binder; - this.client = client; - } - -// void setMarked() { -// this.state = STATE_MARKED; -// } - - void setStoped() { - this.state = STATE_STOPED; - this.pid = 0; - this.binder = null; - this.client = null; - } - - @Override - public String toString() { - if (LOG) { - return super.toString() + " {index=" + index + " state=" + state + " mobified=" + mobified + " plugin=" + plugin + " pid=" + pid + " binder=" + binder + " client=" + client - + " activities=" + activities + " services=" + services + " binders=" + binders + "}"; - } - return super.toString(); - } - } - /** - * 常驻进程使用 + * 进程记录，用于进程及进程列表管理 buyuntao */ private static final class ProcessClientRecord implements IBinder.DeathRecipient { - String name; - + String name; //进程名称 String plugin; - int pid; - int index; - IBinder binder; - IPluginClient client; + PluginManagerServer pluginManager; //单个进程的插件管理类 - private final PluginManagerServer mManagerServer; - - // FIXME 不建议这么传递，但为了在死亡周期中使用，不得已而为之 - public ProcessClientRecord(PluginManagerServer pms) { - mManagerServer = pms; + public ProcessClientRecord(String process, String plugin, int pid, int index, IBinder binder, IPluginClient client, PluginManagerServer pms) { + this.name = process; + this.plugin = plugin; + this.pid = pid; + this.index = index; + this.binder = binder; + this.client = client; + this.pluginManager = pms; } @Override public void binderDied() { - handleBinderDied(this, mManagerServer); + handleBinderDied(this); } @Override @@ -245,18 +124,6 @@ public IPluginClient getClient() { return client; } } - - static final void reportStatus() { - for (ProcessRecord r : PROCESSES) { - if (r.binder == null) { - continue; - } - if (LOG) { - LogDebug.i(PLUGIN_TAG, "i=" + r.index + " p=" + r.plugin + " a=" + r.activities + " s=" + r.services + " b=" + r.binders); - } - } - } - static final String dump() { // 1.dump Activity映射表, service列表 @@ -331,10 +198,7 @@ static final void dump(FileDescriptor fd, PrintWriter writer, String[] args) { writer.println(r); } writer.println(); - writer.println("--- PROCESSES.length = " + PROCESSES.length + " ---"); - for (ProcessRecord r : PROCESSES) { - writer.println(r); - } + StubProcessManager.dump(writer); writer.println(); // writer.println("--- USED_PLUGINS.size = " + USED_PLUGINS.size() + " ---"); // for (ProcessPluginInfo r : USED_PLUGINS.values()) { @@ -367,8 +231,6 @@ static final void installHost(IPluginHost host) { */ static final void connectToHostSvc() { Context context = PMF.getApplicationContext(); - - // IBinder binder = PluginProviderStub.proxyFetchHostBinder(context); if (LOG) { LogDebug.d(PLUGIN_TAG, "host binder = " + binder); @@ -380,11 +242,8 @@ static final void connectToHostSvc() { } System.exit(1); } - - // try { binder.linkToDeath(new IBinder.DeathRecipient() { - @Override public void binderDied() { if (LOGR) { @@ -437,8 +296,11 @@ public void binderDied() { // 注册该进程信息到“插件管理进程”中 PMF.sPluginMgr.attach(); } - - // @hide 内部框架使用 + /** + * sPluginHostLocal 常驻进程使用，非常驻进程为null buyuntao + * sPluginHostRemote 非常驻进程使用，常驻进程为null，用于非常驻进程连接常驻进程 buyuntao + * @hide 内部框架使用 + */ public static final IPluginHost getPluginHost() { if (sPluginHostLocal != null) { return sPluginHostLocal; @@ -552,6 +414,7 @@ public IPluginClient call() { } /** + * 发送intent给进程 buyuntao * @param target * @param intent */ @@ -561,47 +424,28 @@ static final void sendIntent2Process(final String target, Intent intent, boolean public Map call() { Map map = new HashMap<>(); for (ProcessClientRecord r : ALL.values()) { - if (target == null || target.length() <= 0) { + if (TextUtils.isEmpty(target)) { // 所有 } else if (TextUtils.equals(r.name, target)) { // 特定目标 } else { continue; } - if (!isBinderAlive(r)) { - continue; - } map.put(r.name, r); } return map; } }); - for (ProcessClientRecord r : map.values()) { - if (!isBinderAlive(r)) { - continue; - } - try { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "sendIntent2Process name=" + r.name); - } - if (sync) { - r.client.sendIntentSync(intent); - } else { - r.client.sendIntent(intent); - } - } catch (Throwable e) { - } - } + sendIntent2Client(map, intent, sync); } /** - * TODO: 为何逻辑同：{@link #sendIntent2Process(String, Intent, boolean)}不一致? 即：target为空时此处不做操作，那里给所有进程发消息。 - * + * 发送intent给指定插件 buyuntao * @param target * @param intent */ static final void sendIntent2Plugin(final String target, Intent intent, boolean sync) { - if (target == null || target.length() <= 0) { + if (TextUtils.isEmpty(target)) { return; } final Map map = readProcessClientLock(new Action>() { @@ -614,14 +458,19 @@ public Map call() { } else { continue; } - if (!isBinderAlive(r)) { - continue; - } map.put(r.name, r); } return map; } }); + sendIntent2Client(map, intent, sync); + } + /** + * 发送intent给进程Client buyuntao + * @param map + * @param intent + */ + private static void sendIntent2Client(Map map, Intent intent, boolean sync){ for (ProcessClientRecord r : map.values()) { if (!isBinderAlive(r)) { continue; @@ -634,41 +483,32 @@ public Map call() { } } catch (Throwable e) { if (LOGR) { - LogRelease.e(PLUGIN_TAG, "s.i2pl e: " + e.getMessage(), e); + LogRelease.e(PLUGIN_TAG, "p.p sic e: " + e.getMessage(), e); } } } } /** + * 判断进程是否存活 buyuntao * @param name * @return */ static final boolean isProcessAlive(final String name) { + if (TextUtils.isEmpty(name)){ + return false; + } return readProcessClientLock(new Action() { @Override public Boolean call() { - for (ProcessClientRecord r : ALL.values()) { - if (TextUtils.equals(r.name, name)) { - return isBinderAlive(r); - } - } - return false; + ProcessClientRecord r = ALL.get(name); + return isBinderAlive(r); } }); } private static boolean isBinderAlive(ProcessClientRecord r) { - if (r == null) { - return false; - } - if (r.binder == null || r.client == null) { - return false; - } - if (!r.binder.isBinderAlive()) { - return false; - } - return true; + return r != null && r.binder != null && r.client != null && r.binder.isBinderAlive(); } static final int sumActivities() { @@ -722,34 +562,22 @@ static final int allocProcess(String plugin, int process) { } return IPluginManager.PROCESS_AUTO; } + return StubProcessManager.allocProcess(plugin); - synchronized (PROCESSES) { - return allocProcessLocked(plugin); - } } /** - * 常驻进程调用 - * + * 常驻进程调用,添加进程信息到进程管理列表 * @param pid * @param process * @param index * @param binder * @param client - * @return + * @return 进程的默认插件名称（非框架内的进程返回null） */ static final String attachProcess(int pid, String process, int index, IBinder binder, IPluginClient client, String def, PluginManagerServer pms) { - final String plugin; - synchronized (PROCESSES) { - plugin = attachProcessLocked(pid, process, index, binder, client, def); - } - final ProcessClientRecord pr = new ProcessClientRecord(pms); - pr.name = process; - pr.plugin = plugin; - pr.pid = pid; - pr.index = index; - pr.binder = binder; - pr.client = client; + final String plugin = getDefaultPluginName(pid, index, binder, client, def); + final ProcessClientRecord pr = new ProcessClientRecord(process, plugin, pid, index, binder, client, pms); try { pr.binder.linkToDeath(pr, 0); } catch (Throwable e) { @@ -776,9 +604,7 @@ public Void call() { * @return */ static final boolean attachActivity(int pid, int index, String plugin, String activity, String container) { - synchronized (PROCESSES) { - return regActivityLocked(pid, index, plugin, activity, container); - } + return StubProcessManager.attachActivity(pid, index, plugin, activity, container); } /** @@ -790,9 +616,7 @@ static final boolean attachActivity(int pid, int index, String plugin, String ac * @return */ static final boolean detachActivity(int pid, int index, String plugin, String activity, String container) { - synchronized (PROCESSES) { - return unregActivityLocked(pid, index, plugin, activity, container); - } + return StubProcessManager.detachActivity(pid, index, plugin, activity, container); } /** @@ -803,9 +627,7 @@ static final boolean detachActivity(int pid, int index, String plugin, String ac * @return */ static final boolean attachService(int pid, int index, String plugin, String service) { - synchronized (PROCESSES) { - return regServiceLocked(pid, index, plugin, service); - } + return StubProcessManager.attachService(pid, index, plugin, service); } /** @@ -816,63 +638,36 @@ static final boolean attachService(int pid, int index, String plugin, String ser * @return */ static final boolean detachService(int pid, int index, String plugin, String service) { - synchronized (PROCESSES) { - return unregServiceLocked(pid, index, plugin, service); - } + return StubProcessManager.detachService(pid, index, plugin, service); } static final void attachBinder(int pid, IBinder binder) { - synchronized (PROCESSES) { - regBinderLocked(pid, binder); - } + StubProcessManager.attachBinder(pid, binder); } static final void detachBinder(int pid, IBinder binder) { - synchronized (PROCESSES) { - unregBinderLocked(pid, binder); - } + StubProcessManager.detachBinder(pid, binder); } static final int sumBinders(int index) { - synchronized (PROCESSES) { - return sumBindersLocked(index); - } + return StubProcessManager.sumBinders(index); } - static final void schedulePluginProcessLoop(long delayMillis) { - if (Constant.SIMPLE_QUIT_CONTROLLER) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "schedule plugin process quit check: delay=" + (delayMillis / 1000)); - } - Tasks.cancelThreadTask(CHECK); - Tasks.postDelayed2Thread(CHECK, delayMillis); - } - } - - static final void cancelPluginProcessLoop() { - if (Constant.SIMPLE_QUIT_CONTROLLER) { - Tasks.cancelThreadTask(CHECK); - } - } - - // Added by Jiongxuan Zhang + //change by buyuntao static final int getPidByProcessName(final String processName) { + if (TextUtils.isEmpty(processName)){ + return -1; + } // 获取的是常驻进程自己？直接返回 if (TextUtils.equals(processName, IPC.getCurrentProcessName())) { return IPC.getCurrentProcessId(); } - // 在“进程列表”中寻找“线索” return readProcessClientLock(new Action() { @Override public Integer call() { - for (ProcessClientRecord r : ALL.values()) { - if (!TextUtils.equals(r.name, processName)) { - continue; - } - if (!isBinderAlive(r)) { - continue; - } + ProcessClientRecord r = ALL.get(processName); + if (r != null && isBinderAlive(r)) { return r.pid; } return -1; @@ -903,592 +698,60 @@ public String call() { }); } - private static final void handleBinderDied(ProcessClientRecord p, PluginManagerServer pms) { + private static final void handleBinderDied(ProcessClientRecord p) { if (LOG) { LogDebug.d(PLUGIN_TAG, "plugin process has died: plugin=" + p.plugin + " index=" + p.index + " pid=" + p.pid); } - handleBinderDiedLocked(p, pms); + handleBinderDiedLocked(p); } /** - * @param plugin + * 获取进程的默认插件名 + * @param pid + * @param index + * @param binder + * @param client + * @param def * @return - * @deprecated 待优化 */ - @Deprecated - private static final int allocProcessLocked(String plugin) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: plugin=" + plugin); - } - - // 取运行列表 - List processes = AMSUtils.getRunningAppProcessesNoThrows(RePluginInternal.getAppContext()); - - // 取运行列表失败，则直接返回失败 - if (processes == null || processes.isEmpty()) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: get running processes is empty"); - LogDebug.i(PLUGIN_TAG, "get list exception p=" + plugin); - } - return IPluginManager.PROCESS_AUTO; - } - - updateListLocked(processes); - - // 找一个插件可能用过的进程 - for (ProcessRecord r : PROCESSES) { - if (TextUtils.equals(plugin, r.plugin)) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: found saved plugin process: index=" + r.index + " p=" + plugin); - } - // 标记为分配状态 - if (r.state == STATE_UNUSED || r.state == STATE_STOPED) { - r.allocate(plugin); - // 确保进程为空 - int pid = lookupPluginProcess(processes, r.index); - if (pid > 0) { - if (LOGR) { - LogRelease.i(PLUGIN_TAG, "ppr k i: " + pid); - } - android.os.Process.killProcess(pid); - waitKilled(pid); - } - } - if (LOG) { - LogDebug.i(PLUGIN_TAG, "used st=" + r.state + " i=" + r.index + " p=" + plugin); - } - return r.index; - } - } - - // 没有找到，则找一个空闲的 - for (ProcessRecord r : PROCESSES) { - if (r.state == STATE_UNUSED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: found unused plugin process: index=" + r.index); - LogDebug.i(PLUGIN_TAG, "free st=" + r.state + " i=" + r.index + " p=" + plugin + " orig.p=" + r.plugin); - } - // 标记为分配状态 - r.allocate(plugin); - // 确保进程为空 - int pid = lookupPluginProcess(processes, r.index); - if (pid > 0) { - if (LOGR) { - LogRelease.i(PLUGIN_TAG, "ppr k i: " + pid); - } - android.os.Process.killProcess(pid); - waitKilled(pid); - } - return r.index; - } - } - - // 没有找到，则找一个停止的 - for (ProcessRecord r : PROCESSES) { - if (r.state == STATE_STOPED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: found stoped plugin process: index=" + r.index); - LogDebug.i(PLUGIN_TAG, "stoped st=" + r.state + " i=" + r.index + " orig.p=" + r.plugin); - } - // 标记为分配状态 - r.allocate(plugin); - // 确保进程为空 - int pid = lookupPluginProcess(processes, r.index); - if (pid > 0) { - if (LOGR) { - LogRelease.i(PLUGIN_TAG, "ppr k i: " + pid); - } - android.os.Process.killProcess(pid); - waitKilled(pid); - } - return r.index; - } - } - - // 分配之后，一定时间如果没被使用，则需要回收 - // 没有找到，则找一个最早分配中的，且分配了很久的 - { - int i = -1; - long mod = Long.MAX_VALUE; - for (ProcessRecord r : PROCESSES) { - if (r.state != STATE_ALLOCATED) { - continue; - } - if (r.mobified < mod) { - i = r.index; - mod = r.mobified; - } - } - if (i >= 0 && (System.currentTimeMillis() - mod > 10 * 1000)) { - ProcessRecord r = PROCESSES[i]; - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: plugin processes maybe busy, reuse process which allocating and expired: index=" + r.index); - LogDebug.i(PLUGIN_TAG, "force maybe st=" + r.state + " i=" + r.index + " orig.p=" + r.plugin); - } - // - r.setStoped(); - // - r.allocate(plugin); - // 确保进程为空 - int pid = lookupPluginProcess(processes, r.index); - if (pid > 0) { - if (LOGR) { - LogRelease.i(PLUGIN_TAG, "ppr k i: " + pid); - } - android.os.Process.killProcess(pid); - waitKilled(pid); - } - return r.index; - } - } - - // 没有找到，则找一个最先分配的组件为空的 - { - int i = -1; - long mod = Long.MAX_VALUE; - for (ProcessRecord r : PROCESSES) { - if (r.activities > 0) { - continue; - } - if (r.services > 0) { - continue; - } - if (r.binders > 0) { - continue; - } - if (r.mobified < mod) { - i = r.index; - mod = r.mobified; - } - } - if (i >= 0) { - ProcessRecord r = PROCESSES[i]; - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: plugin processes busy, reuse process which components is empty: index=" + r.index); - } - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "ppr r & k i: " + r.pid); - LogRelease.i(PLUGIN_TAG, "force empty st=" + r.state + " i=" + r.index + " orig.p=" + r.plugin); - } - // - android.os.Process.killProcess(r.pid); - waitKilled(r.pid); - // - r.setStoped(); - // - r.allocate(plugin); - return r.index; - } - } - - // 还没有找到，则强制终止一个最先分配的 - { - int i = 0; - long mod = Long.MAX_VALUE; - for (ProcessRecord r : PROCESSES) { - if (r.mobified < mod) { - i = r.index; - mod = r.mobified; - } - } - // - ProcessRecord r = PROCESSES[i]; - if (LOG) { - LogDebug.d(PLUGIN_TAG, "alloc plugin process: plugin processes busy, reuse process which earliest allocated: index=" + r.index); - } - if (LOGR) { - LogRelease.e(PLUGIN_TAG, "ppr r & k i: " + r.pid); - LogRelease.i(PLUGIN_TAG, "force earliest st=" + r.state + " i=" + r.index + " orig.p=" + r.plugin); - } - // - android.os.Process.killProcess(r.pid); - waitKilled(r.pid); - // - r.setStoped(); - // - r.allocate(plugin); - return r.index; - } - } - - private static final String attachProcessLocked(int pid, String process, int index, IBinder binder, IPluginClient client, String def) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "attach process: pid=" + pid + " index=" + index + " binder=" + client); - } - + private static final String getDefaultPluginName(int pid, int index, IBinder binder, IPluginClient client, String def) { if (index == IPluginManager.PROCESS_UI) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "attach process: ui"); - } return Constant.PLUGIN_NAME_UI; } - /* 是否是用户自定义进程 */ if (PluginProcessHost.isCustomPluginProcess(index)) { return getProcessStringByIndex(index); } - - if (!PluginManager.isPluginProcess(index)) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "attach process: invalid index=" + index); - } - return null; - } - - // 检测状态是否一致 - ProcessRecord r = PROCESSES[index]; - if (!TextUtils.isEmpty(def)) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "attach process: allocate now"); - } - r.allocate(def); + if (PluginManager.isPluginProcess(index)) { + return StubProcessManager.attachStubProcess(pid, index, binder, client, def); } - - if (r.state != STATE_ALLOCATED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "attach process: state not allocated: state=" + r.state); - } - return null; - } - - r.setRunning(pid); - r.setClient(binder, client); - - return r.plugin; - } - - private static final boolean regActivityLocked(int pid, int index, String plugin, String activity, String container) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "reg activity: pid=" + pid + " index=" + index + " plugin=" + plugin + " activity=" + activity + " container=" + container); - } - - if (index < 0 || index >= PROCESSES.length) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "reg activity: invalid index=" + index); - } - return false; - } - - ProcessRecord r = PROCESSES[index]; - r.activities++; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - - cancelPluginProcessLoop(); - - return true; - } - - private static final boolean unregActivityLocked(int pid, int index, String plugin, String activity, String container) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "unreg activity: pid=" + pid + " index=" + index + " plugin=" + plugin + " activity=" + activity + " container=" + container); - } - - if (index < 0 || index >= PROCESSES.length) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "unreg activity: invalid index=" + index); - } - return false; - } - - ProcessRecord r = PROCESSES[index]; - r.activities--; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - - schedulePluginProcessLoop(CHECK_STAGE2_DELAY); - - return true; + return null; } - private static final boolean regServiceLocked(int pid, int index, String plugin, String service) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "reg service: pid=" + pid + " index=" + index + " plugin=" + plugin + " service=" + service); - } - if (index < 0 || index >= PROCESSES.length) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "reg service: invalid index=" + index); - } - return false; - } - - ProcessRecord r = PROCESSES[index]; - r.services++; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - - cancelPluginProcessLoop(); - - return true; - } - - private static final boolean unregServiceLocked(int pid, int index, String plugin, String service) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "unreg service: pid=" + pid + " index=" + index + " plugin=" + plugin + " service=" + service); - } - - if (index < 0 || index >= PROCESSES.length) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "unreg service: invalid index=" + index); - } - return false; - } - - ProcessRecord r = PROCESSES[index]; - r.services--; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - - schedulePluginProcessLoop(CHECK_STAGE2_DELAY); - - return true; - } - - private static final boolean regBinderLocked(int pid, IBinder binder) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "reg binder: pid=" + pid + " binder=" + binder); - } - -// // TODO 优化 -// for (ProcessClientRecord r : ALL.values()) { -//// if (r.xx == xx) { -//// break; -//// } -// } - - // TODO 优化 - for (ProcessRecord r : PROCESSES) { - if (r.pid == pid) { - r.binders++; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - break; - } - } - - cancelPluginProcessLoop(); - - return true; - } - - private static final boolean unregBinderLocked(int pid, IBinder binder) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "unreg binder: pid=" + pid + " binder=" + binder); - } - -// // TODO 优化 -// for (ProcessClientRecord r : ALL.values()) { -//// if (r.xx == xx) { -//// break; -//// } -// } - - // TODO 优化 - for (ProcessRecord r : PROCESSES) { - if (r.pid == pid) { - r.binders--; - r.mobified = System.currentTimeMillis(); - if (LOG) { - LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); - } - break; - } - } - - schedulePluginProcessLoop(CHECK_STAGE2_DELAY); - - return true; - } - - private static final int sumBindersLocked(int index) { - for (ProcessRecord r : PROCESSES) { - if (r.index == index) { - return r.binders; - } - } - return -1; - } - - private static final void doPluginProcessLoop() { - if (Constant.SIMPLE_QUIT_CONTROLLER) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "do plugin process quit check"); - } - synchronized (PROCESSES) { - for (ProcessRecord r : PROCESSES) { - if (r.state != STATE_RUNNING) { - continue; - } - if (r.activities > 0) { - continue; - } - if (r.services > 0) { - continue; - } - if (r.binders > 0) { - continue; - } - if (LOGR) { - // terminate empty process - LogRelease.i(PLUGIN_TAG, "t e p " + r.pid); - } - // - android.os.Process.killProcess(r.pid); - waitKilled(r.pid); - r.setStoped(); - // - schedulePluginProcessLoop(CHECK_STAGE3_DELAY); - return; - } - } - } - } - - private static final void updateListLocked(List processes) { - /* TODO 待完善 - // 标记所有 - for (ProcessRecord r : PROCESSES) { - if (r.state == STATE_RUNNING) { - r.setMarked(); - } - } - for (ProcessPluginInfo r : USED_PLUGINS.values()) { - if (r.state == STATE_RUNNING) { - r.setMarked(); - } - } - - // 遍历设置状态 - for (RunningAppProcessInfo info : processes) { - if (info.uid != PluginManager.sUid) { - continue; - } - // - ProcessPluginInfo pi = USED_PLUGINS.get(info.processName); - if (pi != null && pi.pid == info.pid) { - pi.setRunning(); - } - // - int index = PluginManager.evalPluginProcess(info.processName); - if (!PluginManager.isPluginProcess(index)) { - continue; - } - // - ProcessRecord r = PROCESSES[index]; - // 状态分析 - if (r.state == STATE_ALLOCATED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "update plugin process list: plugin process started, index=" + index); - } - r.setRunning(info.pid); - } else if (r.state == STATE_MARKED) { - if (info.pid == r.pid) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "update plugin process list: plugin process running index=" + index); - } - r.setRunning(info.pid); - } - } else { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "update plugin process list: plugin process unknown: state=" + r.state + " index=" + index); - } - } - } - - // 标记所有 - for (ProcessRecord r : PROCESSES) { - if (r.state == STATE_MARKED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "update plugin process list: plugin process died, index=" + r.index); - } - r.setStoped(); - } - } - for (ProcessPluginInfo r : USED_PLUGINS.values()) { - if (r.state == STATE_MARKED) { - if (LOG) { - LogDebug.d(PLUGIN_TAG, "update plugin process list: used plugin process died, processName=" + r.processName); - } - r.setStoped(); - } - } */ - } - - private static final void waitKilled(int pid) { - for (int i = 0; i < 10; i++) { - try { - Thread.sleep(100, 0); - } catch (Throwable e) { - // - } - // - List processes = AMSUtils.getRunningAppProcessesNoThrows(RePluginInternal.getAppContext()); - if (processes == null || processes.isEmpty()) { - continue; - } - boolean found = false; - for (RunningAppProcessInfo info : processes) { - if (info.pid == pid) { - found = true; - } - } - if (!found) { - return; - } - } - } - - private static final int lookupPluginProcess(List processes, int index) { - for (RunningAppProcessInfo pi : processes) { - if (pi.uid != PluginManager.sUid) { - continue; - } - int i = PluginManager.evalPluginProcess(pi.processName); - if (i == index) { - return pi.pid; - } + /** + * 进程结束后执行操作 buyuntao + * @param p + */ + private static final void handleBinderDiedLocked(final ProcessClientRecord p) { + if (p == null){ + return; } - return -1; - } - - private static final void handleBinderDiedLocked(final ProcessClientRecord p, final PluginManagerServer pms) { - // TODO 优化 writeProcessClientLock(new Action() { @Override public Void call() { - for (ProcessClientRecord r : ALL.values()) { - if (r == p) { //20180911:防止因为同一进程重启后导致将新的record给删了? - ALL.remove(r.name); - break; - } + ProcessClientRecord r = ALL.get(p.name); + if (r == p){ //防止进程重启误判 + ALL.remove(r.name); } return null; } }); - synchronized (PROCESSES) { - // TODO 优化 - for (ProcessRecord r : PROCESSES) { - if (r.binder == p.binder) { - r.setStoped(); - break; - } - } - } + StubProcessManager.setProcessStop(p.binder); // 通知 PluginManagerServer 客户端进程链接已断开 - pms.onClientProcessKilled(p.name); + p.pluginManager.onClientProcessKilled(p.name); } /// diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java index 67b3ed66..bcb0b0ce 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmBase.java @@ -308,7 +308,7 @@ private final void initForServer() { mHostSvc = new PmHostSvc(mContext, this); PluginProcessMain.installHost(mHostSvc); - PluginProcessMain.schedulePluginProcessLoop(PluginProcessMain.CHECK_STAGE1_DELAY); + StubProcessManager.schedulePluginProcessLoop(StubProcessManager.CHECK_STAGE1_DELAY); // 兼容即将废弃的p-n方案 by Jiongxuan Zhang mAll = new Builder.PxAll(); @@ -1224,7 +1224,7 @@ final IPluginClient startPluginProcessLocked(String plugin, int process, PluginB } // - PluginProcessMain.schedulePluginProcessLoop(PluginProcessMain.CHECK_STAGE1_DELAY); + StubProcessManager.schedulePluginProcessLoop(StubProcessManager.CHECK_STAGE1_DELAY); // 获取 IPluginClient client = PluginProcessMain.probePluginClient(plugin, process, info); @@ -1247,7 +1247,7 @@ final IPluginClient startPluginProcessLocked(String plugin, int process, PluginB LogRelease.e(PLUGIN_TAG, "a.p.p: " + e.getMessage(), e); } } - // 分配的坑位不属于UI、和自定义进程，就返回。 + // 分配的坑位不属于UI、自定义进程或Stub坑位进程，就返回。（没找到有效进程） if (!(index == IPluginManager.PROCESS_UI || PluginProcessHost.isCustomPluginProcess(index) || PluginManager.isPluginProcess(index))) { diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java new file mode 100644 index 00000000..4a56e1a4 --- /dev/null +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/StubProcessManager.java @@ -0,0 +1,544 @@ +package com.qihoo360.loader2; + +import android.app.ActivityManager; +import android.os.IBinder; +import android.text.TextUtils; + +import com.qihoo360.i.IPluginManager; +import com.qihoo360.mobilesafe.api.Tasks; +import com.qihoo360.replugin.RePluginInternal; +import com.qihoo360.replugin.base.AMSUtils; +import com.qihoo360.replugin.helper.LogDebug; +import com.qihoo360.replugin.helper.LogRelease; + +import java.io.PrintWriter; +import java.util.List; + +import static com.qihoo360.replugin.helper.LogDebug.LOG; +import static com.qihoo360.replugin.helper.LogDebug.PLUGIN_TAG; +import static com.qihoo360.replugin.helper.LogRelease.LOGR; + +/** + * @author RePlugin Team + * dec: 坑位进程管理 buyuntao + */ +public class StubProcessManager { + /** + * 坑位进程列表 + */ + static final ProcessRecord STUB_PROCESSES[] = new ProcessRecord[Constant.STUB_PROCESS_COUNT]; + static final int CHECK_STAGE1_DELAY = 17 * 1000; + private static final int CHECK_STAGE2_DELAY = 11 * 1000; + private static final int CHECK_STAGE3_DELAY = 3 * 1000; + private static final Runnable CHECK = new Runnable() { + @Override + public void run() { + doPluginProcessLoop(); + } + }; + + static { + for (int i = 0; i < Constant.STUB_PROCESS_COUNT; i++) { + ProcessRecord r = new ProcessRecord(i, StubProcessState.STATE_UNUSED); + STUB_PROCESSES[i] = r; + } + } + + /** + * 分配坑位进程 buyuntao(外部调用端已经加锁) + * @param plugin + * @return 进程index值 + */ + static final int allocProcess(String plugin) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "alloc plugin process: plugin=" + plugin); + } + // 取运行列表 + List processes = AMSUtils.getRunningAppProcessesNoThrows(RePluginInternal.getAppContext()); + // 取运行列表失败，则直接返回失败 + if (processes == null || processes.isEmpty()) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "alloc plugin process: get running processes is empty"); + LogDebug.i(PLUGIN_TAG, "get list exception p=" + plugin); + } + return IPluginManager.PROCESS_AUTO; + } + //根据优先级分配坑位进程 + int prevMatchPriority = -1; //临时变量，保存上一个ProcessRecord的进程分配优先级 + ProcessRecord selectRecord = null; //被选中的坑位进程 + for (ProcessRecord r : STUB_PROCESSES) { + synchronized (r) { + if (r.calculateMatchPriority(plugin) > prevMatchPriority) { + prevMatchPriority = r.calculateMatchPriority(plugin); + selectRecord = r; + } else if (r.calculateMatchPriority(plugin) == prevMatchPriority) { + if (r.mobified < selectRecord.mobified) { + selectRecord = r; + } + } + } + } + if (selectRecord == null) { //不应该出现 + return IPluginManager.PROCESS_AUTO; + } + synchronized (selectRecord){ + //插件已在分配进程中运行，直接返回 + if (selectRecord.calculateMatchPriority(plugin) == Integer.MAX_VALUE && (selectRecord.state == StubProcessState.STATE_ALLOCATED || selectRecord.state == StubProcessState.STATE_RUNNING)) + { + return selectRecord.index; + } + selectRecord.resetAllocate(plugin, processes); + return selectRecord.index; + } + } + + private static final int lookupPluginProcess(List processes, int index) { + for (ActivityManager.RunningAppProcessInfo pi : processes) { + if (pi.uid != PluginManager.sUid) { + continue; + } + int i = PluginManager.evalPluginProcess(pi.processName); + if (i == index) { + return pi.pid; + } + } + return -1; + } + + private static final void waitKilled(int pid) { + for (int i = 0; i < 10; i++) { + try { + Thread.sleep(100, 0); + } catch (Throwable e) { + // + } + // + List processes = AMSUtils.getRunningAppProcessesNoThrows(RePluginInternal.getAppContext()); + if (processes == null || processes.isEmpty()) { + continue; + } + boolean found = false; + for (ActivityManager.RunningAppProcessInfo info : processes) { + if (info.pid == pid) { + found = true; + } + } + if (!found) { + return; + } + } + } + + static final void cancelPluginProcessLoop() { + if (Constant.SIMPLE_QUIT_CONTROLLER) { + Tasks.cancelThreadTask(CHECK); + } + } + + /** + * @param pid + * @param index + * @param plugin + * @param activity + * @param container + * @return + */ + static final boolean attachActivity(int pid, int index, String plugin, String activity, String container) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "reg activity: pid=" + pid + " index=" + index + " plugin=" + plugin + " activity=" + activity + " container=" + container); + } + + if (index < 0 || index >= STUB_PROCESSES.length) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "reg activity: invalid index=" + index); + } + return false; + } + + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r){ + r.activities++; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + cancelPluginProcessLoop(); + + return true; + } + + /** + * @param pid + * @param index + * @param plugin + * @param activity + * @param container + * @return + */ + static final boolean detachActivity(int pid, int index, String plugin, String activity, String container) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "unreg activity: pid=" + pid + " index=" + index + " plugin=" + plugin + " activity=" + activity + " container=" + container); + } + + if (index < 0 || index >= STUB_PROCESSES.length) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "unreg activity: invalid index=" + index); + } + return false; + } + + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r){ + r.activities--; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + schedulePluginProcessLoop(CHECK_STAGE2_DELAY); + + return true; + } + + /** + * @param pid + * @param index + * @param plugin + * @param service + * @return + */ + static final boolean attachService(int pid, int index, String plugin, String service) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "reg service: pid=" + pid + " index=" + index + " plugin=" + plugin + " service=" + service); + } + + if (index < 0 || index >= STUB_PROCESSES.length) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "reg service: invalid index=" + index); + } + return false; + } + + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r) { + r.services++; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + cancelPluginProcessLoop(); + + return true; + } + + /** + * @param pid + * @param index + * @param plugin + * @param service + * @return + */ + static final boolean detachService(int pid, int index, String plugin, String service) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "unreg service: pid=" + pid + " index=" + index + " plugin=" + plugin + " service=" + service); + } + + if (index < 0 || index >= STUB_PROCESSES.length) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "unreg service: invalid index=" + index); + } + return false; + } + + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r){ + r.services--; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + schedulePluginProcessLoop(CHECK_STAGE2_DELAY); + + return true; + } + + static final void attachBinder(int pid, IBinder binder) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "reg binder: pid=" + pid + " binder=" + binder); + } + for (ProcessRecord r : STUB_PROCESSES) { + if (r.pid == pid) { + synchronized (r) { + r.binders++; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + break; + } + } + + cancelPluginProcessLoop(); + } + + static final void detachBinder(int pid, IBinder binder) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "unreg binder: pid=" + pid + " binder=" + binder); + } + for (ProcessRecord r : STUB_PROCESSES) { + if (r.pid == pid) { + synchronized (r){ + r.binders--; + r.mobified = System.currentTimeMillis(); + if (LOG) { + LogDebug.d(PLUGIN_TAG, "activities=" + r.activities + " services=" + r.services + " binders=" + r.binders); + } + } + break; + } + } + + schedulePluginProcessLoop(CHECK_STAGE2_DELAY); + } + + static final int sumBinders(int index) { + if (index >=0 && index < STUB_PROCESSES.length){ + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r) { + return STUB_PROCESSES[index].binders; + } + } + return -1; + } + + /** + * attach坑位进程，设置坑位进程为运行状态，并返回正在使用坑位进程的插件名称 buyuntao + * + * @param pid + * @param index + * @param binder + * @param client + * @param def + * @return + */ + static final String attachStubProcess(int pid, int index, IBinder binder, IPluginClient client, String def) { + // 检测状态是否一致 + ProcessRecord r = STUB_PROCESSES[index]; + synchronized (r) { + if (!TextUtils.isEmpty(def)) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "attach process: allocate now"); + } + r.allocate(def); + } + if (r.state != StubProcessState.STATE_ALLOCATED) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "attach process: state not allocated: state=" + r.state); + } + return null; + } + + r.setRunning(pid); + r.setClient(binder, client); + return r.plugin; + } + } + + static final void setProcessStop(final IBinder binder) { + for (ProcessRecord r : STUB_PROCESSES) { + synchronized (r) { + if (r.binder == binder) { + r.setStoped(); + break; + } + } + } + } + + private static final void doPluginProcessLoop() { + if (Constant.SIMPLE_QUIT_CONTROLLER) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "do plugin process quit check"); + } + for (ProcessRecord r : STUB_PROCESSES) { + synchronized (r) { + if (r.state != StubProcessState.STATE_RUNNING) { + continue; + } + if (r.activities > 0) { + continue; + } + if (r.services > 0) { + continue; + } + if (r.binders > 0) { + continue; + } + if (LOGR) { + // terminate empty process + LogRelease.i(PLUGIN_TAG, "t e p " + r.pid); + } + // + android.os.Process.killProcess(r.pid); + waitKilled(r.pid); + r.setStoped(); + // + schedulePluginProcessLoop(CHECK_STAGE3_DELAY); + return; + } + } + } + } + + static final void schedulePluginProcessLoop(long delayMillis) { + if (Constant.SIMPLE_QUIT_CONTROLLER) { + if (LOG) { + LogDebug.d(PLUGIN_TAG, "schedule plugin process quit check: delay=" + (delayMillis / 1000)); + } + Tasks.cancelThreadTask(CHECK); + Tasks.postDelayed2Thread(CHECK, delayMillis); + } + } + + static final void dump(PrintWriter writer) { + writer.println("--- STUB_PROCESSES.length = " + STUB_PROCESSES.length + " ---"); + for (ProcessRecord r : STUB_PROCESSES) { + synchronized (r){ + writer.println(r); + } + } + } + + /** + * 坑位进程的状态 buyuntao + */ + public class StubProcessState { + public static final int STATE_UNUSED = 0; + + public static final int STATE_ALLOCATED = 1; + + public static final int STATE_RUNNING = 2; + + public static final int STATE_STOPED = 4; + } + + private static final class ProcessRecord { + + final int index; + + int state; + + long mobified; + + String plugin; + + int pid; + + IBinder binder; + + IPluginClient client; + + int activities; + + int services; + + int binders; + + ProcessRecord(int index, int state) { + this.index = index; + this.state = state; + } + + void allocate(String plugin) { + this.state = StubProcessState.STATE_ALLOCATED; + this.mobified = System.currentTimeMillis(); + this.plugin = plugin; + this.pid = 0; + this.binder = null; + this.client = null; + this.activities = 0; + this.services = 0; + this.binders = 0; + } + + void setRunning(int pid) { + this.state = StubProcessState.STATE_RUNNING; + this.pid = pid; + } + + void setClient(IBinder binder, IPluginClient client) { + this.binder = binder; + this.client = client; + } + + void setStoped() { + this.state = StubProcessState.STATE_STOPED; + this.pid = 0; + this.binder = null; + this.client = null; + } + + /** + * 当前坑位的选择优先级（值越大被选中的概率越高） + * + * @param newPluginName + * @return 坑位的选择优先级 + */ + int calculateMatchPriority(String newPluginName) { + int priority = Integer.MAX_VALUE; + if (TextUtils.equals(newPluginName, plugin)) { //插件可能用过的进程 + return priority; + } + if (state == StubProcessState.STATE_UNUSED) { //空闲的进程 + priority = Integer.MAX_VALUE - 1; + return priority; + } + if (state == StubProcessState.STATE_STOPED) { //已停止的进程 + priority = Integer.MAX_VALUE - 2; + return priority; + } + if ((System.currentTimeMillis() - mobified) > 10 * 1000) { //分配时间超过10秒的 + priority = Integer.MAX_VALUE - 3; + return priority; + } + if ((activities <= 0) && (services <= 0) && (binders <= 0)) { //组件为空的 + priority = Integer.MAX_VALUE - 4; + return priority; + } + priority = 0; //默认值 + return priority; + } + + void resetAllocate(String plugin, List processes) { + killProcess(processes); + allocate(plugin); + } + + private void killProcess(List processes) { + // 确保进程为空 + int pid = lookupPluginProcess(processes, index); + if (pid > 0) { + if (LOGR) { + LogRelease.i(PLUGIN_TAG, "ppr k i: " + pid); + } + android.os.Process.killProcess(pid); + waitKilled(pid); + } + } + + @Override + public String toString() { + if (LOG) { + return super.toString() + " {index=" + index + " state=" + state + " mobified=" + mobified + " plugin=" + plugin + " pid=" + pid + " binder=" + binder + " client=" + client + + " activities=" + activities + " services=" + services + " binders=" + binders + "}"; + } + return super.toString(); + } + } + + +} From bc2e700240a4a83052450cc8fce95951d7dbfdff Mon Sep 17 00:00:00 2001 From: buyuntao Date: Wed, 14 Nov 2018 15:37:36 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E3=80=90buyuntao=E3=80=91sendIntent2Proc?= =?UTF-8?q?ess=20code=20structure=20optimization,=20startPluginProcess=20l?= =?UTF-8?q?ock=20optimization.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qihoo360/loader2/PmHostSvc.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java index 1e5e0654..f3fae174 100644 --- a/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java +++ b/replugin-host-library/replugin-host-lib/src/main/java/com/qihoo360/loader2/PmHostSvc.java @@ -177,9 +177,7 @@ public long fetchPersistentCookie() throws RemoteException { @Override public IPluginClient startPluginProcess(String plugin, int process, PluginBinderInfo info) throws RemoteException { - synchronized (this) { - return mPluginMgr.startPluginProcessLocked(plugin, process, info); - } + return mPluginMgr.startPluginProcessLocked(plugin, process, info); } @Override @@ -340,7 +338,6 @@ public PluginInfo pluginDownloaded(String path) throws RemoteException { syncInstalledPluginInfo2All(pi); } - return pi; } @@ -484,28 +481,27 @@ private void sendIntent2Process(String target, Intent intent, boolean sync) thro if (LOG) { LogDebug.d(PLUGIN_TAG, "sendIntent2Process target=" + target + " intent=" + intent); } - if (TextUtils.equals(target, IPC.getPluginHostProcessName())) { - intent.setExtrasClassLoader(getClass().getClassLoader()); - if (sync) { - LocalBroadcastHelper.sendBroadcastSyncUi(mContext, intent); - } else { - LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); - } + sendIntent2PluginHostProcess(intent, sync); return; } if (TextUtils.isEmpty(target)) { - intent.setExtrasClassLoader(getClass().getClassLoader()); - if (sync) { - LocalBroadcastHelper.sendBroadcastSyncUi(mContext, intent); - } else { - LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); - } + sendIntent2PluginHostProcess(intent, sync); } + PluginProcessMain.sendIntent2Process(target, intent, sync); } + private void sendIntent2PluginHostProcess(Intent intent, boolean sync) { + intent.setExtrasClassLoader(getClass().getClassLoader()); + if (sync) { + LocalBroadcastHelper.sendBroadcastSyncUi(mContext, intent); + } else { + LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); + } + } + @Override public void sendIntent2Plugin(String target, Intent intent) throws RemoteException { sendIntent2Plugin(target, intent, false); From d9ce3be8c1115b2893b7350f4622d25ac50ddbfe Mon Sep 17 00:00:00 2001 From: hyongbai Date: Fri, 16 Nov 2018 17:53:55 +0800 Subject: [PATCH 15/15] #deploy# all in one --- README.md | 2 +- README_CN.md | 2 +- deploy.sh | 58 ++++++ replugin-host-gradle/build.gradle | 66 +----- .../replugin/gradle/host/AppConstant.groovy | 2 +- .../replugin-host-lib/build.gradle | 8 +- replugin-plugin-gradle/build.gradle | 3 +- .../replugin/gradle/plugin/AppConstant.groovy | 3 +- .../replugin-plugin-lib/build.gradle | 7 +- .../fresco/FrescoHost/app/build.gradle | 2 +- .../fresco/FrescoHost/build.gradle | 3 +- .../fresco/FrescoHost/gradlew | 0 .../fresco/FrescoPlugin/app/build.gradle | 2 +- .../fresco/FrescoPlugin/build.gradle | 3 +- .../fresco/FrescoPlugin/gradlew | 0 replugin-sample/host/app/build.gradle | 2 +- replugin-sample/host/build.gradle | 3 +- .../plugin/plugin-demo1/app/build.gradle | 2 +- .../plugin/plugin-demo1/build.gradle | 3 +- .../plugin/plugin-demo2/app/build.gradle | 2 +- .../plugin/plugin-demo2/build.gradle | 3 +- .../plugin-demo3-kotlin/app/build.gradle | 2 +- .../plugin/plugin-demo3-kotlin/build.gradle | 3 +- .../plugin/plugin-webview/app/build.gradle | 2 +- .../plugin/plugin-webview/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes rp-config.gradle | 14 ++ rp-publish.gradle | 194 ++++++++++++++++++ 28 files changed, 301 insertions(+), 93 deletions(-) create mode 100755 deploy.sh mode change 100644 => 100755 replugin-sample-extra/fresco/FrescoHost/gradlew mode change 100644 => 100755 replugin-sample-extra/fresco/FrescoPlugin/gradlew create mode 100644 replugin-sample/plugin/plugin-webview/gradle/wrapper/gradle-wrapper.jar create mode 100644 rp-config.gradle create mode 100644 rp-publish.gradle diff --git a/README.md b/README.md index 436bfeb3..a6946dd8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

[![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-2.3.0-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) +[![Release Version](https://img.shields.io/badge/release-2.3.1-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) ## 活动通知 移动技术最新活动通知：9月1号360移动技术开放日 http://t.cn/RDiNru9 diff --git a/README_CN.md b/README_CN.md index 2e18c4d3..85b84bc4 100644 --- a/README_CN.md +++ b/README_CN.md @@ -6,7 +6,7 @@ [![license](http://img.shields.io/badge/license-Apache2.0-brightgreen.svg?style=flat)](https://github.com/Qihoo360/RePlugin/blob/master/LICENSE) -[![Release Version](https://img.shields.io/badge/release-2.3.0-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) +[![Release Version](https://img.shields.io/badge/release-2.3.1-brightgreen.svg)](https://github.com/Qihoo360/RePlugin/releases) diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 00000000..0f37f936 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +export RP_BASE_DIR=$(cd "$(dirname "$0")"; pwd) + +export TARGET_PROJECTS=( +replugin-host-gradle +replugin-host-library +replugin-plugin-gradle +replugin-plugin-library +) + +__gradle_exec(){ if [[ -x gradlew ]];then ./gradlew ${@}; else gradle ${@}; fi; } + +__rp_deploy_project(){ + [[ ! -d ${1} ]] && echo ">>> INVALID ${1}!!! <<<" && return + # execute deploying + echo ">>> ${1} <<<" && __gradle_exec -p ${1} clean bintrayUpload + # revert changed files + git checkout ${1} +} + +rp_deploy(){ + local current=`pwd` && cd ${RP_BASE_DIR} + # saving all changes: git stash save "saving stash for deploying!!!" + # deploy + for p in ${TARGET_PROJECTS}; do __rp_deploy_project ${RP_BASE_DIR}/${p}; done + # revert local changes: git revert --hard HEAD; git stash pop + local current=`pwd` +} + +rp_test(){ + local projects=( + # replugin-sample/host/app + replugin-sample/host + # replugin-sample/plugin/plugin-demo1/app + replugin-sample/plugin/plugin-demo1 + # replugin-sample/plugin/plugin-demo2/app + replugin-sample/plugin/plugin-demo2 + # replugin-sample/plugin/plugin-demo3-kotlin/app + replugin-sample/plugin/plugin-demo3-kotlin + # replugin-sample/plugin/plugin-webview/app + replugin-sample/plugin/plugin-webview + # replugin-sample-extra/fresco/FrescoHost/app + replugin-sample-extra/fresco/FrescoHost + # replugin-sample-extra/fresco/FrescoPlugin/app + replugin-sample-extra/fresco/FrescoPlugin + ) + local log=${RP_BASE_DIR}/build/rp_test.log && [[ -f $log ]] && rm -f $log + local current=`pwd` + for p in ${projects}; do + echo -e ">>> BUILDING ${p}" + p=${RP_BASE_DIR}/${p} && __gradle_exec -p ${p} clean asDebug 2>/dev/null >> ${log} && echo "SUCCEED"; + ls -l ${p}/app/build/outputs/apk + done + cd ${current} +} + +# grep --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,build,.gradle} -inr '2\.3\.0' . \ No newline at end of file diff --git a/replugin-host-gradle/build.gradle b/replugin-host-gradle/build.gradle index d698fbc2..6f08f2e8 100644 --- a/replugin-host-gradle/build.gradle +++ b/replugin-host-gradle/build.gradle @@ -30,6 +30,7 @@ buildscript { jcenter() mavenCentral() } + dependencies { // classpath 'com.android.tools.build:gradle:2.1.0' // 将项目发布到JCenter 所需要的jar 添加依赖 @@ -38,14 +39,6 @@ buildscript { } } -group = 'com.qihoo360.replugin' // 组名 -String classPath = ".src.main.groovy.com.qihoo360.replugin.gradle.host.AppConstant".replace(".", java.io.File.separator) -String verPath = "${project.projectDir}" + classPath + ".groovy" -String verLine = new File(verPath).filterLine { it =~ /def static final VER =/ } -version = "${verLine.split("\"")[1]}" // 版本 -//红色醒目打印显示版本号 -java.lang.System.err.println "version=${version}" - dependencies { compile 'com.android.tools.build:gradle:2.1.3' compile 'org.json:json:20160212' @@ -57,60 +50,7 @@ dependencies { compile 'com.google.gradle:osdetector-gradle-plugin:1.2.1' compile 'net.dongliu:apk-parser:2.2.0' - -} - - - -if (project.hasProperty("android")) { // Android libraries - task sourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.srcDirs - } - - task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } -} else { // Java libraries - task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource - } -} - -// 强制 Java/JavaDoc 等的编码为 UTF-8 -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - - - -// add javadoc/source jar tasks as artifacts -artifacts { - archives sourcesJar, javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - if (plugins.hasPlugin('war')) { - from components.web - } else { - from components.java - } - - artifact sourcesJar - artifact javadocJar - } - } -} - -apply from: 'bintray.gradle' - - +project.ext.RP_ARTIFACT_ID = 'replugin-host-gradle' +apply from: '../rp-publish.gradle' \ No newline at end of file diff --git a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/AppConstant.groovy b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/AppConstant.groovy index d0c1dada..a671b1af 100644 --- a/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/AppConstant.groovy +++ b/replugin-host-gradle/src/main/groovy/com/qihoo360/replugin/gradle/host/AppConstant.groovy @@ -23,7 +23,7 @@ package com.qihoo360.replugin.gradle.host class AppConstant { /** 版本号 */ - def static final VER = "2.3.0" + def static final VER = "${RP_VERSION}" /** 打印信息时候的前缀 */ def static final TAG = "< replugin-host-v${VER} >" diff --git a/replugin-host-library/replugin-host-lib/build.gradle b/replugin-host-library/replugin-host-lib/build.gradle index fbfa6db4..1280694a 100644 --- a/replugin-host-library/replugin-host-lib/build.gradle +++ b/replugin-host-library/replugin-host-lib/build.gradle @@ -19,11 +19,6 @@ */ apply plugin: 'com.android.library' - -version = "2.3.0" - -group = 'com.qihoo360.replugin' // 组名 - android { compileSdkVersion 25 buildToolsVersion '25.0.2' @@ -54,4 +49,5 @@ dependencies { provided 'com.android.support:support-v4:25.2.0' } -apply from: 'bintray.gradle' +project.ext.RP_ARTIFACT_ID = 'replugin-host-lib' +apply from: '../../rp-publish.gradle' diff --git a/replugin-plugin-gradle/build.gradle b/replugin-plugin-gradle/build.gradle index fd50c208..7b3321cb 100644 --- a/replugin-plugin-gradle/build.gradle +++ b/replugin-plugin-gradle/build.gradle @@ -112,4 +112,5 @@ publishing { } } -apply from: 'bintray.gradle' \ No newline at end of file +project.ext.RP_ARTIFACT_ID = 'replugin-plugin-gradle' +apply from: '../rp-publish.gradle' \ No newline at end of file diff --git a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/AppConstant.groovy b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/AppConstant.groovy index 01d38ae7..7e87db05 100644 --- a/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/AppConstant.groovy +++ b/replugin-plugin-gradle/src/main/groovy/com/qihoo360/replugin/gradle/plugin/AppConstant.groovy @@ -23,8 +23,7 @@ package com.qihoo360.replugin.gradle.plugin class AppConstant { /** 版本号 */ - def static final VER = "2.3.0" - + def static final VER = "${RP_VERSION}" /** 打印信息时候的前缀 */ def static final TAG = "< replugin-plugin-v${VER} >" diff --git a/replugin-plugin-library/replugin-plugin-lib/build.gradle b/replugin-plugin-library/replugin-plugin-lib/build.gradle index 93a9f6c5..8adbbf94 100644 --- a/replugin-plugin-library/replugin-plugin-lib/build.gradle +++ b/replugin-plugin-library/replugin-plugin-lib/build.gradle @@ -16,9 +16,6 @@ apply plugin: 'com.android.library' -version = "2.3.0" -group = 'com.qihoo360.replugin' // 组名 - android { compileSdkVersion 25 buildToolsVersion '25.0.2' @@ -46,4 +43,6 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) provided 'com.android.support:appcompat-v7:23.4.0' } -apply from: 'bintray.gradle' \ No newline at end of file + +project.ext.RP_ARTIFACT_ID = 'replugin-plugin-lib' +apply from: '../../rp-publish.gradle' \ No newline at end of file diff --git a/replugin-sample-extra/fresco/FrescoHost/app/build.gradle b/replugin-sample-extra/fresco/FrescoHost/app/build.gradle index 7a5bdf3e..e6427bc2 100644 --- a/replugin-sample-extra/fresco/FrescoHost/app/build.gradle +++ b/replugin-sample-extra/fresco/FrescoHost/app/build.gradle @@ -45,7 +45,7 @@ repluginHostConfig { } dependencies { - compile 'com.qihoo360.replugin:replugin-host-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-host-lib:${RP_VERSION}" compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { diff --git a/replugin-sample-extra/fresco/FrescoHost/build.gradle b/replugin-sample-extra/fresco/FrescoHost/build.gradle index dce24ee7..3b9afc07 100644 --- a/replugin-sample-extra/fresco/FrescoHost/build.gradle +++ b/replugin-sample-extra/fresco/FrescoHost/build.gradle @@ -1,13 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.qihoo360.replugin:replugin-host-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-host-gradle:${RP_VERSION}" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/replugin-sample-extra/fresco/FrescoHost/gradlew b/replugin-sample-extra/fresco/FrescoHost/gradlew old mode 100644 new mode 100755 diff --git a/replugin-sample-extra/fresco/FrescoPlugin/app/build.gradle b/replugin-sample-extra/fresco/FrescoPlugin/app/build.gradle index 5a3b109d..a2d017d6 100644 --- a/replugin-sample-extra/fresco/FrescoPlugin/app/build.gradle +++ b/replugin-sample-extra/fresco/FrescoPlugin/app/build.gradle @@ -29,7 +29,7 @@ android { apply plugin: 'replugin-plugin-gradle' dependencies { - compile 'com.qihoo360.replugin:replugin-plugin-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-plugin-lib:${RP_VERSION}" compile 'com.android.support:appcompat-v7:26.0.0-alpha1' diff --git a/replugin-sample-extra/fresco/FrescoPlugin/build.gradle b/replugin-sample-extra/fresco/FrescoPlugin/build.gradle index 30b1ed98..93474514 100644 --- a/replugin-sample-extra/fresco/FrescoPlugin/build.gradle +++ b/replugin-sample-extra/fresco/FrescoPlugin/build.gradle @@ -1,13 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.qihoo360.replugin:replugin-plugin-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-plugin-gradle:${RP_VERSION}" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/replugin-sample-extra/fresco/FrescoPlugin/gradlew b/replugin-sample-extra/fresco/FrescoPlugin/gradlew old mode 100644 new mode 100755 diff --git a/replugin-sample/host/app/build.gradle b/replugin-sample/host/app/build.gradle index e32f9df0..6b97f1d8 100644 --- a/replugin-sample/host/app/build.gradle +++ b/replugin-sample/host/app/build.gradle @@ -45,5 +45,5 @@ repluginHostConfig { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.qihoo360.replugin:replugin-host-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-host-lib:${RP_VERSION}" } diff --git a/replugin-sample/host/build.gradle b/replugin-sample/host/build.gradle index 25113a2c..b879ef4c 100644 --- a/replugin-sample/host/build.gradle +++ b/replugin-sample/host/build.gradle @@ -14,13 +14,14 @@ * the License. */ buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.qihoo360.replugin:replugin-host-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-host-gradle:${RP_VERSION}" } } diff --git a/replugin-sample/plugin/plugin-demo1/app/build.gradle b/replugin-sample/plugin/plugin-demo1/app/build.gradle index 2110a51e..9b987064 100644 --- a/replugin-sample/plugin/plugin-demo1/app/build.gradle +++ b/replugin-sample/plugin/plugin-demo1/app/build.gradle @@ -66,7 +66,7 @@ repluginPluginConfig { } dependencies { - compile 'com.qihoo360.replugin:replugin-plugin-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-plugin-lib:${RP_VERSION}" provided files('libs/fragment.jar')//这个jar就是从Support-fragment中提取出来的并非特制包目的是为了骗过编译期 provided files('libs/common-utils-lib-1.0.0.jar')//这个jar就是从Host的utils中编译生成的，其目的是为了骗过编译期 compile(name: 'plugin-library', ext: 'aar')//sample:compile aar diff --git a/replugin-sample/plugin/plugin-demo1/build.gradle b/replugin-sample/plugin/plugin-demo1/build.gradle index 4b276bf9..8f2deea3 100644 --- a/replugin-sample/plugin/plugin-demo1/build.gradle +++ b/replugin-sample/plugin/plugin-demo1/build.gradle @@ -14,13 +14,14 @@ * the License. */ buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.qihoo360.replugin:replugin-plugin-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-plugin-gradle:${RP_VERSION}" } } diff --git a/replugin-sample/plugin/plugin-demo2/app/build.gradle b/replugin-sample/plugin/plugin-demo2/app/build.gradle index 78a9c6b1..00560a3d 100644 --- a/replugin-sample/plugin/plugin-demo2/app/build.gradle +++ b/replugin-sample/plugin/plugin-demo2/app/build.gradle @@ -66,7 +66,7 @@ repluginPluginConfig { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.qihoo360.replugin:replugin-plugin-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-plugin-lib:${RP_VERSION}" } if (android.defaultConfig.multiDexEnabled) { diff --git a/replugin-sample/plugin/plugin-demo2/build.gradle b/replugin-sample/plugin/plugin-demo2/build.gradle index 4b276bf9..8f2deea3 100644 --- a/replugin-sample/plugin/plugin-demo2/build.gradle +++ b/replugin-sample/plugin/plugin-demo2/build.gradle @@ -14,13 +14,14 @@ * the License. */ buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.qihoo360.replugin:replugin-plugin-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-plugin-gradle:${RP_VERSION}" } } diff --git a/replugin-sample/plugin/plugin-demo3-kotlin/app/build.gradle b/replugin-sample/plugin/plugin-demo3-kotlin/app/build.gradle index fe18624f..09562afe 100644 --- a/replugin-sample/plugin/plugin-demo3-kotlin/app/build.gradle +++ b/replugin-sample/plugin/plugin-demo3-kotlin/app/build.gradle @@ -54,7 +54,7 @@ android { dependencies { - compile 'com.qihoo360.replugin:replugin-plugin-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-plugin-lib:${RP_VERSION}" provided files('libs/fragment.jar') compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" //这个jar就是从Support-fragment中提取出来的并非特制包目的是为了骗过编译期 diff --git a/replugin-sample/plugin/plugin-demo3-kotlin/build.gradle b/replugin-sample/plugin/plugin-demo3-kotlin/build.gradle index c18c077b..8538d4e4 100644 --- a/replugin-sample/plugin/plugin-demo3-kotlin/build.gradle +++ b/replugin-sample/plugin/plugin-demo3-kotlin/build.gradle @@ -14,6 +14,7 @@ * the License. */ buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) ext.kotlin_version = '1.1.3' repositories { mavenLocal() @@ -21,7 +22,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.qihoo360.replugin:replugin-plugin-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-plugin-gradle:${RP_VERSION}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/replugin-sample/plugin/plugin-webview/app/build.gradle b/replugin-sample/plugin/plugin-webview/app/build.gradle index ff7c89e5..3528d971 100644 --- a/replugin-sample/plugin/plugin-webview/app/build.gradle +++ b/replugin-sample/plugin/plugin-webview/app/build.gradle @@ -62,5 +62,5 @@ repluginPluginConfig { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.qihoo360.replugin:replugin-plugin-lib:2.3.0' + compile "com.qihoo360.replugin:replugin-plugin-lib:${RP_VERSION}" } \ No newline at end of file diff --git a/replugin-sample/plugin/plugin-webview/build.gradle b/replugin-sample/plugin/plugin-webview/build.gradle index 4b276bf9..8f2deea3 100644 --- a/replugin-sample/plugin/plugin-webview/build.gradle +++ b/replugin-sample/plugin/plugin-webview/build.gradle @@ -14,13 +14,14 @@ * the License. */ buildscript { + { p, cfg = "rp-config.gradle" -> if (new File(p, cfg).exists()) apply from: "${p}/${cfg}" else if (p.exists()) call(p.parentFile) }(buildscript.sourceFile.parentFile) repositories { mavenLocal() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.qihoo360.replugin:replugin-plugin-gradle:2.3.0' + classpath "com.qihoo360.replugin:replugin-plugin-gradle:${RP_VERSION}" } } diff --git a/replugin-sample/plugin/plugin-webview/gradle/wrapper/gradle-wrapper.jar b/replugin-sample/plugin/plugin-webview/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ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 H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/rp-config.gradle b/rp-config.gradle new file mode 100644 index 00000000..39e7e57f --- /dev/null +++ b/rp-config.gradle @@ -0,0 +1,14 @@ +project.ext{ + RP_USER = 'qihoo360' + RP_REPO = 'replugin' + // + RP_SITE = 'https://github.com/Qihoo360/Replugin' + RP_DESC = 'RePlugin - A flexible, stable, easy-to-use Android Plug-in Framework' + RP_EMAIL = 'replugin@gmail.com' + RP_GIT_URL = 'https://github.com/Qihoo360/RePlugin' + RP_LICENSES_URL = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + RP_LICENSES_NAME = 'Apache-2.0' + // + RP_GROUP = 'com.qihoo360.replugin' + RP_VERSION = '2.3.1' +} \ No newline at end of file diff --git a/rp-publish.gradle b/rp-publish.gradle new file mode 100644 index 00000000..6cff4872 --- /dev/null +++ b/rp-publish.gradle @@ -0,0 +1,194 @@ +// utilities + +def static replaceVariables(File file, String key, String value) { + if(!file.exists()) return + def regex = '\\$\\{' + key + '\\}' + file.write((file.text =~ /${regex}/).replaceAll(value)) +} + +def isAndroid(){ return project.hasProperty("android"); } + +def getPropertySafe(name, defaultValue = ''){ + if(hasProperty(name) && getProperty(name).trim() != '') return getProperty(name) + return defaultValue +} + +def getPropertyExt(name, defaultValue = ''){ + if ( project.ext.has(name) && project.ext[name] != null ) return project.ext[name] + return getPropertySafe(name, defaultValue) +} + +// def pbHelp(){ +// println(">>> Please make sure MUST-HVAE Properties defined in 'project.ext' or gradle.properties." +// + "\ne.g.: " +// + "\n PB_USER = hyongbai" +// + "\n PB_ARTIFACT_ID = HelloWorld" +// ) +// } + +def pbUpdateVariables(){ + [ + "src/main/groovy/com/qihoo360/replugin/gradle/host/AppConstant.groovy", + "src/main/groovy/com/qihoo360/replugin/gradle/plugin/AppConstant.groovy" + ].forEach { replaceVariables(project.file(it), "RP_VERSION", version) } +} + +// pbHelp() + +///// CONFIG + +apply from: "${buildscript.sourceFile.parent}/rp-config.gradle" + +group = getPropertyExt('RP_GROUP') + +version = getPropertyExt('RP_VERSION') + +def pbArtifactId = getPropertyExt('RP_ARTIFACT_ID') + +pbUpdateVariables() + +// + +def pbUser = getPropertyExt('RP_USER') + +def pbRepo = getPropertyExt('RP_REPO', 'maven') + +def pbEmail = getPropertyExt('RP_EMAIL', pbUser) + +def pbUserId = getPropertyExt('RP_USER_ID', pbUser) + +def pbBintayKey = getPropertyExt('RP_BINTRAY_KEY', System.getenv('RP_BINTRAY_KEY')) + +// + +def pbDesc = getPropertyExt('RP_DESC', 'DONT BE EVIL') + +def pbLicense = getPropertyExt('RP_LICENSES_NAME', 'The Apache Software License, Version 2.0') + +def pbLicenseUrl = getPropertyExt('RP_LICENSES_URL', 'http://www.apache.org/licenses/LICENSE-2.0.txt') + +// + +def pbSiteUrl = getPropertyExt('RP_SITE', "https://github.com") + +def pbGitUrl = getPropertyExt('RP_GIT_URL', pbSiteUrl) + +def pbIssueUrl = getPropertyExt('RP_ISSUE_URL', pbSiteUrl) + +println( + ">>>「publish.gradle」 CONFIGURATIONS:" + + "\n ${group}:${pbArtifactId}:${version}" + + "\n ${pbDesc}" + + "\n Android = ${project.hasProperty("android")}" + + "\n pbUser = ${pbUser}:${pbEmail}" + + "\n pbSite = ${pbSiteUrl}" + + "\n pbGitUrl = ${pbGitUrl}" + + "\n pbIssueUrl = ${pbIssueUrl}" + + "\n License = ${pbLicense}(${pbLicenseUrl})" + + "\n pbBintayKey = ${pbBintayKey}" +) + +//// task + +if (isAndroid()) { // Android libraries + task sourcesJar(overwrite: true, type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.srcDirs + } + task javadoc(overwrite: true, type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + } +} else { // Java libraries + task sourcesJar(overwrite: true, type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource + } +} + +task javadocJar(overwrite: true, type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + // archives javadocJar + archives sourcesJar +} + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +/////// publish to BINTRAY + +apply plugin: 'com.jfrog.bintray' +if (isAndroid()) { + apply plugin: 'com.github.dcendents.android-maven' +} + +install { + repositories.mavenInstaller { + pom { + project { + packaging 'aar' + name pbArtifactId + url pbSiteUrl + licenses { + license { + name pbLicense + url pbLicenseUrl + } + } + developers { + developer { + id pbUser + name pbUserId + email pbEmail + } + } + scm { + connection pbGitUrl + developerConnection pbGitUrl + url pbSiteUrl + } + } + } + } +} + +// config bintray + +if ( pbBintayKey == null ){ + System.err.println("bintray access key is EMPTY!!!") +} else { + bintray { + user = pbUser + key = pbBintayKey + configurations = ['archives'] + pkg { + desc = pbDesc + repo = pbRepo + name = pbArtifactId + vcsUrl = pbGitUrl + userOrg = 'qihoo360' + websiteUrl = pbSiteUrl + issueTrackerUrl = pbIssueUrl + licenses = [pbLicense] + publish = true + } + } +} + +/////// publish to LOCAL + +// apply plugin: 'maven' + +// uploadArchives { +// repositories.mavenDeployer { +// repository(url: "file://${System.getenv('HOME')}/.m2") +// pom.groupId = group +// pom.version = version +// pom.artifactId = pbArtifactId +// } +// } \ No newline at end of file