新增了部分资源释放问题的 bug，关闭线程池时都改为了立即关闭

Author: blinkfox

.travis.yml

@@ -2,7 +2,6 @@ language: java
 sudo: false # faster builds
 
 jdk:
-  - oraclejdk8
   - openjdk8
 
 script: "mvn cobertura:cobertura"

README.md

@@ -1,12 +1,12 @@
 # stalker
 
-[![HitCount](http://hits.dwyl.io/blinkfox/stalker.svg)](http://hits.dwyl.io/blinkfox/stalker) [![Build Status](https://secure.travis-ci.org/blinkfox/stalker.svg)](https://travis-ci.org/blinkfox/stalker) [![GitHub license](https://img.shields.io/github/license/blinkfox/stalker.svg)](https://github.com/blinkfox/stalker/blob/master/LICENSE) [![codecov](https://codecov.io/gh/blinkfox/stalker/branch/master/graph/badge.svg)](https://codecov.io/gh/blinkfox/stalker) ![Java Version](https://img.shields.io/badge/Java-%3E%3D%208-blue.svg)
+[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fblinkfox%2Fstalker&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com) [![Build Status](https://secure.travis-ci.org/blinkfox/stalker.svg)](https://travis-ci.org/blinkfox/stalker) [![GitHub license](https://img.shields.io/github/license/blinkfox/stalker.svg)](https://github.com/blinkfox/stalker/blob/master/LICENSE) [![codecov](https://codecov.io/gh/blinkfox/stalker/branch/master/graph/badge.svg)](https://codecov.io/gh/blinkfox/stalker) ![Java Version](https://img.shields.io/badge/Java-%3E%3D%208-blue.svg)
 
-> 这是一个简单的用来对 Java 代码做性能评估和性能测试的工具库。
+> 这是一个简单、轻量级和可编程的 Java 代码性能测试工具库。
 
 ## 一、特性
 
-- 简单、轻量级（jar包仅`52kb`）
+- 简单、轻量级（jar 包仅`52kb`）和可编程的性能测试工具库
 - 支持对性能的多种统计纬度
 - API 简单易用，易于集成或扩展
 
@@ -18,14 +18,14 @@
 <dependency>
     <groupId>com.blinkfox</groupId>
     <artifactId>stalker</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
 </dependency>
 ```
 
 ### 2. Gradle
 
 ```bash
-compile 'com.blinkfox:stalker:1.2.2'
+compile 'com.blinkfox:stalker:1.2.3'
 ```
 
 ## 三、API 介绍和使用
@@ -362,6 +362,8 @@ Assert.assertFaster(Options.of(),
 
 ## 五、变更日志
 
+- v1.2.3 修复 StalkerFuture 资源关闭不完全的 bug (2021-11-26)
+  - 修复了 StalkerFuture 中 `done` 方法完成后资源关闭不完全的 `bug`；
 - v1.2.2 新增了部分 API (2020-06-16)
   - 新增了和改进了部分 API；
 - v1.2.1 新增了部分 API (2020-06-15)

blinkfox-checks.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.blinkfox</groupId>
     <artifactId>stalker</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
     <packaging>jar</packaging>
 
     <name>stalker</name>
@@ -16,7 +16,7 @@
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
@@ -49,26 +49,26 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.32</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.32</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -109,12 +109,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.30</version>
+                        <version>8.41.1</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -134,7 +134,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

pom.xml

@@ -29,8 +29,7 @@ public class StalkerFuture implements RunnableFuture<List<Object>> {
     /**
      * 用于异步提交任务的线程池.
      */
-    private static final ExecutorService executor =
-            StalkerExecutors.newThreadExecutor(4, 16, "stalker-future-thread");
+    private final ExecutorService executor;
 
     /**
      * 用于异步定时更新统计数据的线程池.
@@ -74,6 +73,7 @@ public StalkerFuture(Options options, Runnable runnable, MeasureRunner measureRu
         this.options = options;
         this.runnable = runnable;
         this.measureRunner = measureRunner;
+        this.executor = StalkerExecutors.newSingleThreadExecutor("stalker-future-thread");
 
         // 如果启用了定时更新统计数据的任务，就构造定时任务线程池，并开启异步定时获取统计数据的任务.
         ScheduledUpdater scheduledUpdater = options.getScheduledUpdater();
@@ -180,7 +180,7 @@ public StalkerFuture waitDone(Consumer<StalkerFuture> waitPeriodConsumer, long p
     public StalkerFuture done(Consumer<StalkerFuture> futureConsumer) {
         // 如果没完成，就阻塞休眠一定的时间，再判断是否完成了.
         while (!this.isDone()) {
-            this.sleep(200L);
+            this.sleep(50L);
         }
 
         // 完成后执行对应的回调任务.
@@ -260,7 +260,7 @@ private void stopFutures() {
 
         // 如果线程池未关闭，就关闭线程池，注意，这里不要理解关闭和立即终止正在运行中的任务，防止最后的统计数据更新异常.
         if (this.scheduledUpdateExecutor != null && !this.scheduledUpdateExecutor.isShutdown()) {
-            this.scheduledUpdateExecutor.shutdown();
+            this.scheduledUpdateExecutor.shutdownNow();
         }
         if (this.scheduledUpdateFuture != null && !this.scheduledUpdateFuture.isDone()) {
             this.scheduledUpdateFuture.cancel(false);

src/main/java/com/blinkfox/stalker/result/StalkerFuture.java

@@ -52,7 +52,7 @@ public MeasureResult run(Options options, Runnable runnable) {
         // 初始化存储的集合、线程池、并发工具类中的对象实例等.
         Semaphore semaphore = new Semaphore(concurrens);
         CountDownLatch countLatch = new CountDownLatch(threads);
-        super.executorService = StalkerExecutors.newFixedThreadExecutor(threads, "concurrent-measure-thread");
+        super.executorService = StalkerExecutors.newFixedThreadExecutor(threads, "stalker-concurrent-measure");
         super.startNanoTime = System.nanoTime();
 
         // 在多线程下控制线程并发量，与循环搭配来一起执行和测量.
@@ -83,7 +83,7 @@ public MeasureResult run(Options options, Runnable runnable) {
         this.await(countLatch);
         super.setEndNanoTimeIfEmpty(System.nanoTime());
         super.completed.compareAndSet(false, true);
-        StalkerExecutors.shutdown(this.executorService);
+        StalkerExecutors.shutdownNow(this.executorService);
         return super.getMeasureResult();
     }
 

src/main/java/com/blinkfox/stalker/runner/ConcurrentMeasureRunner.java

@@ -38,9 +38,9 @@ public class ConcurrentScheduledMeasureRunner extends ConcurrentMeasureRunner {
      */
     public ConcurrentScheduledMeasureRunner() {
         super();
-        this.scheduledExecutorService = StalkerExecutors.newScheduledThreadPool(1, "concurrent-scheduled-thread");
+        this.scheduledExecutorService = StalkerExecutors.newScheduledThreadPool(1, "stalker-concurrent-scheduled");
         super.executorService = StalkerExecutors.newFixedThreadExecutor(
-                StalkerExecutors.MAX_POOL_SIZE, "concurrent-measure-thread");
+                StalkerExecutors.MAX_POOL_SIZE, "stalker-concurrent-scheduled-measure");
     }
 
     /**
@@ -95,7 +95,7 @@ public MeasureResult run(Options options, Runnable runnable) {
         // 等待所有线程执行完毕，记录是否完成和完成时间，并关闭线程池等资源，最后将结果封装成实体信息返回.
         super.setEndNanoTimeIfEmpty(System.nanoTime());
         super.completed.compareAndSet(false, true);
-        StalkerExecutors.shutdown(this.executorService, this.scheduledExecutorService);
+        StalkerExecutors.shutdownNow(this.executorService, this.scheduledExecutorService);
         if (!this.scheduledFuture.isDone()) {
             this.scheduledFuture.cancel(true);
         }
@@ -110,7 +110,7 @@ public void stop() {
         super.stop();
 
         // 关闭定时任务线程池和取消对应的定时任务.
-        StalkerExecutors.shutdown(this.scheduledExecutorService);
+        StalkerExecutors.shutdownNow(this.scheduledExecutorService);
         if (this.scheduledFuture != null && !this.scheduledFuture.isDone()) {
             this.scheduledFuture.cancel(true);
         }

src/main/java/com/blinkfox/stalker/runner/ConcurrentScheduledMeasureRunner.java

@@ -28,6 +28,7 @@ public class SimpleMeasureRunner extends AbstractMeasureRunner {
      */
     public SimpleMeasureRunner() {
         super();
+        super.executorService = StalkerExecutors.newSingleThreadExecutor("stalker-simple-measure");
     }
 
     /**
@@ -41,12 +42,11 @@ public SimpleMeasureRunner() {
     public MeasureResult run(Options options, Runnable runnable) {
         boolean printErrorLog = options.isPrintErrorLog();
         int totalCount = options.getThreads() * options.getRuns();
-        super.executorService = StalkerExecutors.newSingleThreadExecutor("simple-measure-thread");
         super.startNanoTime = System.nanoTime();
 
         // 由于并发数是 1，直接单线程循环执行 (runs * threads) 次即可，
         // 将执行的相关任务以 Future 的形式来执行，便于程序动态取消任务或判断任务执行情况等.
-        this.measureFuture = executorService.submit(() -> {
+        this.measureFuture = super.executorService.submit(() -> {
             for (int i = 0; i < totalCount; ++i) {
                 try {
                     // 开始执行测量任务，记录开始时间、执行次数等.
@@ -75,7 +75,7 @@ public MeasureResult run(Options options, Runnable runnable) {
         // 等待所有线程执行完毕，并关闭线程池，最后将结果封装成实体信息.
         super.setEndNanoTimeIfEmpty(System.nanoTime());
         super.completed.compareAndSet(false, true);
-        StalkerExecutors.shutdown(super.executorService);
+        StalkerExecutors.shutdownNow(super.executorService);
         return super.getMeasureResult();
     }
 

src/main/java/com/blinkfox/stalker/runner/SimpleMeasureRunner.java

@@ -35,8 +35,8 @@ public class SimpleScheduledMeasureRunner extends SimpleMeasureRunner {
      */
     public SimpleScheduledMeasureRunner() {
         super();
-        this.scheduledExecutorService = StalkerExecutors.newScheduledThreadPool(1, "simple-scheduled-thread");
-        super.executorService = StalkerExecutors.newSingleThreadExecutor("simple-scheduled-measure-thread");
+        this.scheduledExecutorService = StalkerExecutors.newScheduledThreadPool(1, "stalker-simple-scheduled");
+        super.executorService = StalkerExecutors.newSingleThreadExecutor("stalker-simple-scheduled-measure");
     }
 
     /**
@@ -97,7 +97,10 @@ public MeasureResult run(Options options, Runnable runnable) {
         // 如果没有设置相关的结束信息资源，就设置，没有关闭相关的资源就进行关闭.
         super.setEndNanoTimeIfEmpty(System.nanoTime());
         super.completed.compareAndSet(false, true);
-        StalkerExecutors.shutdown(super.executorService, this.scheduledExecutorService);
+        StalkerExecutors.shutdownNow(super.executorService, this.scheduledExecutorService);
+        if (!this.scheduledFuture.isDone()) {
+            this.scheduledFuture.cancel(true);
+        }
         return super.getMeasureResult();
     }
 

src/main/java/com/blinkfox/stalker/runner/SimpleScheduledMeasureRunner.java

@@ -235,7 +235,7 @@ public void submitWithStop() throws InterruptedException {
     @Test
     public void submitWithDuration() {
         // 构造新的输出结果.
-        Options options = Options.ofDurationSeconds(5, 3).warmups(0)
+        Options options = Options.ofDurationSeconds(15, 3).warmups(0)
                 .outputs(MeasureOutput.ofList(new AsciiTableOutput()));
 
         Stalker.submit(options, () -> new MyTestService().slowHello())