stu/asyncTool
1
0
Fork 0
mirror of https://gitee.com/jd-platform-opensource/asyncTool.git synced 2026-03-22 04:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix：最后一个任务不能执行的问题

Browse Source
This commit is contained in:
kyle
2022-03-18 16:20:45 +08:00
parent 3b5a50c5bb
commit db3a162d1a
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asyncTool-core/src/main/java/com/jd/platform/async/wrapper/WorkerWrapper.java
View File

@@ -362,7 +362,9 @@ public abstract class WorkerWrapper<T, V> {
wrapperStrategy.judgeAction(getDependWrappers(), this, fromWrapper);
switch (judge.getDependenceAction()) {
case TAKE_REST:
System.out.println("TAKE_REST\t"+id+"\t"+fromWrapper.id);
//FIXME 等待200毫秒重新投入线程池，主要为了调起最后一个任务
Thread.sleep(200L);
executorService.submit(() -> this.work(executorService, fromWrapper, remainTime, group));
return;
case FAST_FAIL:
if (setState(state, STARTED, ERROR)) {

2
asyncTool-core/src/main/java/com/jd/platform/async/wrapper/strategy/depend/DependenceStrategy.java
View File

@@ -1,6 +1,5 @@
package com.jd.platform.async.wrapper.strategy.depend;
import com.jd.platform.async.exception.SkippedException;
import com.jd.platform.async.worker.ResultState;
import com.jd.platform.async.worker.WorkResult;
import com.jd.platform.async.wrapper.WorkerWrapper;
@@ -111,7 +110,6 @@ public interface DependenceStrategy {
}
}
if (hasWaiting) {
System.out.println(Thread.currentThread().getName()+"\thasWaiting\t"+thisWrapper.getId()+"\t"+fromWrapper.getId());
return DependenceAction.TAKE_REST.emptyProperty();
}
return DependenceAction.START_WORK.emptyProperty();

9
asyncTool-core/src/test/java/v15/cases/Case1.java
View File

@@ -15,14 +15,17 @@ class Case1 {
return WorkerWrapper.<String, String>builder()
.id(id)
.worker((param, allWrappers) -> {
System.out.println("wrapper(id=" + id + ") is working");
try {
if ("F".equals(id)) {
Thread.sleep(50);
System.out.println("wrapper(id=" + id + ") is working");
Thread.sleep(5000);
}
} catch (InterruptedException e) {
e.printStackTrace();
}
if ("F".equals(id)) {
System.out.println("wrapper(id=" + id + ") is worki444ng");
}
return id;
});
}
@@ -44,7 +47,7 @@ class Case1 {
)
.build();
try {
Async.work(10000, a, d).awaitFinish();
Async.work(1000, a, d).awaitFinish();
} catch (InterruptedException e) {
e.printStackTrace();
}

1
asyncTool-openutil/src/main/java/com/jd/platform/async/openutil/timer/HashedWheelTimer.java
View File

@@ -315,6 +315,7 @@ public class HashedWheelTimer extends AbstractWheelTimer {
startTimeInitialized.countDown();
do {
//TODO 时间轮这里结束不了任务
final long deadline = waitForNextTick();
if (deadline > 0) {
int idx = (int) (tick & mask);