diff options
author | unknown <kent@mysql.com> | 2005-10-16 06:49:19 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-10-16 06:49:19 +0200 |
commit | 3e68a46ab6e865f86890aa543b2ecf523edb1996 (patch) | |
tree | d8bfe1cd0e8ac2e865a9091c0bbfc7de755c07e1 /server-tools | |
parent | 682e1af4e8a3fc75a03cda46441c44daa1fc2dcb (diff) | |
download | mariadb-git-3e68a46ab6e865f86890aa543b2ecf523edb1996.tar.gz |
thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
Makefile.am:
Preserve executable mode on scripts
make_binary_distribution.sh:
Copy *.imtest files
scripts/make_binary_distribution.sh:
Copy *.imtest files
mysql-test/Makefile.am:
Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
server-tools/instance-manager/thread_registry.h:
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
Diffstat (limited to 'server-tools')
-rw-r--r-- | server-tools/instance-manager/thread_registry.cc | 8 | ||||
-rw-r--r-- | server-tools/instance-manager/thread_registry.h | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index f9b98eacbee..1578ba3e9b2 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -38,6 +38,14 @@ static void handle_signal(int __attribute__((unused)) sig_no) #endif /* + Thread_info initializer methods +*/ + +Thread_info::Thread_info() {} +Thread_info::Thread_info(pthread_t thread_id_arg) : + thread_id(thread_id_arg) {} + +/* TODO: think about moving signal information (now it's shutdown_in_progress) to Thread_info. It will reduce contention and allow signal deliverence to a particular thread, not to the whole worker crew diff --git a/server-tools/instance-manager/thread_registry.h b/server-tools/instance-manager/thread_registry.h index a1075e719d6..6a9e2e115d4 100644 --- a/server-tools/instance-manager/thread_registry.h +++ b/server-tools/instance-manager/thread_registry.h @@ -67,13 +67,14 @@ class Thread_info { +public: + Thread_info(); + Thread_info(pthread_t thread_id_arg); + friend class Thread_registry; +private: pthread_cond_t *current_cond; Thread_info *prev, *next; pthread_t thread_id; - Thread_info() {} - friend class Thread_registry; -public: - Thread_info(pthread_t thread_id_arg) : thread_id(thread_id_arg) {} }; |