Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer:

Browse Source 
- Better way to shutdown worker thread, prevents a crash. Fixes issue #3696
- Delete missing file from previous rev

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-09-02 17:55:03 +02:00
parent 0117af4c37
commit 5ef738c16e
2 changed files with 4 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/shared/Database/DatabaseWorker.cpp
View File

@@ -38,14 +38,15 @@ int DatabaseWorker::svc()
while (1)
{
request = (SQLOperation*)(m_queue->dequeue());
request->SetConnection(m_conn);
if (request->call() == -1)
if (!request)
break;
request->SetConnection(m_conn);
request->call();
delete request;
}
delete request;
delete m_conn;
return 0;
}

83
src/server/shared/Database/DatabaseWorkerPool.cpp
View File

@@ -1,83 +0,0 @@
/*
* Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "DatabaseEnv.h"
#include "DatabaseWorker.h"
#include "DatabaseWorkerPool.h"
#include "MySQLConnection.h"
#include "SQLOperation.h"
DatabaseWorkerPool::
DatabaseWorkerPool::
void DatabaseWorkerPool::Close()
/*! This function creates a new MySQL connection for every MapUpdate thread
and every unbundled task.
*/
void DatabaseWorkerPool::Init_MySQL_Connection()
void DatabaseWorkerPool::End_MySQL_Connection()
void DatabaseWorkerPool::Execute(const char* sql)
void DatabaseWorkerPool::PExecute(const char* sql, ...)
{
}
void DatabaseWorkerPool::DirectExecute(const char* sql)
{
}
void DatabaseWorkerPool::DirectPExecute(const char* sql, ...)
{
}
QueryResult_AutoPtr DatabaseWorkerPool::Query(const char* sql)
QueryResult_AutoPtr DatabaseWorkerPool::PQuery(const char* sql, ...)
SQLTransaction DatabaseWorkerPool::BeginTransaction()
{
}
void DatabaseWorkerPool::CommitTransaction(SQLTransaction transaction)
ACE_Future<QueryResult_AutoPtr> DatabaseWorkerPool::AsyncQuery(const char* sql)
ACE_Future<QueryResult_AutoPtr> DatabaseWorkerPool::AsyncPQuery(const char* sql, ...)
QueryResultHolderFuture DatabaseWorkerPool::DelayQueryHolder(SQLQueryHolder* holder)
MySQLConnection* DatabaseWorkerPool::GetConnection()