Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-07-21 13:46:56 +02:00
Code Issues Projects Releases Wiki Activity

Make all SHM management untracked (#15011)

Browse Source
This commit is contained in:
Nicolas Mowen 2024-11-15 14:14:37 -07:00 committed by GitHub
parent e407ba47c2
commit 206ed06905
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frigate/app.py
View File

@ -68,6 +68,7 @@ from frigate.stats.util import stats_init
from frigate.storage import StorageMaintainer from frigate.storage import StorageMaintainer
from frigate.timeline import TimelineProcessor from frigate.timeline import TimelineProcessor
from frigate.util.builtin import empty_and_close_queue from frigate.util.builtin import empty_and_close_queue
from frigate.util.image import UntrackedSharedMemory
from frigate.util.object import get_camera_regions_grid from frigate.util.object import get_camera_regions_grid
from frigate.version import VERSION from frigate.version import VERSION
from frigate.video import capture_camera, track_camera from frigate.video import capture_camera, track_camera
@ -325,20 +326,20 @@ class FrigateApp:
for det in self.config.detectors.values() for det in self.config.detectors.values()
] ]
) )
shm_in = mp.shared_memory.SharedMemory( shm_in = UntrackedSharedMemory(
name=name, name=name,
create=True, create=True,
size=largest_frame, size=largest_frame,
) )
except FileExistsError: except FileExistsError:
shm_in = mp.shared_memory.SharedMemory(name=name) shm_in = UntrackedSharedMemory(name=name)
try: try:
shm_out = mp.shared_memory.SharedMemory( shm_out = UntrackedSharedMemory(
name=f"out-{name}", create=True, size=20 * 6 * 4 name=f"out-{name}", create=True, size=20 * 6 * 4
) )
except FileExistsError: except FileExistsError:
shm_out = mp.shared_memory.SharedMemory(name=f"out-{name}") shm_out = UntrackedSharedMemory(name=f"out-{name}")
self.detection_shms.append(shm_in) self.detection_shms.append(shm_in)
self.detection_shms.append(shm_out) self.detection_shms.append(shm_out)

10
frigate/object_detection.py
View File

@ -19,7 +19,7 @@ from frigate.detectors.detector_config import (
) )
from frigate.detectors.plugins.rocm import DETECTOR_KEY as ROCM_DETECTOR_KEY from frigate.detectors.plugins.rocm import DETECTOR_KEY as ROCM_DETECTOR_KEY
from frigate.util.builtin import EventsPerSecond, load_labels from frigate.util.builtin import EventsPerSecond, load_labels
from frigate.util.image import SharedMemoryFrameManager from frigate.util.image import SharedMemoryFrameManager, UntrackedSharedMemory
from frigate.util.services import listen from frigate.util.services import listen
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -122,7 +122,7 @@ def run_detector(
outputs = {} outputs = {}
for name in out_events.keys(): for name in out_events.keys():
out_shm = mp.shared_memory.SharedMemory(name=f"out-{name}", create=False) out_shm = UntrackedSharedMemory(name=f"out-{name}", create=False)
out_np = np.ndarray((20, 6), dtype=np.float32, buffer=out_shm.buf) out_np = np.ndarray((20, 6), dtype=np.float32, buffer=out_shm.buf)
outputs[name] = {"shm": out_shm, "np": out_np} outputs[name] = {"shm": out_shm, "np": out_np}
@ -212,15 +212,13 @@ class RemoteObjectDetector:
self.detection_queue = detection_queue self.detection_queue = detection_queue
self.event = event self.event = event
self.stop_event = stop_event self.stop_event = stop_event
self.shm = mp.shared_memory.SharedMemory(name=self.name, create=False) self.shm = UntrackedSharedMemory(name=self.name, create=False)
self.np_shm = np.ndarray( self.np_shm = np.ndarray(
(1, model_config.height, model_config.width, 3), (1, model_config.height, model_config.width, 3),
dtype=np.uint8, dtype=np.uint8,
buffer=self.shm.buf, buffer=self.shm.buf,
) )
self.out_shm = mp.shared_memory.SharedMemory( self.out_shm = UntrackedSharedMemory(name=f"out-{self.name}", create=False)
name=f"out-{self.name}", create=False
)
self.out_np_shm = np.ndarray((20, 6), dtype=np.float32, buffer=self.out_shm.buf) self.out_np_shm = np.ndarray((20, 6), dtype=np.float32, buffer=self.out_shm.buf)
def detect(self, tensor_input, threshold=0.4): def detect(self, tensor_input, threshold=0.4):

16
frigate/util/image.py
View File

@ -733,7 +733,7 @@ class FrameManager(ABC):
pass pass
class SharedMemory(_mpshm.SharedMemory): class UntrackedSharedMemory(_mpshm.SharedMemory):
# https://github.com/python/cpython/issues/82300#issuecomment-2169035092 # https://github.com/python/cpython/issues/82300#issuecomment-2169035092
__lock = threading.Lock() __lock = threading.Lock()
@ -744,7 +744,7 @@ class SharedMemory(_mpshm.SharedMemory):
create: bool = False, create: bool = False,
size: int = 0, size: int = 0,
*, *,
track: bool = True, track: bool = False,
) -> None: ) -> None:
self._track = track self._track = track
@ -779,10 +779,14 @@ class SharedMemory(_mpshm.SharedMemory):
class SharedMemoryFrameManager(FrameManager): class SharedMemoryFrameManager(FrameManager):
def __init__(self): def __init__(self):
self.shm_store: dict[str, SharedMemory] = {} self.shm_store: dict[str, UntrackedSharedMemory] = {}
def create(self, name: str, size) -> AnyStr: def create(self, name: str, size) -> AnyStr:
shm = SharedMemory(name=name, create=True, size=size, track=False) shm = UntrackedSharedMemory(
name=name,
create=True,
size=size,
)
self.shm_store[name] = shm self.shm_store[name] = shm
return shm.buf return shm.buf
@ -791,7 +795,7 @@ class SharedMemoryFrameManager(FrameManager):
if name in self.shm_store: if name in self.shm_store:
shm = self.shm_store[name] shm = self.shm_store[name]
else: else:
shm = SharedMemory(name=name, track=False) shm = UntrackedSharedMemory(name=name)
self.shm_store[name] = shm self.shm_store[name] = shm
return np.ndarray(shape, dtype=np.uint8, buffer=shm.buf) return np.ndarray(shape, dtype=np.uint8, buffer=shm.buf)
except FileNotFoundError: except FileNotFoundError:
@ -814,7 +818,7 @@ class SharedMemoryFrameManager(FrameManager):
del self.shm_store[name] del self.shm_store[name]
else: else:
try: try:
shm = SharedMemory(name=name, track=False) shm = UntrackedSharedMemory(name=name)
shm.close() shm.close()
shm.unlink() shm.unlink()
except FileNotFoundError: except FileNotFoundError: