From 1d60a267af3eb94f8f158b4cf8abf3cc254611a1 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Tue, 5 Feb 2013 12:35:39 +0100 Subject: logging improvements made tracing message for function exit match the entry one added threading related logging for YumDB --- src/python/openlmi/common/cmpi_logging.py | 3 ++- src/software/openlmi/software/yumdb/__init__.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/python/openlmi/common/cmpi_logging.py b/src/python/openlmi/common/cmpi_logging.py index aa9cd71..3e59882 100644 --- a/src/python/openlmi/common/cmpi_logging.py +++ b/src/python/openlmi/common/cmpi_logging.py @@ -114,7 +114,8 @@ def trace_function(func): logger.log(TRACE_WARNING, "%s.%s threw exception %s", func.__module__, func.__name__, str(exc)) raise - logger.log(TRACE_VERBOSE, "Exiting %s", func.__name__) + logger.log(TRACE_VERBOSE, "Exiting %s.%s", + func.__module__, func.__name__) return ret helper_func.__name__ = func.__name__ helper_func.__doc__ = func.__doc__ diff --git a/src/software/openlmi/software/yumdb/__init__.py b/src/software/openlmi/software/yumdb/__init__.py index 0cccdea..0dc9050 100644 --- a/src/software/openlmi/software/yumdb/__init__.py +++ b/src/software/openlmi/software/yumdb/__init__.py @@ -139,14 +139,25 @@ class YumDB(singletonmixin.Singleton): self._expected.remove(job.jobid) return self._replies.pop(job.jobid) else: + cmpi_logging.logger.debug( + "[jobid=%d] another %s threads expecting reply," + " suspending...", job.jobid, len(self._expected) - 1) self._reply_cond.wait() + cmpi_logging.logger.debug( + "[jobid=%d] received reply, waking up", job.jobid) while True: + cmpi_logging.logger.debug("[jobid=%d] blocking on downlink queue", + job.jobid) jobid, reply = self._worker.downlink.get() with self._reply_lock: if jobid != job.jobid: + cmpi_logging.logger.debug("[jobid=%d] received reply" + " for another thread (jobid=%d)", job.jobid, jobid) self._replies[jobid] = reply self._reply_cond.notifyAll() else: + cmpi_logging.logger.debug( + "[jobid=%d] received desired reply", job.jobid) self._expected.remove(job.jobid) if len(self._expected): self._reply_cond.notify() -- cgit