summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-10-27 15:54:01 +0400
committerunknown <petr@mysql.com>2005-10-27 15:54:01 +0400
commit4faf466bd50b12ab6ea02904e9d5923ce6f80971 (patch)
tree2bc24454192ba664ff3a8f9c5ed98116cb538bdf /server-tools
parentbc7f923a26b49c12d0d4014a839a0d1cad3ad0b5 (diff)
downloadmariadb-git-4faf466bd50b12ab6ea02904e9d5923ce6f80971.tar.gz
Fix for Bug #14388 "IM eats 99% CPU"
server-tools/instance-manager/listener.cc: reinitialize timer used in select(), as on linux it is modified to reflect amout of time not slept (e.g. set ot zero)
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/listener.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc
index 08c28dc9f7d..7cbf72050d8 100644
--- a/server-tools/instance-manager/listener.cc
+++ b/server-tools/instance-manager/listener.cc
@@ -122,11 +122,15 @@ void Listener_thread::run()
n++;
timeval tv;
- tv.tv_sec= 0;
- tv.tv_usec= 100000;
while (!thread_registry.is_shutdown())
{
fd_set read_fds_arg= read_fds;
+ /*
+ We should reintialize timer as on linux it is modified
+ to reflect amout of time not slept.
+ */
+ tv.tv_sec= 0;
+ tv.tv_usec= 100000;
/*
When using valgrind 2.0 this syscall doesn't get kicked off by a