From 1cd5fe0b02784b0ea03d75edb3a86c586727f85e Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Fri, 12 Jan 2018 09:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SERVER=5FEXECUTOR=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E7=9A=84=E8=B5=84=E6=BA=90=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/boot/Application.java        |  5 +++++
 src/org/redkale/boot/NodeServer.java         |  4 ++++
 src/org/redkale/net/Server.java              | 10 ++++++++--
 src/org/redkale/service/AbstractService.java | 20 +++++++++++++++-----
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java
index f850fd94d..9f5a5dd98 100644
--- a/src/org/redkale/boot/Application.java
+++ b/src/org/redkale/boot/Application.java
@@ -92,6 +92,11 @@ public final class Application {
      */
     public static final String RESNAME_SERVER_ROOT = Server.RESNAME_SERVER_ROOT;
 
+    /**
+     * 当前Server的线程池
+     */
+    public static final String RESNAME_SERVER_EXECUTOR = Server.RESNAME_SERVER_EXECUTOR;
+
     //本地IP地址
     final InetAddress localAddress;
 
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index 6f25f7441..025eb4920 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -140,6 +140,10 @@ public abstract class NodeServer {
         }
         //必须要进行初始化， 构建Service时需要使用Context中的ExecutorService
         server.init(this.serverConf);
+        //init之后才有Executor
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, Executor.class, server.getExecutor());
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ExecutorService.class, server.getExecutor());
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ThreadPoolExecutor.class, server.getExecutor());
 
         initResource(); //给 DataSource、CacheSource 注册依赖注入时的监听回调事件。
         String interceptorClass = this.serverConf.getValue("interceptor", "");
diff --git a/src/org/redkale/net/Server.java b/src/org/redkale/net/Server.java
index d2db3fdf9..0238bf0a1 100644
--- a/src/org/redkale/net/Server.java
+++ b/src/org/redkale/net/Server.java
@@ -31,6 +31,8 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
 
     public static final String RESNAME_SERVER_ROOT = "SERVER_ROOT";
 
+    public static final String RESNAME_SERVER_EXECUTOR = "SERVER_EXECUTOR";
+
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
     //-------------------------------------------------------------
@@ -90,7 +92,7 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
 
     //最大连接数
     protected int maxconns;
-    
+
     protected Server(long serverStartTime, String protocol, PrepareServlet<K, C, R, P, S> servlet) {
         this.serverStartTime = serverStartTime;
         this.protocol = protocol;
@@ -146,6 +148,10 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         this.prepare.destroy(context, config);
     }
 
+    public ThreadPoolExecutor getExecutor() {
+        return executor;
+    }
+
     public InetSocketAddress getSocketAddress() {
         return address;
     }
@@ -192,7 +198,7 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         }
         serverChannel.bind(address, backlog);
         serverChannel.setMaxconns(this.maxconns);
-        serverChannel.accept(); 
+        serverChannel.accept();
         final String threadName = "[" + Thread.currentThread().getName() + "] ";
         logger.info(threadName + this.getClass().getSimpleName() + ("TCP".equalsIgnoreCase(protocol) ? "" : ("." + protocol)) + " listen: " + address
             + ", threads: " + threads + ", bufferCapacity: " + bufferCapacity + ", bufferPoolSize: " + bufferPoolSize + ", responsePoolSize: " + responsePoolSize
diff --git a/src/org/redkale/service/AbstractService.java b/src/org/redkale/service/AbstractService.java
index 071e26444..0d8a55215 100644
--- a/src/org/redkale/service/AbstractService.java
+++ b/src/org/redkale/service/AbstractService.java
@@ -6,7 +6,8 @@
 package org.redkale.service;
 
 import java.util.concurrent.*;
-import org.redkale.net.WorkThread;
+import javax.annotation.Resource;
+import org.redkale.net.*;
 
 /**
  *
@@ -14,16 +15,25 @@ import org.redkale.net.WorkThread;
  */
 public abstract class AbstractService implements Service {
 
+    //如果开启了SNCP，此处线程池为SncpServer的线程池
+    @Resource(name = Server.RESNAME_SERVER_EXECUTOR)
+    private ExecutorService serverExecutor;
+
     protected void runAsync(Runnable runner) {
-        Thread thread = Thread.currentThread();
-        if (thread instanceof WorkThread) {
-            ((WorkThread) thread).runAsync(runner);
+        if (serverExecutor != null) {
+            serverExecutor.execute(runner);
         } else {
-            ForkJoinPool.commonPool().execute(runner);
+            Thread thread = Thread.currentThread();
+            if (thread instanceof WorkThread) {
+                ((WorkThread) thread).runAsync(runner);
+            } else {
+                ForkJoinPool.commonPool().execute(runner);
+            }
         }
     }
 
     protected ExecutorService getExecutor() {
+        if (serverExecutor != null) return serverExecutor;
         Thread thread = Thread.currentThread();
         if (thread instanceof WorkThread) {
             return ((WorkThread) thread).getExecutor();