Commit b5536bb9 authored by unknown's avatar unknown
Browse files

Some minor IM fixes 


server-tools/instance-manager/Makefile.am:
  Makefile.am cleanup
server-tools/instance-manager/commands.cc:
  cleanup
server-tools/instance-manager/instance_map.cc:
  fix the problem caused thread deadlock (as load ends up in the find()
  call which now also locks an instance map mutex)
server-tools/instance-manager/listener.cc:
  portability fix
server-tools/instance-manager/manager.cc:
  Ignore SIGPIPE
server-tools/instance-manager/mysqlmanager.cc:
  cleanup
server-tools/instance-manager/options.cc:
  options renamed
parent 0157ffa5

server-tools/instance-manager/Makefile.am

+5 −12
Original line number Diff line number Diff line
@@ -42,25 +42,19 @@ liboptions_a_SOURCES= options.h options.cc priv.h priv.cc 
# MySQL sometimes uses symlinks to reuse code 

# All symlinked files are grouped in libnet.a



nodist_libnet_a_SOURCES= net_serv.cc client_settings.h client.c errmsg.c

nodist_libnet_a_SOURCES= net_serv.cc client_settings.h

libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \

	$(top_builddir)/sql/pack.$(OBJEXT) \

	$(top_builddir)/sql/sql_state.$(OBJEXT)

	$(top_builddir)/sql/sql_state.$(OBJEXT) \

	$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\

	$(top_builddir)/sql/client.$(OBJEXT)



CLEANFILES= net_serv.cc client.c client_settings.h errmsg.c

CLEANFILES= net_serv.cc client_settings.h



net_serv.cc: Makefile

	rm -f $(srcdir)/net_serv.cc

	@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc



client.c: Makefile

	rm -f $(srcdir)/client.c

	@LN_CP_F@ $(top_srcdir)/sql-common/client.c $(srcdir)/client.c



errmsg.c: Makefile

	rm -f $(srcdir)/errmsg.c

	@LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c $(srcdir)/errmsg.c



client_settings.h: Makefile

	rm -f $(srcdir)/client_settings.h

	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h
@@ -74,7 +68,6 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ 
			mysql_connection.h mysql_connection.cc \

			user_map.h user_map.cc \

			messages.h messages.cc \

			$(top_srcdir)/sql/sql_string.cc \

			commands.h commands.cc \

			factory.h factory.cc \

			instance.h instance.cc \

server-tools/instance-manager/commands.cc

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ int Stop_instance::execute(struct st_net *net, ulong connection_id) 
               stop_guard(instance);

    if (err_code= instance->stop())

      return err_code;



    printf("instance was stopped\n");

    net_send_ok(net, connection_id);

    return 0;

  }

server-tools/instance-manager/instance_map.cc

+1 −1
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ int Instance_map::flush_instances() 
  hash_free(&hash);

  hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,

            get_instance_key, delete_instance, 0);

  rc= load();

  pthread_mutex_unlock(&LOCK_instance_map);

  rc= load();

  return rc;

}

server-tools/instance-manager/listener.cc

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <mysql.h>

#include <violite.h>

#include <sys/un.h>

#include <sys/stat.h>



#include "thread_registry.h"

#include "options.h"

server-tools/instance-manager/manager.cc

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ void manager(const Options &options) 
  sigemptyset(&mask);

  sigaddset(&mask, SIGINT);

  sigaddset(&mask, SIGTERM);

  sigaddset(&mask, SIGPIPE);

  sigaddset(&mask, SIGHUP);

  /*

    We want this signal to be blocked in all theads but the signal
@@ -159,6 +160,8 @@ void manager(const Options &options) 
  */

  guardian_thread.start();



  signal(SIGPIPE, SIG_IGN);



  while (!shutdown_complete)

  {

    sigwait(&mask, &signo);