diff options
author | unknown <petr@mysql.com> | 2005-01-25 13:54:56 +0300 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-01-25 13:54:56 +0300 |
commit | fb3d6c39a0dc128f5310aac2906cc1e6c6b7db59 (patch) | |
tree | ada085796e1dc8387942522e6233d9a1b1a1d6d3 /server-tools/instance-manager/guardian.h | |
parent | 28f86d8ff1d042a2224c64712e31c65b1d6b7476 (diff) | |
download | mariadb-git-fb3d6c39a0dc128f5310aac2906cc1e6c6b7db59.tar.gz |
IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups
server-tools/instance-manager/Makefile.am:
New file added
server-tools/instance-manager/client_func.c:
typo fixed
server-tools/instance-manager/commands.cc:
there are no admin-user snd admin-password fields anymore, so no need to show their values
server-tools/instance-manager/guardian.cc:
Syncronization added -- now guardian wakes up whenever SIGCLD has been catched
server-tools/instance-manager/guardian.h:
Condition variable declared
server-tools/instance-manager/instance.cc:
Persistent connection to the instance removed. Now we use SIGTERM instead of com_shutdown for STOP. We also
manage SIGCHLD ourselves now (therefore no double fork).
server-tools/instance-manager/instance.h:
Pointer to the instance_map added, MySQL connection structures removed
server-tools/instance-manager/instance_map.cc:
More syncronization added (to make proper STOP)
server-tools/instance-manager/instance_map.h:
added condition variable and mutex for connection threads to wait for SIGCHLD
server-tools/instance-manager/instance_options.cc:
defaults-handling methods have been added.
server-tools/instance-manager/instance_options.h:
New functions and constants declared
server-tools/instance-manager/listener.cc:
No changes here (bk bug?)
server-tools/instance-manager/manager.cc:
SIGCHLD handling added
Diffstat (limited to 'server-tools/instance-manager/guardian.h')
-rw-r--r-- | server-tools/instance-manager/guardian.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server-tools/instance-manager/guardian.h b/server-tools/instance-manager/guardian.h index 0ae2161f1dc..bcc249ed7d3 100644 --- a/server-tools/instance-manager/guardian.h +++ b/server-tools/instance-manager/guardian.h @@ -70,6 +70,9 @@ public: int guard(Instance *instance); int stop_guard(Instance *instance); +public: + pthread_cond_t COND_guardian; + private: int add_instance_to_list(Instance *instance, LIST **list); void move_to_list(LIST **from, LIST **to); |