优化内存管理,增加最大内存配置项,改进内存使用检查逻辑。

This commit is contained in:
jxxghp
2025-06-03 12:25:13 +08:00
parent 841209adc9
commit de7c9be11b
3 changed files with 35 additions and 18 deletions

View File

@@ -41,12 +41,11 @@ class TorrentsChain(ChainBase, metaclass=Singleton):
self.torrenthelper = TorrentHelper()
# 初始化内存管理器
self.memory_manager = MemoryManager()
# 启动内存监控(如果需要)
if settings.BIG_MEMORY_MODE:
self.memory_manager.set_threshold(85) # 大内存模式下提高阈值
else:
self.memory_manager.set_threshold(75) # 普通模式下较低阈值
# 设置内存阈值和启动监控
max_memory = settings.CACHE_CONF['memory']
self.memory_manager.set_threshold(max_memory)
self.memory_manager.start_monitoring()
logger.info(f"内存监控已启用 - 阈值: {max_memory}MB")
def __del__(self):
"""

View File

@@ -546,7 +546,8 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
"tmdb": "TMDB请求缓存数量",
"douban": "豆瓣请求缓存数量",
"fanart": "Fanart请求缓存数量",
"meta": "元数据缓存过期时间(秒)"
"meta": "元数据缓存过期时间(秒)",
"memory": "最大占用内存MB"
}
"""
if self.BIG_MEMORY_MODE:
@@ -557,7 +558,8 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
"douban": 512,
"bangumi": 512,
"fanart": 512,
"meta": (self.META_CACHE_EXPIRE or 24) * 3600
"meta": (self.META_CACHE_EXPIRE or 24) * 3600,
"memory": 2 * 1024
}
return {
"torrents": 100,
@@ -566,7 +568,8 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
"douban": 256,
"bangumi": 256,
"fanart": 128,
"meta": (self.META_CACHE_EXPIRE or 2) * 3600
"meta": (self.META_CACHE_EXPIRE or 2) * 3600,
"memory": 1024
}
@property

View File

@@ -14,13 +14,12 @@ class MemoryManager(metaclass=Singleton):
"""
def __init__(self):
self._memory_threshold = 80 # 内存使用阈值(%)
self._memory_threshold = 512 # 内存使用阈值(MB)
self._check_interval = 300 # 检查间隔(秒)
self._monitoring = False
self._monitor_thread: Optional[threading.Thread] = None
@staticmethod
def get_memory_usage() -> dict:
def get_memory_usage(self) -> dict:
"""
获取当前内存使用情况
"""
@@ -59,14 +58,19 @@ class MemoryManager(metaclass=Singleton):
def check_memory_and_cleanup(self) -> bool:
"""
检查内存使用,如果过高则执行清理
检查内存使用,如果超过阈值则执行清理
:return: 是否执行了清理
"""
memory_info = self.get_memory_usage()
current_memory_mb = memory_info['rss']
if memory_info['percent'] > self._memory_threshold:
logger.warning(f"内存使用率过高: {memory_info['percent']:.1f}%, 开始清理...")
if current_memory_mb > self._memory_threshold:
logger.warning(f"内存使用超过阈值: {current_memory_mb:.1f}MB > {self._memory_threshold}MB, 开始清理...")
self.force_gc()
# 再次检查清理效果
after_memory = self.get_memory_usage()
logger.info(f"清理后内存: {after_memory['rss']:.1f}MB")
return True
return False
@@ -80,7 +84,7 @@ class MemoryManager(metaclass=Singleton):
self._monitoring = True
self._monitor_thread = threading.Thread(target=self._monitor_loop, daemon=True)
self._monitor_thread.start()
logger.info("内存监控已启动")
logger.info(f"内存监控已启动 - 阈值: {self._memory_threshold}MB, 检查间隔: {self._check_interval}")
def stop_monitoring(self):
"""
@@ -103,17 +107,28 @@ class MemoryManager(metaclass=Singleton):
logger.error(f"内存监控出错: {e}")
time.sleep(60) # 出错后等待1分钟再继续
def set_threshold(self, threshold: int):
def set_threshold(self, threshold_mb: int):
"""
设置内存使用阈值
设置内存使用阈值
:param threshold_mb: 内存阈值单位MB50-4096之间
"""
self._memory_threshold = max(50, min(95, threshold))
self._memory_threshold = max(50, min(4096, threshold_mb))
logger.info(f"内存阈值已设置为: {self._memory_threshold}MB")
def set_check_interval(self, interval: int):
"""
设置检查间隔
:param interval: 检查间隔单位秒最少60秒
"""
self._check_interval = max(60, interval)
logger.info(f"内存检查间隔已设置为: {self._check_interval}")
def get_threshold(self) -> int:
"""
获取当前内存阈值
:return: 当前阈值(MB)
"""
return self._memory_threshold
def memory_optimized(force_gc_after: bool = False, log_memory: bool = False):