mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 21:22:02 +00:00
Track the cpu used in the main thread by each logging context
This commit is contained in:
parent
b8680b82c3
commit
48a2526d62
@ -64,8 +64,7 @@ class Clock(object):
|
|||||||
current_context = LoggingContext.current_context()
|
current_context = LoggingContext.current_context()
|
||||||
|
|
||||||
def wrapped_callback(*args, **kwargs):
|
def wrapped_callback(*args, **kwargs):
|
||||||
with PreserveLoggingContext():
|
with PreserveLoggingContext(current_context):
|
||||||
LoggingContext.thread_local.current_context = current_context
|
|
||||||
callback(*args, **kwargs)
|
callback(*args, **kwargs)
|
||||||
|
|
||||||
with PreserveLoggingContext():
|
with PreserveLoggingContext():
|
||||||
|
@ -30,8 +30,7 @@ def debug_deferreds():
|
|||||||
context = LoggingContext.current_context()
|
context = LoggingContext.current_context()
|
||||||
|
|
||||||
def restore_context_callback(x):
|
def restore_context_callback(x):
|
||||||
with PreserveLoggingContext():
|
with PreserveLoggingContext(context):
|
||||||
LoggingContext.thread_local.current_context = context
|
|
||||||
return fn(x)
|
return fn(x)
|
||||||
|
|
||||||
return restore_context_callback
|
return restore_context_callback
|
||||||
|
@ -19,6 +19,16 @@ import logging
|
|||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import resource
|
||||||
|
RUSAGE_THREAD = 1
|
||||||
|
resource.getrusage(RUSAGE_THREAD)
|
||||||
|
def get_thread_resource_usage():
|
||||||
|
return resource.getrusage(RUSAGE_THREAD)
|
||||||
|
except:
|
||||||
|
def get_thread_resource_usage():
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
class LoggingContext(object):
|
class LoggingContext(object):
|
||||||
"""Additional context for log formatting. Contexts are scoped within a
|
"""Additional context for log formatting. Contexts are scoped within a
|
||||||
@ -27,7 +37,9 @@ class LoggingContext(object):
|
|||||||
name (str): Name for the context for debugging.
|
name (str): Name for the context for debugging.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__slots__ = ["parent_context", "name", "__dict__"]
|
__slots__ = [
|
||||||
|
"parent_context", "name", "usage_start", "usage_end", "main_thread", "__dict__"
|
||||||
|
]
|
||||||
|
|
||||||
thread_local = threading.local()
|
thread_local = threading.local()
|
||||||
|
|
||||||
@ -42,11 +54,21 @@ class LoggingContext(object):
|
|||||||
def copy_to(self, record):
|
def copy_to(self, record):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
pass
|
||||||
|
|
||||||
sentinel = Sentinel()
|
sentinel = Sentinel()
|
||||||
|
|
||||||
def __init__(self, name=None):
|
def __init__(self, name=None):
|
||||||
self.parent_context = None
|
self.parent_context = None
|
||||||
self.name = name
|
self.name = name
|
||||||
|
self.ru_stime = 0.
|
||||||
|
self.ru_utime = 0.
|
||||||
|
self.usage_start = None
|
||||||
|
self.main_thread = threading.current_thread()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "%s@%x" % (self.name, id(self))
|
return "%s@%x" % (self.name, id(self))
|
||||||
@ -62,6 +84,7 @@ class LoggingContext(object):
|
|||||||
raise Exception("Attempt to enter logging context multiple times")
|
raise Exception("Attempt to enter logging context multiple times")
|
||||||
self.parent_context = self.current_context()
|
self.parent_context = self.current_context()
|
||||||
self.thread_local.current_context = self
|
self.thread_local.current_context = self
|
||||||
|
self.start()
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def __exit__(self, type, value, traceback):
|
def __exit__(self, type, value, traceback):
|
||||||
@ -80,6 +103,7 @@ class LoggingContext(object):
|
|||||||
self
|
self
|
||||||
)
|
)
|
||||||
self.thread_local.current_context = self.parent_context
|
self.thread_local.current_context = self.parent_context
|
||||||
|
self.stop()
|
||||||
self.parent_context = None
|
self.parent_context = None
|
||||||
|
|
||||||
def __getattr__(self, name):
|
def __getattr__(self, name):
|
||||||
@ -93,6 +117,40 @@ class LoggingContext(object):
|
|||||||
for key, value in self.__dict__.items():
|
for key, value in self.__dict__.items():
|
||||||
setattr(record, key, value)
|
setattr(record, key, value)
|
||||||
|
|
||||||
|
record.ru_utime, record.ru_stime = self.get_resource_usage()
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
if threading.current_thread() is not self.main_thread:
|
||||||
|
return
|
||||||
|
|
||||||
|
if self.usage_start and self.usage_end:
|
||||||
|
self.ru_utime += self.usage_end.ru_utime - self.usage_start.ru_utime
|
||||||
|
self.ru_stime += self.usage_end.ru_stime - self.usage_start.ru_stime
|
||||||
|
self.usage_start = None
|
||||||
|
self.usage_end = None
|
||||||
|
|
||||||
|
if not self.usage_start:
|
||||||
|
self.usage_start = get_thread_resource_usage()
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
if threading.current_thread() is not self.main_thread:
|
||||||
|
return
|
||||||
|
|
||||||
|
if self.usage_start:
|
||||||
|
self.usage_end = get_thread_resource_usage()
|
||||||
|
|
||||||
|
def get_resource_usage(self):
|
||||||
|
ru_utime = self.ru_utime
|
||||||
|
ru_stime = self.ru_stime
|
||||||
|
|
||||||
|
start = self.usage_start
|
||||||
|
if self.usage_start and threading.current_thread() is self.main_thread:
|
||||||
|
current = get_thread_resource_usage()
|
||||||
|
ru_utime += current.ru_utime - self.usage_start.ru_utime
|
||||||
|
ru_stime += current.ru_stime - self.usage_start.ru_stime
|
||||||
|
|
||||||
|
return ru_utime, ru_stime
|
||||||
|
|
||||||
|
|
||||||
class LoggingContextFilter(logging.Filter):
|
class LoggingContextFilter(logging.Filter):
|
||||||
"""Logging filter that adds values from the current logging context to each
|
"""Logging filter that adds values from the current logging context to each
|
||||||
@ -121,17 +179,24 @@ class PreserveLoggingContext(object):
|
|||||||
exited. Used to restore the context after a function using
|
exited. Used to restore the context after a function using
|
||||||
@defer.inlineCallbacks is resumed by a callback from the reactor."""
|
@defer.inlineCallbacks is resumed by a callback from the reactor."""
|
||||||
|
|
||||||
__slots__ = ["current_context"]
|
__slots__ = ["current_context", "new_context"]
|
||||||
|
|
||||||
|
def __init__(self, new_context=LoggingContext.sentinel):
|
||||||
|
self.new_context = new_context
|
||||||
|
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
"""Captures the current logging context"""
|
"""Captures the current logging context"""
|
||||||
self.current_context = LoggingContext.current_context()
|
self.current_context = LoggingContext.current_context()
|
||||||
LoggingContext.thread_local.current_context = LoggingContext.sentinel
|
if self.new_context is not self.current_context:
|
||||||
|
self.current_context.stop()
|
||||||
|
LoggingContext.thread_local.current_context = self.new_context
|
||||||
|
|
||||||
def __exit__(self, type, value, traceback):
|
def __exit__(self, type, value, traceback):
|
||||||
"""Restores the current logging context"""
|
"""Restores the current logging context"""
|
||||||
|
context = LoggingContext.thread_local.current_context
|
||||||
LoggingContext.thread_local.current_context = self.current_context
|
LoggingContext.thread_local.current_context = self.current_context
|
||||||
|
if context is not self.current_context:
|
||||||
|
self.current_context.start()
|
||||||
if self.current_context is not LoggingContext.sentinel:
|
if self.current_context is not LoggingContext.sentinel:
|
||||||
if self.current_context.parent_context is None:
|
if self.current_context.parent_context is None:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
@ -164,8 +229,7 @@ class _PreservingContextDeferred(defer.Deferred):
|
|||||||
|
|
||||||
def _wrap_callback(self, f):
|
def _wrap_callback(self, f):
|
||||||
def g(res, *args, **kwargs):
|
def g(res, *args, **kwargs):
|
||||||
with PreserveLoggingContext():
|
with PreserveLoggingContext(self._log_context):
|
||||||
LoggingContext.thread_local.current_context = self._log_context
|
|
||||||
res = f(res, *args, **kwargs)
|
res = f(res, *args, **kwargs)
|
||||||
return res
|
return res
|
||||||
return g
|
return g
|
||||||
|
Loading…
Reference in New Issue
Block a user