Merge pull request #476 from YangSen-qn/optimize-transaction-manager

xwen-winnie · web-flow · commit 22b602c17a9a · 2021-11-12T14:52:10.000+08:00
Optimize transaction manager
diff --git a/library/src/androidTest/java/com/qiniu/android/transaction/TransactionManagerTest.java b/library/src/androidTest/java/com/qiniu/android/transaction/TransactionManagerTest.java
@@ -1,7 +1,8 @@
-package com.qiniu.android;
+package com.qiniu.android.transaction;
 
-import com.qiniu.android.transaction.TransactionManager;
+import com.qiniu.android.BaseTest;
 import com.qiniu.android.utils.LogUtil;
+import com.qiniu.android.utils.Utils;
 
 import java.util.Date;
 
@@ -51,19 +52,45 @@ public void run() {
         });
 
         TransactionManager manager = TransactionManager.getInstance();
+
+        int transactionCountBefore = manager.transactionList.size();
+        long actionCountBefore = manager.actionCount;
         manager.addTransaction(normal);
         manager.addTransaction(time);
 
 
+        // 由于事务堆积，执行可能会延后
         wait(new WaitConditional() {
             @Override
             public boolean shouldWait() {
-                return executedTransaction[0];
+                return !executedTransaction[0];
             }
-        }, 60);
+        }, 5 * 60);
         
         wait(null, 6);
 
+        String leftTransactionName = "";
+        for (TransactionManager.Transaction t : manager.transactionList) {
+            leftTransactionName += " " + t.name + " ";
+        }
+        int transactionCountAfter = manager.transactionList.size();
+
+        long timestamp = Utils.currentSecondTimestamp();
+        String assertInfo = "manager action count before:" + actionCountBefore;
+        assertInfo += " manager action count after:" + manager.actionCount;
+        assertInfo += " manager transaction count before:" + transactionCountBefore;
+        assertInfo += " manager transaction count after:" + transactionCountAfter;
+        assertInfo += " manager left transaction:" + leftTransactionName;
+        assertInfo += " normal.executedCount:" + normal.executedCount;
+        assertInfo += " normal nextExecutionTime:" + normal.nextExecutionTime;
+        assertInfo += " now:" + timestamp;
+        assertInfo += " should action:" + normal.shouldAction();
+        assertInfo += " maybeCompleted:" + normal.maybeCompleted();
+
+        assertTrue("timestamp:: " + assertInfo, normal.nextExecutionTime < timestamp);
+        assertTrue("maybeCompleted:: " + assertInfo, normal.maybeCompleted());
+        assertEquals("executedCount:: " + assertInfo, 1, normal.executedCount);
+
         boolean exist = manager.existTransactionsForName(normalName);
         assertFalse(exist);
         exist = manager.existTransactionsForName(timeName);
diff --git a/library/src/main/java/com/qiniu/android/transaction/TransactionManager.java b/library/src/main/java/com/qiniu/android/transaction/TransactionManager.java
@@ -3,7 +3,6 @@
 import com.qiniu.android.utils.Utils;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -14,10 +13,12 @@
 public class TransactionManager {
 
     /// 事务链表
-    private final ConcurrentLinkedQueue<Transaction> transactionList = new ConcurrentLinkedQueue<>();
+    protected final ConcurrentLinkedQueue<Transaction> transactionList = new ConcurrentLinkedQueue<>();
     /// 事务定时器
     private Timer timer;
 
+    protected long actionCount = 0;
+
     private static final TransactionManager transactionManager = new TransactionManager();
 
     private TransactionManager() {
@@ -28,9 +29,8 @@ public static TransactionManager getInstance() {
     }
 
     /// 根据name查找事务
-    public synchronized ArrayList<Transaction> transactionsForName(String name) {
+    public ArrayList<Transaction> transactionsForName(String name) {
         ArrayList<Transaction> arrayList = new ArrayList<>();
-        Transaction[] transactionList = this.transactionList.toArray(new Transaction[0]);
         for (Transaction transaction : transactionList) {
             if ((name == null && transaction.name == null) || (transaction.name != null && transaction.name.equals(name))) {
                 arrayList.add(transaction);
@@ -40,9 +40,8 @@ public synchronized ArrayList<Transaction> transactionsForName(String name) {
     }
 
     /// 是否存在某个名称的事务
-    public synchronized boolean existTransactionsForName(String name) {
+    public boolean existTransactionsForName(String name) {
         boolean isExist = false;
-        Transaction[] transactionList = this.transactionList.toArray(new Transaction[0]);
         for (Transaction transaction : transactionList) {
             if ((name == null && transaction.name == null) || (transaction.name != null && transaction.name.equals(name))) {
                 isExist = true;
@@ -53,7 +52,7 @@ public synchronized boolean existTransactionsForName(String name) {
     }
 
     /// 添加一个事务
-    public synchronized void addTransaction(Transaction transaction) {
+    public void addTransaction(Transaction transaction) {
         if (transaction == null) {
             return;
         }
@@ -62,7 +61,7 @@ public synchronized void addTransaction(Transaction transaction) {
     }
 
     /// 移除一个事务
-    public synchronized void removeTransaction(Transaction transaction) {
+    public void removeTransaction(Transaction transaction) {
         if (transaction == null) {
             return;
         }
@@ -78,7 +77,7 @@ public synchronized void performTransaction(Transaction transaction) {
         if (!transactionList.contains(transaction)) {
             transactionList.add(transaction);
         }
-        transaction.createTime = Utils.currentSecondTimestamp() - transaction.interval;
+        transaction.nextExecutionTime = Utils.currentSecondTimestamp();
     }
 
     /// 销毁资源 清空事务链表 销毁常驻线程
@@ -89,11 +88,6 @@ public synchronized void destroyResource() {
 
 
     private void handleAllTransaction() {
-        Transaction[] transactionList = null;
-        synchronized (this) {
-            transactionList = this.transactionList.toArray(new Transaction[0]);
-        }
-
         for (Transaction transaction : transactionList) {
             handleTransaction(transaction);
             if (transaction.maybeCompleted()) {
@@ -126,6 +120,7 @@ private void invalidateTimer() {
     }
 
     private void timerAction() {
+        actionCount += 1;
         handleAllTransaction();
     }
 
@@ -150,9 +145,11 @@ public static class Transaction {
         private final int interval;
         // 创建时间
         private long createTime;
+        // 下一次需要执行的时间
+        protected long nextExecutionTime;
 
         // 已执行次数
-        private long executedCount = 0;
+        protected long executedCount = 0;
         private boolean isExecuting = false;
 
 
@@ -166,6 +163,7 @@ public Transaction(String name,
             this.interval = 0;
             this.actionHandler = actionHandler;
             this.createTime = Utils.currentSecondTimestamp();
+            this.nextExecutionTime = this.createTime + after;
         }
 
 
@@ -180,20 +178,21 @@ public Transaction(String name,
             this.interval = interval;
             this.actionHandler = actionHandler;
             this.createTime = Utils.currentSecondTimestamp();
+            this.nextExecutionTime = this.createTime + after;
         }
 
-        private boolean shouldAction() {
+        protected boolean shouldAction() {
             long currentTime = Utils.currentSecondTimestamp();
             if (this.type == TransactionTypeNormal) {
-                return executedCount < 1 && (currentTime - createTime) >= after;
+                return executedCount < 1 && currentTime >= nextExecutionTime;
             } else if (this.type == TransactionTypeTime) {
-                return (currentTime - createTime) >= (executedCount * interval + after);
+                return currentTime >= nextExecutionTime;
             } else {
                 return false;
             }
         }
 
-        private boolean maybeCompleted() {
+        protected boolean maybeCompleted() {
             if (this.type == TransactionTypeNormal) {
                 return executedCount > 0;
             } else if (this.type == TransactionTypeTime) {
@@ -208,9 +207,15 @@ private synchronized void handleAction() {
                 return;
             }
             if (actionHandler != null) {
-                executedCount += 1;
                 isExecuting = true;
-                actionHandler.run();
+                executedCount += 1;
+
+                try {
+                    actionHandler.run();
+                } catch (Exception ignored) {
+                }
+
+                nextExecutionTime = Utils.currentSecondTimestamp() + interval;
                 isExecuting = false;
             }
         }
diff --git a/library/src/main/java/com/qiniu/android/utils/Utils.java b/library/src/main/java/com/qiniu/android/utils/Utils.java
@@ -109,7 +109,7 @@ public static long currentTimestamp() {
 
     // 单位：秒
     public static long currentSecondTimestamp() {
-        return new Date().getTime() / 1000;
+        return currentTimestamp() / 1000;
     }
 
     /// 两个时间的时间段 单位：毫秒

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static long currentTimestamp() {`
`109`	`109`
`110`	`110`	`// 单位：秒`
`111`	`111`	`public static long currentSecondTimestamp() {`
`112`		`- return new Date().getTime() / 1000;`
	`112`	`+ return currentTimestamp() / 1000;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/// 两个时间的时间段单位：毫秒`