tuned: lowered CPU usage due to python bug

Resolves: rhbz#917587

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>

tuned/daemon/controller.py

@@ -28,7 +28,7 @@ class Controller(tuned.exports.interfaces.ExportableInterface):
 
 		self._terminate.clear()
 		# we have to pass some timeout, otherwise signals will not work
-		while not self._terminate.wait(3600):
+		while not tuned.utils.commands.wait(self._terminate, 3600):
 			pass
 
 		log.info("terminating controller")

tuned/daemon/daemon.py

@@ -3,6 +3,7 @@ import threading
 import tuned.logs
 from tuned.exceptions import TunedException
 import tuned.consts as consts
+import tuned.utils.commands
 
 log = tuned.logs.get()
 
@@ -65,7 +66,7 @@ class Daemon(object):
 		self._unit_manager.start_tuning()
 
 		self._terminate.clear()
-		while not self._terminate.wait(self._update_interval):
+		while not tuned.utils.commands.wait(self._terminate, self._update_interval):
 			log.debug("updating monitors")
 			self._unit_manager.update_monitors()
 			log.debug("performing tunings")

tuned/utils/commands.py

@@ -85,3 +85,9 @@ def recommend_profile():
 			if match1 and match2:
 				profile = section
 	return profile
+
+def wait(terminate, time):
+	try:
+		return terminate.wait(time, False)
+	except:
+		return terminate.wait(time)