增加游戏超时删除机制

Author: pineoncellar

__pycache__/test1.cpython-38.pyc

@@ -259,6 +259,8 @@ def step(self, data):
             self.get_acting_player_position()
             self.game_infoset = self.get_infoset()
 
+        self.timestamp = time.time()  # 更新时间
+
         # print(f"result:{result}  confidence:{confidence}")
         return result, confidence
 

douzero/env/__pycache__/game.cpython-38.pyc

@@ -176,7 +176,7 @@ def init(data):
                 if env.game_over:
                     # print("{}win, game over!\n".format("farmer" if env.winner == "farmer" else "landlord"))
                     res_game_over = True
-                    env = None
+                    del env_list[pid]
 
                 res_data = {
                     "pid": pid,
@@ -319,7 +319,8 @@ def init(data):
                 }
                 res_action = "play"
 
-            env_list[pid] = env
+            if not res_game_over:
+                env_list[pid] = env
             res_status = "ok"
     except Exception as err:
         res_action = "init"
@@ -373,7 +374,7 @@ def next(data):  # 收到他人出牌
         env.step(data) # 上报玩家出牌
         if env.game_over:
             res_game_over = True
-            env = None
+            del env_list[pid]
             return {"action": "receive", "data": {}}
 
         else:
@@ -385,15 +386,15 @@ def next(data):  # 收到他人出牌
                 if env.game_over:
                     # print("{}win, game over!\n".format("farmer" if env.winner == "farmer" else "landlord"))
                     res_game_over = True
-                    env = None
+                    del env_list[pid]
                 else:
                     if env.acting_player_position in list(
                         env.players.keys()
                     ):  # 第二位出牌的还是ai，也就是双ai时
                         cards_po, confidence_po = env.step(data)
                         if env.game_over:
                             res_game_over = True
-                            env = None
+                            del env_list[pid]
                     else:  # 单ai时
                         pass
 
@@ -416,7 +417,8 @@ def next(data):  # 收到他人出牌
                 res_data = {"pid": pid, "game_over": res_game_over}
                 res_action = "receive"
 
-        env_list[pid] = env
+        if not res_game_over :
+            env_list[pid] = env
         res_status = "ok"
     except Exception as err:
         res_action = "step"

douzero/env/game.py

@@ -1,13 +1,17 @@
 port = 24813
+timeout = 18000  # 超过此时长游戏未继续进行则删除游戏进程
 ###############################################################################################
-version = 1.0
+version = 1.1
 ###############################################################################################
 import os
 import time
 import json
-from douzero.evaluation.simulation import init, next
+import threading
+from douzero.evaluation.simulation import init, next, env_list
 from http.server import HTTPServer, BaseHTTPRequestHandler
 
+lock = threading.Lock()
+
 """post data
 {
     action: "", #init/play
@@ -114,13 +118,31 @@ def do_POST(self):
         self.wfile.write(res)
 
 
+class TimeCheck(threading.Thread):
+    def run(self):
+        while True:
+            global env_list
+            with lock:
+                timestamp = time.time()
+                tmp_env_list = dict(env_list.items())
+                for k, v in tmp_env_list.items():
+                    existed_times = timestamp - v.timestamp
+                    if existed_times > timeout:
+                        del env_list[k]
+                        print(f"pid:{k} game timeout, deleted.")
+            time.sleep(300)
+
+
 if __name__ == "__main__":
     print(f"DouZero_API . ver{version}")
 
     # 才疏学浅，不知道这两行的用途与意义，暂且保留
     os.environ["KMP_DUPLICATE_LIB_OK"] = "True"
     os.environ["CUDA_VISIBLE_DEVICES"] = "0"
 
+    time_check = TimeCheck()
+    time_check.start()
+
     host = ("127.0.0.1", port)
     print(f"listen at port {port}")
     server = HTTPServer(host, Request)