00dani/mpd-now-playable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5 from goetzc/fix/memory-leak

Browse source 
Fix CoreFoundation high memory usage: clean up timers and file descriptors
This commit is contained in:
Danielle McLean 2026-03-01 12:39:00 +11:00
commit da656ede74
Signed by: 00dani
GPG key ID: 6854781A0488421C
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/corefoundationasyncio/eventloop.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copied from https://github.com/alberthier/corefoundationasyncio/blob/5061b9b7daa8bcd40d54d58432d84dcc0a339ca6/corefoundationasyncio.py # Copied from https://github.com/alberthier/corefoundationasyncio/blob/5061b9b7daa8bcd40d54d58432d84dcc0a339ca6/corefoundationasyncio.py
# This module is copied, rather than simply installed, because the PyPI version of this module depends on *all* of PyObjC even though it only needs pyobjc-framework-Cocoa. # This module is copied, rather than simply installed, because the PyPI version of this module depends on *all* of PyObjC even though it only needs pyobjc-framework-Cocoa.
# There's an open PR to fix this: httpsV//github.com/alberthier/corefoundationasyncio/pull/3 # There's an open PR to fix this: https://github.com/alberthier/corefoundationasyncio/pull/3
import asyncio import asyncio
@ -10,8 +10,8 @@ import threading
from CoreFoundation import ( from CoreFoundation import (
CFRunLoopGetCurrent, CFRunLoopGetCurrent,
CFRunLoopTimerCreate, CFRunLoopAddTimer, CFRunLoopRemoveTimer, CFAbsoluteTimeGetCurrent, CFRunLoopTimerCreate, CFRunLoopAddTimer, CFRunLoopRemoveTimer, CFRunLoopTimerInvalidate, CFAbsoluteTimeGetCurrent,
CFFileDescriptorCreate, CFFileDescriptorIsValid, CFFileDescriptorEnableCallBacks, CFFileDescriptorDisableCallBacks, CFFileDescriptorCreate, CFFileDescriptorIsValid, CFFileDescriptorEnableCallBacks, CFFileDescriptorDisableCallBacks, CFFileDescriptorInvalidate,
CFFileDescriptorCreateRunLoopSource, CFRunLoopAddSource, CFRunLoopRemoveSource, CFFileDescriptorCreateRunLoopSource, CFRunLoopAddSource, CFRunLoopRemoveSource,
kCFAllocatorDefault, kCFRunLoopDefaultMode, kCFRunLoopCommonModes, kCFAllocatorDefault, kCFRunLoopDefaultMode, kCFRunLoopCommonModes,
kCFFileDescriptorReadCallBack, kCFFileDescriptorWriteCallBack kCFFileDescriptorReadCallBack, kCFFileDescriptorWriteCallBack
@ -106,8 +106,15 @@ class CoreFoundationEventLoop(asyncio.SelectorEventLoop):
if handle.cancelled(): if handle.cancelled():
return return
def ontimeout(cf_timer, info): def ontimeout(cf_timer, info):
if not handle.cancelled(): try:
handle._run() if not handle.cancelled():
handle._run()
finally:
# Explicitly invalidate/remove one-shot timers. Relying on
# implicit cleanup can leak CoreFoundation timer objects under
# long-running loads.
CFRunLoopRemoveTimer(self._runloop, cf_timer, kCFRunLoopCommonModes)
CFRunLoopTimerInvalidate(cf_timer)
when = handle.when() if is_timer else self.time() when = handle.when() if is_timer else self.time()
cf_timer = CFRunLoopTimerCreate(kCFAllocatorDefault, when, 0, 0, 0, ontimeout, None) cf_timer = CFRunLoopTimerCreate(kCFAllocatorDefault, when, 0, 0, 0, ontimeout, None)
CFRunLoopAddTimer(self._runloop, cf_timer, kCFRunLoopCommonModes) CFRunLoopAddTimer(self._runloop, cf_timer, kCFRunLoopCommonModes)
@ -116,7 +123,10 @@ class CoreFoundationEventLoop(asyncio.SelectorEventLoop):
handle._scheduled = True handle._scheduled = True
def _timer_handle_cancelled(self, handle): def _timer_handle_cancelled(self, handle):
CFRunLoopRemoveTimer(self._runloop, handle.cf_runloop_timer, kCFRunLoopCommonModes) if handle.cf_runloop_timer is not None:
CFRunLoopRemoveTimer(self._runloop, handle.cf_runloop_timer, kCFRunLoopCommonModes)
CFRunLoopTimerInvalidate(handle.cf_runloop_timer)
handle.cf_runloop_timer = None
def time(self): def time(self):
return CFAbsoluteTimeGetCurrent() return CFAbsoluteTimeGetCurrent()
@ -161,6 +171,7 @@ class CoreFoundationEventLoop(asyncio.SelectorEventLoop):
CFFileDescriptorDisableCallBacks(entry.cf_fd, event) CFFileDescriptorDisableCallBacks(entry.cf_fd, event)
else: else:
CFRunLoopRemoveSource(self._runloop, entry.cf_source, kCFRunLoopDefaultMode) CFRunLoopRemoveSource(self._runloop, entry.cf_source, kCFRunLoopDefaultMode)
CFFileDescriptorInvalidate(entry.cf_fd)
return True return True
def _add_reader(self, fd, callback, *args): def _add_reader(self, fd, callback, *args):