summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/manager.h
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@booka.>2006-11-21 17:31:03 +0300
committerunknown <anozdrin/alik@booka.>2006-11-21 17:31:03 +0300
commitcbfff7304d60f56853bb1312dbe6fe42ebbeffee (patch)
tree6c79fe045d0eb04480800567a480ab43b9ad1d4f /server-tools/instance-manager/manager.h
parent817c6a4f1a92ff2f38da695bf70e9ede0bd4d0a0 (diff)
downloadmariadb-git-cbfff7304d60f56853bb1312dbe6fe42ebbeffee.tar.gz
Polishing:
1) add support for joinable threads to Thread class; 2) move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/instance.cc: Use Manager::is_linux_threads() instead of global variable. server-tools/instance-manager/listener.cc: Use Thread::start(DETACHED) instead of Thread::start_detached(). server-tools/instance-manager/manager.cc: 1. Use Thread::start(DETACHED) instead of Thread::start_detached(); 2. Move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/manager.h: Move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/mysqlmanager.cc: Move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/priv.cc: Move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/priv.h: Move checking of thread model to Manager from mysqlmanager.cc, because it is needed only for IM-main process. server-tools/instance-manager/thread_registry.cc: Add support of joinable threads to Thread class. server-tools/instance-manager/thread_registry.h: Add support of joinable threads to Thread class.
Diffstat (limited to 'server-tools/instance-manager/manager.h')
-rw-r--r--server-tools/instance-manager/manager.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/server-tools/instance-manager/manager.h b/server-tools/instance-manager/manager.h
index 8f3dbfefb7b..a77809cca6d 100644
--- a/server-tools/instance-manager/manager.h
+++ b/server-tools/instance-manager/manager.h
@@ -39,6 +39,10 @@ public:
static Thread_registry *get_thread_registry() { return p_thread_registry; }
static User_map *get_user_map() { return p_user_map; }
+#ifndef __WIN__
+ static bool is_linux_threads() { return linux_threads; }
+#endif // __WIN__
+
private:
static void stop_all_threads();
@@ -47,6 +51,14 @@ private:
static Instance_map *p_instance_map;
static Thread_registry *p_thread_registry;
static User_map *p_user_map;
+
+#ifndef __WIN__
+ /*
+ This flag is set if Instance Manager is running on the system using
+ LinuxThreads.
+ */
+ static bool linux_threads;
+#endif // __WIN__
};
#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MANAGER_H