database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

misc (memleak) fixes:

Browse Source 
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads
This commit is contained in:
tomas@poseidon.ndb.mysql.com
2005-07-14 18:08:01 +02:00
parent 8afeb337f0
commit ec52d680d2
8 changed files with 112 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/util/ndb_opts.h
View File

@@ -28,6 +28,7 @@
const char *opt_connect_str= 0;\ const char *opt_connect_str= 0;\
my_bool opt_ndb_optimized_node_selection my_bool opt_ndb_optimized_node_selection
bool opt_endinfo= 0;
my_bool opt_ndb_shm; my_bool opt_ndb_shm;
#define OPT_NDB_CONNECTSTRING 'c' #define OPT_NDB_CONNECTSTRING 'c'
@@ -93,6 +94,7 @@ ndb_std_get_one_option(int optid,
{ {
DBUG_PUSH(argument); DBUG_PUSH(argument);
} }
opt_endinfo= 1;
break; break;
case 'V': case 'V':
ndb_std_print_version(); ndb_std_print_version();

1
ndb/src/common/logger/LogHandler.cpp
View File

@@ -31,6 +31,7 @@ LogHandler::LogHandler() :
m_last_message[0]= 0; m_last_message[0]= 0;
m_last_log_time= 0; m_last_log_time= 0;
m_now= 0; m_now= 0;
m_last_level= (Logger::LoggerLevel)-1;
} }
LogHandler::~LogHandler() LogHandler::~LogHandler()

19
ndb/src/mgmapi/mgmapi.cpp
View File

@@ -143,6 +143,7 @@ extern "C"
NdbMgmHandle NdbMgmHandle
ndb_mgm_create_handle() ndb_mgm_create_handle()
{ {
DBUG_ENTER("ndb_mgm_create_handle");
NdbMgmHandle h = NdbMgmHandle h =
(NdbMgmHandle)my_malloc(sizeof(ndb_mgm_handle),MYF(MY_WME)); (NdbMgmHandle)my_malloc(sizeof(ndb_mgm_handle),MYF(MY_WME));
h->connected = 0; h->connected = 0;
@@ -162,17 +163,20 @@ ndb_mgm_create_handle()
h->logfile = 0; h->logfile = 0;
#endif #endif
return h; DBUG_PRINT("exit",("ret: %lx", h));
DBUG_RETURN(h);
} }
extern "C" extern "C"
int int
ndb_mgm_set_connectstring(NdbMgmHandle handle, const char * mgmsrv) ndb_mgm_set_connectstring(NdbMgmHandle handle, const char * mgmsrv)
{ {
handle->cfg.~LocalConfig();
new (&(handle->cfg)) LocalConfig; new (&(handle->cfg)) LocalConfig;
if (!handle->cfg.init(mgmsrv, 0) || if (!handle->cfg.init(mgmsrv, 0) ||
handle->cfg.ids.size() == 0) handle->cfg.ids.size() == 0)
{ {
handle->cfg.~LocalConfig();
new (&(handle->cfg)) LocalConfig; new (&(handle->cfg)) LocalConfig;
handle->cfg.init(0, 0); /* reset the LocalCongig */ handle->cfg.init(0, 0); /* reset the LocalCongig */
SET_ERROR(handle, NDB_MGM_ILLEGAL_CONNECT_STRING, ""); SET_ERROR(handle, NDB_MGM_ILLEGAL_CONNECT_STRING, "");
@@ -189,8 +193,11 @@ extern "C"
void void
ndb_mgm_destroy_handle(NdbMgmHandle * handle) ndb_mgm_destroy_handle(NdbMgmHandle * handle)
{ {
DBUG_ENTER("ndb_mgm_destroy_handle");
if(!handle) if(!handle)
return; return;
DBUG_PRINT("enter",("*handle: %lx", *handle));
if((* handle)->connected){ if((* handle)->connected){
ndb_mgm_disconnect(* handle); ndb_mgm_disconnect(* handle);
} }
@@ -203,6 +210,7 @@ ndb_mgm_destroy_handle(NdbMgmHandle * handle)
(*handle)->cfg.~LocalConfig(); (*handle)->cfg.~LocalConfig();
my_free((char*)* handle,MYF(MY_ALLOW_ZERO_PTR)); my_free((char*)* handle,MYF(MY_ALLOW_ZERO_PTR));
* handle = 0; * handle = 0;
DBUG_VOID_RETURN;
} }
/***************************************************************************** /*****************************************************************************
@@ -251,6 +259,9 @@ static const Properties *
ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply, ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
const char *cmd, const Properties *cmd_args) const char *cmd, const Properties *cmd_args)
{ {
DBUG_ENTER("ndb_mgm_call");
DBUG_PRINT("enter",("handle->socket: %d, cmd: %s",
handle->socket, cmd));
SocketOutputStream out(handle->socket); SocketOutputStream out(handle->socket);
SocketInputStream in(handle->socket, handle->read_timeout); SocketInputStream in(handle->socket, handle->read_timeout);
@@ -310,6 +321,8 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
/** /**
* Print some info about why the parser returns NULL * Print some info about why the parser returns NULL
*/ */
DBUG_PRINT("info",("ctx.status: %d, ctx.m_currentToken: %s",
ctx.m_status, ctx.m_currentToken));
//ndbout << " status=" << ctx.m_status << ", curr=" //ndbout << " status=" << ctx.m_status << ", curr="
//<< ctx.m_currentToken << endl; //<< ctx.m_currentToken << endl;
} }
@@ -321,9 +334,9 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
p->print(handle->logfile, "IN: "); p->print(handle->logfile, "IN: ");
} }
#endif #endif
return p; DBUG_RETURN(p);
#else #else
return parser.parse(ctx, session); DBUG_RETURN(parser.parse(ctx, session));
#endif #endif
} }

6
ndb/src/mgmclient/main.cpp
View File

@@ -44,7 +44,9 @@ static Ndb_mgmclient* com;
extern "C" extern "C"
void void
handler(int sig){ handler(int sig)
{
DBUG_ENTER("handler");
switch(sig){ switch(sig){
case SIGPIPE: case SIGPIPE:
/** /**
@@ -54,6 +56,7 @@ handler(int sig){
com->disconnect(); com->disconnect();
break; break;
} }
DBUG_VOID_RETURN;
} }
NDB_STD_OPTS_VARS; NDB_STD_OPTS_VARS;
@@ -167,6 +170,7 @@ int main(int argc, char** argv){
} }
delete com; delete com;
ndb_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
return ret; return ret;
} }

25
ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@@ -571,10 +571,11 @@ MgmtSrvr::check_start()
bool bool
MgmtSrvr::start(BaseString &error_string) MgmtSrvr::start(BaseString &error_string)
{ {
DBUG_ENTER("MgmtSrvr::start");
if (_props == NULL) { if (_props == NULL) {
if (!check_start()) { if (!check_start()) {
error_string.append("MgmtSrvr.cpp: check_start() failed."); error_string.append("MgmtSrvr.cpp: check_start() failed.");
return false; DBUG_RETURN(false);
} }
} }
theFacade= TransporterFacade::theFacadeInstance= new TransporterFacade(); theFacade= TransporterFacade::theFacadeInstance= new TransporterFacade();
@@ -582,12 +583,12 @@ MgmtSrvr::start(BaseString &error_string)
if(theFacade == 0) { if(theFacade == 0) {
DEBUG("MgmtSrvr.cpp: theFacade is NULL."); DEBUG("MgmtSrvr.cpp: theFacade is NULL.");
error_string.append("MgmtSrvr.cpp: theFacade is NULL."); error_string.append("MgmtSrvr.cpp: theFacade is NULL.");
return false; DBUG_RETURN(false);
} }
if ( theFacade->start_instance if ( theFacade->start_instance
(_ownNodeId, (ndb_mgm_configuration*)_config->m_configValues) < 0) { (_ownNodeId, (ndb_mgm_configuration*)_config->m_configValues) < 0) {
DEBUG("MgmtSrvr.cpp: TransporterFacade::start_instance < 0."); DEBUG("MgmtSrvr.cpp: TransporterFacade::start_instance < 0.");
return false; DBUG_RETURN(false);
} }
MGM_REQUIRE(_blockNumber == 1); MGM_REQUIRE(_blockNumber == 1);
@@ -603,7 +604,7 @@ MgmtSrvr::start(BaseString &error_string)
error_string.append("MgmtSrvr.cpp: _blockNumber is -1."); error_string.append("MgmtSrvr.cpp: _blockNumber is -1.");
theFacade->stop_instance(); theFacade->stop_instance();
theFacade = 0; theFacade = 0;
return false; DBUG_RETURN(false);
} }
_ownReference = numberToRef(_blockNumber, _ownNodeId); _ownReference = numberToRef(_blockNumber, _ownNodeId);
@@ -625,7 +626,7 @@ MgmtSrvr::start(BaseString &error_string)
"MgmtSrvr_Service", "MgmtSrvr_Service",
NDB_THREAD_PRIO_LOW); NDB_THREAD_PRIO_LOW);
return true; DBUG_RETURN(true);
} }
@@ -639,6 +640,7 @@ MgmtSrvr::~MgmtSrvr()
if(theFacade != 0){ if(theFacade != 0){
theFacade->stop_instance(); theFacade->stop_instance();
delete theFacade;
theFacade = 0; theFacade = 0;
} }
@@ -2583,19 +2585,6 @@ MgmtSrvr::repCommand(Uint32* repReqId, Uint32 request, bool waitCompleted)
} }
/*****************************************************************************
* Area 51 ???
*****************************************************************************/
MgmtSrvr::Area51
MgmtSrvr::getStuff()
{
Area51 ret;
ret.theFacade = theFacade;
ret.theRegistry = theFacade->theTransporterRegistry;
return ret;
}
NodeId NodeId
MgmtSrvr::getPrimaryNode() const { MgmtSrvr::getPrimaryNode() const {
#if 0 #if 0

99
ndb/src/mgmsrv/main.cpp
View File

@@ -53,16 +53,16 @@ const char progname[] = "mgmtsrvr";
* @struct MgmGlobals * @struct MgmGlobals
* @brief Global Variables used in the management server * @brief Global Variables used in the management server
******************************************************************************/ ******************************************************************************/
/** Command line arguments */
static int opt_daemon; // NOT bool, bool need not be int
static int opt_non_interactive;
static int opt_interactive;
static const char * opt_config_filename= 0;
struct MgmGlobals { struct MgmGlobals {
MgmGlobals(); MgmGlobals();
~MgmGlobals(); ~MgmGlobals();
/** Command line arguments */
int daemon; // NOT bool, bool need not be int
int non_interactive;
int interactive;
const char * config_filename;
/** Stuff found in environment or in local config */ /** Stuff found in environment or in local config */
NodeId localNodeId; NodeId localNodeId;
bool use_specific_ip; bool use_specific_ip;
@@ -77,7 +77,7 @@ struct MgmGlobals {
}; };
int g_no_nodeid_checks= 0; int g_no_nodeid_checks= 0;
static MgmGlobals glob; static MgmGlobals *glob= 0;
/****************************************************************************** /******************************************************************************
* Function prototypes * Function prototypes
@@ -108,14 +108,14 @@ static struct my_option my_long_options[] =
{ {
NDB_STD_OPTS("ndb_mgmd"), NDB_STD_OPTS("ndb_mgmd"),
{ "config-file", 'f', "Specify cluster configuration file", { "config-file", 'f', "Specify cluster configuration file",
(gptr*) &glob.config_filename, (gptr*) &glob.config_filename, 0, (gptr*) &opt_config_filename, (gptr*) &opt_config_filename, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "daemon", 'd', "Run ndb_mgmd in daemon mode (default)", { "daemon", 'd', "Run ndb_mgmd in daemon mode (default)",
(gptr*) &glob.daemon, (gptr*) &glob.daemon, 0, (gptr*) &opt_daemon, (gptr*) &opt_daemon, 0,
GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
{ "interactive", OPT_INTERACTIVE, { "interactive", OPT_INTERACTIVE,
"Run interactive. Not supported but provided for testing purposes", "Run interactive. Not supported but provided for testing purposes",
(gptr*) &glob.interactive, (gptr*) &glob.interactive, 0, (gptr*) &opt_interactive, (gptr*) &opt_interactive, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "no-nodeid-checks", OPT_NO_NODEID_CHECKS, { "no-nodeid-checks", OPT_NO_NODEID_CHECKS,
"Do not provide any node id checks", "Do not provide any node id checks",
@@ -123,13 +123,13 @@ static struct my_option my_long_options[] =
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "nodaemon", OPT_NO_DAEMON, { "nodaemon", OPT_NO_DAEMON,
"Don't run as daemon, but don't read from stdin", "Don't run as daemon, but don't read from stdin",
(gptr*) &glob.non_interactive, (gptr*) &glob.non_interactive, 0, (gptr*) &opt_non_interactive, (gptr*) &opt_non_interactive, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
#if NDB_VERSION_MAJOR <= 4 #if NDB_VERSION_MAJOR <= 4
{ "config-file", 'c', { "config-file", 'c',
"-c provided for backwards compatability, will be removed in 5.0." "-c provided for backwards compatability, will be removed in 5.0."
" Use -f instead", " Use -f instead",
(gptr*) &glob.config_filename, (gptr*) &glob.config_filename, 0, (gptr*) &opt_config_filename, (gptr*) &opt_config_filename, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif #endif
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
@@ -167,6 +167,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
NDB_INIT(argv[0]); NDB_INIT(argv[0]);
glob= new MgmGlobals;
/** /**
* OSE specific. Enable shared ownership of file system resources. * OSE specific. Enable shared ownership of file system resources.
@@ -186,40 +187,40 @@ int main(int argc, char** argv)
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
exit(ho_error); exit(ho_error);
if (glob.interactive || if (opt_interactive ||
glob.non_interactive) { opt_non_interactive) {
glob.daemon= 0; opt_daemon= 0;
} }
glob.socketServer = new SocketServer(); glob->socketServer = new SocketServer();
MgmApiService * mapi = new MgmApiService(); MgmApiService * mapi = new MgmApiService();
glob.mgmObject = new MgmtSrvr(glob.socketServer, glob->mgmObject = new MgmtSrvr(glob->socketServer,
glob.config_filename, opt_config_filename,
opt_connect_str); opt_connect_str);
if (glob.mgmObject->init()) if (glob->mgmObject->init())
goto error_end; goto error_end;
my_setwd(NdbConfig_get_path(0), MYF(0)); my_setwd(NdbConfig_get_path(0), MYF(0));
glob.localNodeId= glob.mgmObject->getOwnNodeId(); glob->localNodeId= glob->mgmObject->getOwnNodeId();
if (glob.localNodeId == 0) { if (glob->localNodeId == 0) {
goto error_end; goto error_end;
} }
glob.port= glob.mgmObject->getPort(); glob->port= glob->mgmObject->getPort();
if (glob.port == 0) if (glob->port == 0)
goto error_end; goto error_end;
glob.interface_name = 0; glob->interface_name = 0;
glob.use_specific_ip = false; glob->use_specific_ip = false;
if(!glob.use_specific_ip){ if(!glob->use_specific_ip){
int count= 5; // no of retries for tryBind int count= 5; // no of retries for tryBind
while(!glob.socketServer->tryBind(glob.port, glob.interface_name)){ while(!glob->socketServer->tryBind(glob->port, glob->interface_name)){
if (--count > 0) { if (--count > 0) {
NdbSleep_MilliSleep(1000); NdbSleep_MilliSleep(1000);
continue; continue;
@@ -228,33 +229,33 @@ int main(int argc, char** argv)
"Please check if the port is already used,\n" "Please check if the port is already used,\n"
"(perhaps a ndb_mgmd is already running),\n" "(perhaps a ndb_mgmd is already running),\n"
"and if you are executing on the correct computer", "and if you are executing on the correct computer",
(glob.interface_name ? glob.interface_name : "*"), glob.port); (glob->interface_name ? glob->interface_name : "*"), glob->port);
goto error_end; goto error_end;
} }
free(glob.interface_name); free(glob->interface_name);
glob.interface_name = 0; glob->interface_name = 0;
} }
if(!glob.socketServer->setup(mapi, glob.port, glob.interface_name)){ if(!glob->socketServer->setup(mapi, glob->port, glob->interface_name)){
ndbout_c("Unable to setup management port: %d!\n" ndbout_c("Unable to setup management port: %d!\n"
"Please check if the port is already used,\n" "Please check if the port is already used,\n"
"(perhaps a ndb_mgmd is already running),\n" "(perhaps a ndb_mgmd is already running),\n"
"and if you are executing on the correct computer", "and if you are executing on the correct computer",
glob.port); glob->port);
delete mapi; delete mapi;
goto error_end; goto error_end;
} }
if(!glob.mgmObject->check_start()){ if(!glob->mgmObject->check_start()){
ndbout_c("Unable to check start management server."); ndbout_c("Unable to check start management server.");
ndbout_c("Probably caused by illegal initial configuration file."); ndbout_c("Probably caused by illegal initial configuration file.");
goto error_end; goto error_end;
} }
if (glob.daemon) { if (opt_daemon) {
// Become a daemon // Become a daemon
char *lockfile= NdbConfig_PidFileName(glob.localNodeId); char *lockfile= NdbConfig_PidFileName(glob->localNodeId);
char *logfile= NdbConfig_StdoutFileName(glob.localNodeId); char *logfile= NdbConfig_StdoutFileName(glob->localNodeId);
NdbAutoPtr<char> tmp_aptr1(lockfile), tmp_aptr2(logfile); NdbAutoPtr<char> tmp_aptr1(lockfile), tmp_aptr2(logfile);
if (NdbDaemon_Make(lockfile, logfile, 0) == -1) { if (NdbDaemon_Make(lockfile, logfile, 0) == -1) {
@@ -268,7 +269,7 @@ int main(int argc, char** argv)
#endif #endif
{ {
BaseString error_string; BaseString error_string;
if(!glob.mgmObject->start(error_string)){ if(!glob->mgmObject->start(error_string)){
ndbout_c("Unable to start management server."); ndbout_c("Unable to start management server.");
ndbout_c("Probably caused by illegal initial configuration file."); ndbout_c("Probably caused by illegal initial configuration file.");
ndbout_c(error_string.c_str()); ndbout_c(error_string.c_str());
@@ -276,8 +277,8 @@ int main(int argc, char** argv)
} }
} }
//glob.mgmObject->saveConfig(); //glob->mgmObject->saveConfig();
mapi->setMgm(glob.mgmObject); mapi->setMgm(glob->mgmObject);
char msg[256]; char msg[256];
BaseString::snprintf(msg, sizeof(msg), BaseString::snprintf(msg, sizeof(msg),
@@ -286,16 +287,16 @@ int main(int argc, char** argv)
g_eventLogger.info(msg); g_eventLogger.info(msg);
BaseString::snprintf(msg, 256, "Id: %d, Command port: %d", BaseString::snprintf(msg, 256, "Id: %d, Command port: %d",
glob.localNodeId, glob.port); glob->localNodeId, glob->port);
ndbout_c(msg); ndbout_c(msg);
g_eventLogger.info(msg); g_eventLogger.info(msg);
g_StopServer = false; g_StopServer = false;
glob.socketServer->startServer(); glob->socketServer->startServer();
#if ! defined NDB_OSE && ! defined NDB_SOFTOSE #if ! defined NDB_OSE && ! defined NDB_SOFTOSE
if(glob.interactive) { if(opt_interactive) {
CommandInterpreter com(* glob.mgmObject); CommandInterpreter com(* glob->mgmObject);
while(com.readAndExecute()); while(com.readAndExecute());
} else } else
#endif #endif
@@ -305,22 +306,22 @@ int main(int argc, char** argv)
} }
g_eventLogger.info("Shutting down server..."); g_eventLogger.info("Shutting down server...");
glob.socketServer->stopServer(); glob->socketServer->stopServer();
glob.socketServer->stopSessions(); glob->socketServer->stopSessions(true);
g_eventLogger.info("Shutdown complete"); g_eventLogger.info("Shutdown complete");
delete glob;
ndb_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
return 0; return 0;
error_end: error_end:
delete glob;
ndb_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
return 1; return 1;
} }
MgmGlobals::MgmGlobals(){ MgmGlobals::MgmGlobals(){
// Default values // Default values
port = 0; port = 0;
config_filename = NULL;
interface_name = 0; interface_name = 0;
daemon = 1;
non_interactive = 0;
interactive = 0;
socketServer = 0; socketServer = 0;
mgmObject = 0; mgmObject = 0;
} }

18
ndb/src/ndbapi/ClusterMgr.cpp
View File

@@ -64,16 +64,21 @@ ClusterMgr::ClusterMgr(TransporterFacade & _facade):
theStop(0), theStop(0),
theFacade(_facade) theFacade(_facade)
{ {
DBUG_ENTER("ClusterMgr::ClusterMgr");
ndbSetOwnVersion(); ndbSetOwnVersion();
clusterMgrThreadMutex = NdbMutex_Create(); clusterMgrThreadMutex = NdbMutex_Create();
noOfAliveNodes= 0; noOfAliveNodes= 0;
noOfConnectedNodes= 0; noOfConnectedNodes= 0;
theClusterMgrThread= 0; theClusterMgrThread= 0;
DBUG_VOID_RETURN;
} }
ClusterMgr::~ClusterMgr(){ ClusterMgr::~ClusterMgr()
{
DBUG_ENTER("ClusterMgr::~ClusterMgr");
doStop(); doStop();
NdbMutex_Destroy(clusterMgrThreadMutex); NdbMutex_Destroy(clusterMgrThreadMutex);
DBUG_VOID_RETURN;
} }
void void
@@ -152,7 +157,6 @@ ClusterMgr::doStop( ){
if (theClusterMgrThread) { if (theClusterMgrThread) {
NdbThread_WaitFor(theClusterMgrThread, &status); NdbThread_WaitFor(theClusterMgrThread, &status);
NdbThread_Destroy(&theClusterMgrThread); NdbThread_Destroy(&theClusterMgrThread);
theClusterMgrThread= 0;
} }
NdbMutex_Unlock(clusterMgrThreadMutex); NdbMutex_Unlock(clusterMgrThreadMutex);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@@ -468,6 +472,8 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){
ArbitMgr::ArbitMgr(TransporterFacade & _fac) ArbitMgr::ArbitMgr(TransporterFacade & _fac)
: theFacade(_fac) : theFacade(_fac)
{ {
DBUG_ENTER("ArbitMgr::ArbitMgr");
theThreadMutex = NdbMutex_Create(); theThreadMutex = NdbMutex_Create();
theInputCond = NdbCondition_Create(); theInputCond = NdbCondition_Create();
theInputMutex = NdbMutex_Create(); theInputMutex = NdbMutex_Create();
@@ -485,13 +491,17 @@ ArbitMgr::ArbitMgr(TransporterFacade & _fac)
memset(&theChooseReq1, 0, sizeof(theChooseReq1)); memset(&theChooseReq1, 0, sizeof(theChooseReq1));
memset(&theChooseReq2, 0, sizeof(theChooseReq2)); memset(&theChooseReq2, 0, sizeof(theChooseReq2));
memset(&theStopOrd, 0, sizeof(theStopOrd)); memset(&theStopOrd, 0, sizeof(theStopOrd));
DBUG_VOID_RETURN;
} }
ArbitMgr::~ArbitMgr() ArbitMgr::~ArbitMgr()
{ {
DBUG_ENTER("ArbitMgr::~ArbitMgr");
NdbMutex_Destroy(theThreadMutex); NdbMutex_Destroy(theThreadMutex);
NdbCondition_Destroy(theInputCond); NdbCondition_Destroy(theInputCond);
NdbMutex_Destroy(theInputMutex); NdbMutex_Destroy(theInputMutex);
DBUG_VOID_RETURN;
} }
// Start arbitrator thread. This is kernel request. // Start arbitrator thread. This is kernel request.
@@ -508,7 +518,7 @@ ArbitMgr::doStart(const Uint32* theData)
sendSignalToThread(aSignal); sendSignalToThread(aSignal);
void* value; void* value;
NdbThread_WaitFor(theThread, &value); NdbThread_WaitFor(theThread, &value);
theThread = NULL; NdbThread_Destroy(&theThread);
theState = StateInit; theState = StateInit;
theInputFull = false; theInputFull = false;
} }
@@ -547,7 +557,7 @@ ArbitMgr::doStop(const Uint32* theData)
sendSignalToThread(aSignal); sendSignalToThread(aSignal);
void* value; void* value;
NdbThread_WaitFor(theThread, &value); NdbThread_WaitFor(theThread, &value);
theThread = NULL; NdbThread_Destroy(&theThread);
theState = StateInit; theState = StateInit;
} }
NdbMutex_Unlock(theThreadMutex); NdbMutex_Unlock(theThreadMutex);

23
ndb/src/ndbapi/TransporterFacade.cpp
View File

@@ -395,12 +395,10 @@ TransporterFacade::doStop(){
if (theReceiveThread) { if (theReceiveThread) {
NdbThread_WaitFor(theReceiveThread, &status); NdbThread_WaitFor(theReceiveThread, &status);
NdbThread_Destroy(&theReceiveThread); NdbThread_Destroy(&theReceiveThread);
theReceiveThread= 0;
} }
if (theSendThread) { if (theSendThread) {
NdbThread_WaitFor(theSendThread, &status); NdbThread_WaitFor(theSendThread, &status);
NdbThread_Destroy(&theSendThread); NdbThread_Destroy(&theSendThread);
theSendThread= 0;
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@@ -435,7 +433,7 @@ void TransporterFacade::threadMainSend(void)
theTransporterRegistry->stopSending(); theTransporterRegistry->stopSending();
m_socket_server.stopServer(); m_socket_server.stopServer();
m_socket_server.stopSessions(); m_socket_server.stopSessions(true);
theTransporterRegistry->stop_clients(); theTransporterRegistry->stop_clients();
} }
@@ -477,6 +475,8 @@ TransporterFacade::TransporterFacade() :
theReceiveThread(NULL), theReceiveThread(NULL),
m_fragmented_signal_id(0) m_fragmented_signal_id(0)
{ {
DBUG_ENTER("TransporterFacade::TransporterFacade");
theOwnId = 0; theOwnId = 0;
theMutexPtr = NdbMutex_Create(); theMutexPtr = NdbMutex_Create();
@@ -493,11 +493,15 @@ TransporterFacade::TransporterFacade() :
m_max_trans_id = 0; m_max_trans_id = 0;
theClusterMgr = new ClusterMgr(* this); theClusterMgr = new ClusterMgr(* this);
DBUG_VOID_RETURN;
} }
bool bool
TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props) TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
{ {
DBUG_ENTER("TransporterFacade::init");
theOwnId = nodeId; theOwnId = nodeId;
theTransporterRegistry = new TransporterRegistry(this); theTransporterRegistry = new TransporterRegistry(this);
@@ -506,7 +510,7 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
* theTransporterRegistry); * theTransporterRegistry);
if(res <= 0){ if(res <= 0){
TRP_DEBUG( "configureTransporters returned 0 or less" ); TRP_DEBUG( "configureTransporters returned 0 or less" );
return false; DBUG_RETURN(false);
} }
ndb_mgm_configuration_iterator iter(* props, CFG_SECTION_NODE); ndb_mgm_configuration_iterator iter(* props, CFG_SECTION_NODE);
@@ -524,7 +528,7 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
iter.first(); iter.first();
if(iter.find(CFG_NODE_ID, nodeId)){ if(iter.find(CFG_NODE_ID, nodeId)){
TRP_DEBUG( "Node info missing from config." ); TRP_DEBUG( "Node info missing from config." );
return false; DBUG_RETURN(false);
} }
Uint32 rank = 0; Uint32 rank = 0;
@@ -553,7 +557,7 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
if (!theTransporterRegistry->start_service(m_socket_server)){ if (!theTransporterRegistry->start_service(m_socket_server)){
ndbout_c("Unable to start theTransporterRegistry->start_service"); ndbout_c("Unable to start theTransporterRegistry->start_service");
return false; DBUG_RETURN(false);
} }
theReceiveThread = NdbThread_Create(runReceiveResponse_C, theReceiveThread = NdbThread_Create(runReceiveResponse_C,
@@ -573,7 +577,7 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
signalLogger.logOn(true, 0, SignalLoggerManager::LogInOut); signalLogger.logOn(true, 0, SignalLoggerManager::LogInOut);
#endif #endif
return true; DBUG_RETURN(true);
} }
@@ -694,7 +698,9 @@ TransporterFacade::open(void* objRef,
DBUG_RETURN(r); DBUG_RETURN(r);
} }
TransporterFacade::~TransporterFacade(){ TransporterFacade::~TransporterFacade()
{
DBUG_ENTER("TransporterFacade::~TransporterFacade");
NdbMutex_Lock(theMutexPtr); NdbMutex_Lock(theMutexPtr);
delete theClusterMgr; delete theClusterMgr;
@@ -705,6 +711,7 @@ TransporterFacade::~TransporterFacade(){
#ifdef API_TRACE #ifdef API_TRACE
signalLogger.setOutputStream(0); signalLogger.setOutputStream(0);
#endif #endif
DBUG_VOID_RETURN;
} }
void void