Skip to content

Commit 18b5baf

Browse files
committed
Update memory_manager.py
1 parent 7296e3c commit 18b5baf

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

src/memory_manager.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"""
2-
Memory Manager - 内存使用监控和控制系统
3-
强制控制整体内存占用在指定限制以下
2+
Memory Manager - 内存监控和控制系统
43
"""
54
import gc
65
import psutil
@@ -47,7 +46,7 @@ def __init__(self):
4746

4847
def get_memory_usage(self) -> Dict[str, float]:
4948
"""返回空的内存使用情况"""
50-
return {'rss_mb': 0, 'vms_mb': 0, 'usage_percent': 0, 'limit_mb': 100, 'available_mb': 100, 'peak_mb': 0}
49+
return {'rss_mb': 0, 'usage_percent': 0, 'limit_mb': 100, 'available_mb': 100, 'peak_mb': 0}
5150

5251
def is_memory_pressure(self) -> bool:
5352
"""始终返回False"""
@@ -176,27 +175,25 @@ def _load_config(self):
176175
log.warning(f"加载内存配置失败,使用默认值: {e}")
177176

178177
def get_memory_usage(self) -> Dict[str, float]:
179-
"""获取当前内存使用情况"""
178+
"""获取当前物理内存使用情况"""
180179
try:
181180
memory_info = self.process.memory_info()
182-
rss_mb = memory_info.rss / 1024 / 1024 # RSS内存(MB)
183-
vms_mb = memory_info.vms / 1024 / 1024 # 虚拟内存(MB)
181+
rss_mb = memory_info.rss / 1024 / 1024 # 物理内存(MB)
184182

185183
# 更新峰值内存
186184
if rss_mb > self.peak_memory_mb:
187185
self.peak_memory_mb = rss_mb
188186

189187
return {
190188
'rss_mb': rss_mb,
191-
'vms_mb': vms_mb,
192189
'usage_percent': rss_mb / self.config.max_memory_mb,
193190
'limit_mb': self.config.max_memory_mb,
194191
'available_mb': self.config.max_memory_mb - rss_mb,
195192
'peak_mb': self.peak_memory_mb
196193
}
197194
except Exception as e:
198195
log.error(f"获取内存使用情况失败: {e}")
199-
return {'rss_mb': 0, 'vms_mb': 0, 'usage_percent': 0, 'limit_mb': self.config.max_memory_mb, 'available_mb': self.config.max_memory_mb, 'peak_mb': 0}
196+
return {'rss_mb': 0, 'usage_percent': 0, 'limit_mb': self.config.max_memory_mb, 'available_mb': self.config.max_memory_mb, 'peak_mb': 0}
200197

201198
def is_memory_pressure(self) -> bool:
202199
"""检查是否存在内存压力"""
@@ -451,9 +448,9 @@ def register_cache_for_cleanup(name: str, cache_manager: Any):
451448

452449

453450
def get_memory_usage() -> Dict[str, float]:
454-
"""获取内存使用情况的便捷函数"""
451+
"""获取物理内存使用情况的便捷函数"""
455452
if not MEMORY_MONITORING_ENABLED:
456-
return {'rss_mb': 0, 'vms_mb': 0, 'usage_percent': 0, 'limit_mb': 100, 'available_mb': 100, 'peak_mb': 0}
453+
return {'rss_mb': 0, 'usage_percent': 0, 'limit_mb': 100, 'available_mb': 100, 'peak_mb': 0}
457454
return memory_manager.get_memory_usage()
458455

459456

0 commit comments

Comments
 (0)