diff options
| author | unknown <anozdrin/alik@booka.> | 2006-11-21 17:31:03 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@booka.> | 2006-11-21 17:31:03 +0300 |
| commit | cbfff7304d60f56853bb1312dbe6fe42ebbeffee (patch) | |
| tree | 6c79fe045d0eb04480800567a480ab43b9ad1d4f /server-tools/instance-manager/instance.cc | |
| parent | 817c6a4f1a92ff2f38da695bf70e9ede0bd4d0a0 (diff) | |
| download | mariadb-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/instance.cc')
| -rw-r--r-- | server-tools/instance-manager/instance.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 84986c8c5ec..42a7fc94fdb 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -105,7 +105,7 @@ static int wait_process(My_process_info *pi) couldn't use wait(), because it could return in any wait() in the program. */ - if (linuxthreads) + if (Manager::is_linux_threads()) wait(NULL); /* LinuxThreads were detected */ else waitpid(*pi, NULL, 0); @@ -564,7 +564,7 @@ int Instance::start() instance_monitor= new Instance_monitor(this); - if (instance_monitor == NULL || instance_monitor->start_detached()) + if (instance_monitor == NULL || instance_monitor->start(Thread::DETACHED)) { delete instance_monitor; log_error("Instance::start(): failed to create the monitoring thread" |