Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Grids/Notifiers/GridNotifiers.h
	src/server/game/Grids/ObjectGridLoader.h
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
This commit is contained in:
Spp committed 2013-11-08 10:29:51 +01:00
commit 990e4c7851
484 files changed
+3938 -2160

No files matched your search

@@ -117,3 +117,35 @@ std::string const& ConfigMgr::GetFilename()
GuardType guard(_configLock);
return _filename;
}
std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name)
{
GuardType guard(_configLock);
std::list<std::string> keys;
if (_config.get() == 0)
return keys;
ACE_TString section_name;
ACE_Configuration_Section_Key section_key;
const ACE_Configuration_Section_Key &root_key = _config->root_section();
int i = 0;
while (_config->enumerate_sections(root_key, i++, section_name) == 0)
{
_config->open_section(root_key, section_name.c_str(), 0, section_key);
ACE_TString key_name;
ACE_Configuration::VALUETYPE type;
int j = 0;
while (_config->enumerate_values(section_key, j++, key_name, type) == 0)
{
std::string temp = key_name.c_str();
if (!temp.find(name))
keys.push_back(temp);
}
}
return keys;
}
+2 -1
View File
@@ -20,7 +20,7 @@
#define CONFIG_H
#include <string>
#include <map>
#include <list>
#include <ace/Singleton.h>
#include <ace/Configuration_Import_Export.h>
#include <ace/Thread_Mutex.h>
@@ -56,6 +56,7 @@ public:
float GetFloatDefault(const char* name, float def);
std::string const& GetFilename();
std::list<std::string> GetKeysByString(std::string const& name);
private:
bool GetValueHelper(const char* name, ACE_TString &result);
@@ -23,9 +23,7 @@
#include "DBCFileLoader.h"
#include "Errors.h"
DBCFileLoader::DBCFileLoader() : fieldsOffset(NULL), data(NULL), stringTable(NULL)
{
}
DBCFileLoader::DBCFileLoader() : fieldsOffset(NULL), data(NULL), stringTable(NULL) { }
bool DBCFileLoader::Load(const char* filename, const char* fmt)
{
+1 -1
View File
@@ -62,7 +62,7 @@ class DBCFileLoader
}
private:
Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) {}
Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) { }
unsigned char *offset;
DBCFileLoader &file;
+1 -1
View File
@@ -33,7 +33,7 @@ class DatabaseWorker : protected ACE_Task_Base
int wait() { return ACE_Task_Base::wait(); }
private:
DatabaseWorker() : ACE_Task_Base() {}
DatabaseWorker() : ACE_Task_Base() { }
ACE_Activation_Queue* m_queue;
MySQLConnection* m_conn;
};
@@ -25,8 +25,8 @@ class CharacterDatabaseConnection : public MySQLConnection
{
public:
//- Constructors for sync and async connections
CharacterDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
CharacterDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
CharacterDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { }
CharacterDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { }
//- Loads database type specific prepared statements
void DoPrepareStatements();
@@ -25,8 +25,8 @@ class LoginDatabaseConnection : public MySQLConnection
{
public:
//- Constructors for sync and async connections
LoginDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
LoginDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
LoginDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { }
LoginDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { }
//- Loads database type specific prepared statements
void DoPrepareStatements();
@@ -25,8 +25,8 @@ class WorldDatabaseConnection : public MySQLConnection
{
public:
//- Constructors for sync and async connections
WorldDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) {}
WorldDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) {}
WorldDatabaseConnection(MySQLConnectionInfo& connInfo) : MySQLConnection(connInfo) { }
WorldDatabaseConnection(ACE_Activation_Queue* q, MySQLConnectionInfo& connInfo) : MySQLConnection(q, connInfo) { }
//- Loads database type specific prepared statements
void DoPrepareStatements();
@@ -41,9 +41,7 @@ m_queue(NULL),
m_worker(NULL),
m_Mysql(NULL),
m_connectionInfo(connInfo),
m_connectionFlags(CONNECTION_SYNCH)
{
}
m_connectionFlags(CONNECTION_SYNCH) { }
MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo) :
m_reconnecting(false),
+1 -1
View File
@@ -38,7 +38,7 @@ enum ConnectionFlags
struct MySQLConnectionInfo
{
MySQLConnectionInfo() {}
MySQLConnectionInfo() { }
MySQLConnectionInfo(const std::string& infoString)
{
Tokenizer tokens(infoString, ';');
@@ -21,13 +21,9 @@
PreparedStatement::PreparedStatement(uint32 index) :
m_stmt(NULL),
m_index(index)
{
}
m_index(index) { }
PreparedStatement::~PreparedStatement()
{
}
PreparedStatement::~PreparedStatement() { }
void PreparedStatement::BindParameters()
{
@@ -451,16 +447,12 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern
//- Execution
PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt) :
m_stmt(stmt),
m_has_result(false)
{
}
m_has_result(false) { }
PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, PreparedQueryResultFuture result) :
m_stmt(stmt),
m_has_result(true),
m_result(result)
{
}
m_result(result) { }
PreparedStatementTask::~PreparedStatementTask()
@@ -169,6 +169,9 @@ void SQLQueryHolder::SetSize(size_t size)
bool SQLQueryHolderTask::Execute()
{
//the result can't be ready as we are processing it right now
ASSERT(!m_result.ready());
if (!m_holder)
return false;
+2 -2
View File
@@ -27,7 +27,7 @@ class SQLQueryHolder
typedef std::pair<SQLElementData, SQLResultSetUnion> SQLResultPair;
std::vector<SQLResultPair> m_queries;
public:
SQLQueryHolder() {}
SQLQueryHolder() { }
~SQLQueryHolder();
bool SetQuery(size_t index, const char *sql);
bool SetPQuery(size_t index, const char *format, ...) ATTR_PRINTF(3, 4);
@@ -49,7 +49,7 @@ class SQLQueryHolderTask : public SQLOperation
public:
SQLQueryHolderTask(SQLQueryHolder *holder, QueryResultHolderFuture res)
: m_holder(holder), m_result(res){};
: m_holder(holder), m_result(res){ };
bool Execute();
};
+1 -1
View File
@@ -59,7 +59,7 @@ class MySQLConnection;
class SQLOperation : public ACE_Method_Request
{
public:
SQLOperation(): m_conn(NULL) {}
SQLOperation(): m_conn(NULL) { }
virtual int call()
{
Execute();
+3 -3
View File
@@ -33,7 +33,7 @@ class Transaction
friend class DatabaseWorkerPool;
public:
Transaction() : _cleanedUp(false) {}
Transaction() : _cleanedUp(false) { }
~Transaction() { Cleanup(); }
void Append(PreparedStatement* statement);
@@ -59,8 +59,8 @@ class TransactionTask : public SQLOperation
friend class DatabaseWorker;
public:
TransactionTask(SQLTransaction trans) : m_trans(trans) {} ;
~TransactionTask(){};
TransactionTask(SQLTransaction trans) : m_trans(trans) { } ;
~TransactionTask(){ };
protected:
bool Execute();
+3 -3
View File
@@ -33,8 +33,8 @@ class FactoryHolder
friend class ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex>;
typedef ACE_Singleton<FactoryHolderRegistry, ACE_Null_Mutex> FactoryHolderRepository;
FactoryHolder(Key k) : i_key(k) {}
virtual ~FactoryHolder() {}
FactoryHolder(Key k) : i_key(k) { }
virtual ~FactoryHolder() { }
inline Key key() const { return i_key; }
void RegisterSelf(void) { FactoryHolderRepository::instance()->InsertItem(this, i_key); }
@@ -54,7 +54,7 @@ template<class T>
class Permissible
{
public:
virtual ~Permissible() {}
virtual ~Permissible() { }
virtual int Permit(const T *) const = 0;
};
#endif
+1 -1
View File
@@ -33,7 +33,7 @@ class LinkedListElement
LinkedListElement* iNext;
LinkedListElement* iPrev;
public:
LinkedListElement(): iNext(NULL), iPrev(NULL) {}
LinkedListElement(): iNext(NULL), iPrev(NULL) { }
~LinkedListElement() { delink(); }
bool hasNext() const { return(iNext && iNext->iNext != NULL); }
@@ -40,7 +40,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement
virtual void sourceObjectDestroyLink() = 0;
public:
Reference() { iRefTo = NULL; iRefFrom = NULL; }
virtual ~Reference() {}
virtual ~Reference() { }
// Create new link
void link(TO* toObj, FROM* fromObj)
+1 -1
View File
@@ -92,7 +92,7 @@ class ObjectRegistry
return i_registeredObjects;
}
ObjectRegistry() {}
ObjectRegistry() { }
~ObjectRegistry()
{
for (typename RegistryMapType::iterator iter=i_registeredObjects.begin(); iter != i_registeredObjects.end(); ++iter)
+2 -2
View File
@@ -60,7 +60,7 @@ template<class OBJECT> struct ContainerArrayList
};
// termination condition
template<> struct ContainerArrayList<TypeNull> {};
template<> struct ContainerArrayList<TypeNull> { };
// recursion
template<class H, class T> struct ContainerArrayList<TypeList<H, T> >
{
@@ -78,7 +78,7 @@ template<class OBJECT> struct ContainerList
};
/* TypeNull is underfined */
template<> struct ContainerList<TypeNull> {};
template<> struct ContainerList<TypeNull> { };
template<class H, class T> struct ContainerList<TypeList<H, T> >
{
ContainerList<H> _elements;
@@ -38,9 +38,7 @@ template<class VISITOR, class TYPE_CONTAINER> void VisitorHelper(VISITOR &v, TYP
}
// terminate condition for container list
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerList<TypeNull> &/*c*/)
{
}
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerList<TypeNull> &/*c*/) { }
template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerList<T> &c)
{
@@ -55,9 +53,7 @@ template<class VISITOR, class H, class T> void VisitorHelper(VISITOR &v, Contain
}
// terminate condition container map list
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerMapList<TypeNull> &/*c*/)
{
}
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerMapList<TypeNull> &/*c*/) { }
template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerMapList<T> &c)
{
@@ -77,9 +73,7 @@ template<class VISITOR, class T> void VisitorHelper(VISITOR &v, ContainerArrayLi
v.Visit(c._element);
}
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerArrayList<TypeNull> &/*c*/)
{
}
template<class VISITOR> void VisitorHelper(VISITOR &/*v*/, ContainerArrayList<TypeNull> &/*c*/) { }
// recursion
template<class VISITOR, class H, class T> void VisitorHelper(VISITOR &v, ContainerArrayList<TypeList<H, T> > &c)
@@ -98,7 +92,7 @@ template<class VISITOR, class TYPE_CONTAINER>
class TypeContainerVisitor
{
public:
TypeContainerVisitor(VISITOR &v) : i_visitor(v) {}
TypeContainerVisitor(VISITOR &v) : i_visitor(v) { }
void Visit(TYPE_CONTAINER &c)
{
+6 -111
View File
@@ -33,13 +33,9 @@ std::string LogMessage::getTimeStr()
}
Appender::Appender(uint8 _id, std::string const& _name, AppenderType _type /* = APPENDER_NONE*/, LogLevel _level /* = LOG_LEVEL_DISABLED */, AppenderFlags _flags /* = APPENDER_FLAGS_NONE */):
id(_id), name(_name), type(_type), level(_level), flags(_flags)
{
}
id(_id), name(_name), type(_type), level(_level), flags(_flags) { }
Appender::~Appender()
{
}
Appender::~Appender() { }
uint8 Appender::getId() const
{
@@ -78,7 +74,7 @@ void Appender::write(LogMessage& message)
message.prefix.clear();
if (flags & APPENDER_FLAGS_PREFIX_TIMESTAMP)
message.prefix.append(message.getTimeStr().c_str());
message.prefix.append(message.getTimeStr());
if (flags & APPENDER_FLAGS_PREFIX_LOGLEVEL)
{
@@ -95,9 +91,9 @@ void Appender::write(LogMessage& message)
if (!message.prefix.empty())
message.prefix.push_back(' ');
char text[MAX_QUERY_LEN];
snprintf(text, MAX_QUERY_LEN, "[%s]", Appender::getLogFilterTypeString(message.type));
message.prefix.append(text);
message.prefix.push_back('[');
message.prefix.append(message.type);
message.prefix.push_back(']');
}
if (!message.prefix.empty())
@@ -126,104 +122,3 @@ const char* Appender::getLogLevelString(LogLevel level)
return "DISABLED";
}
}
char const* Appender::getLogFilterTypeString(LogFilterType type)
{
switch (type)
{
case LOG_FILTER_GENERAL:
return "GENERAL";
case LOG_FILTER_UNITS:
return "UNITS";
case LOG_FILTER_PETS:
return "PETS";
case LOG_FILTER_VEHICLES:
return "VEHICLES";
case LOG_FILTER_TSCR:
return "TSCR";
case LOG_FILTER_DATABASE_AI:
return "DATABASE_AI";
case LOG_FILTER_MAPSCRIPTS:
return "MAPSCRIPTS";
case LOG_FILTER_NETWORKIO:
return "NETWORKIO";
case LOG_FILTER_SPELLS_AURAS:
return "SPELLS_AURAS";
case LOG_FILTER_ACHIEVEMENTSYS:
return "ACHIEVEMENTSYS";
case LOG_FILTER_CONDITIONSYS:
return "CONDITIONSYS";
case LOG_FILTER_POOLSYS:
return "POOLSYS";
case LOG_FILTER_AUCTIONHOUSE:
return "AUCTIONHOUSE";
case LOG_FILTER_BATTLEGROUND:
return "BATTLEGROUND";
case LOG_FILTER_OUTDOORPVP:
return "OUTDOORPVP";
case LOG_FILTER_CHATSYS:
return "CHATSYS";
case LOG_FILTER_LFG:
return "LFG";
case LOG_FILTER_MAPS:
return "MAPS";
case LOG_FILTER_PLAYER:
return "PLAYER";
case LOG_FILTER_PLAYER_LOADING:
return "PLAYER LOADING";
case LOG_FILTER_PLAYER_ITEMS:
return "PLAYER ITEMS";
case LOG_FILTER_PLAYER_SKILLS:
return "PLAYER SKILLS";
case LOG_FILTER_PLAYER_CHATLOG:
return "PLAYER CHATLOG";
case LOG_FILTER_LOOT:
return "LOOT";
case LOG_FILTER_GUILD:
return "GUILD";
case LOG_FILTER_TRANSPORTS:
return "TRANSPORTS";
case LOG_FILTER_SQL:
return "SQL";
case LOG_FILTER_GMCOMMAND:
return "GMCOMMAND";
case LOG_FILTER_REMOTECOMMAND:
return "REMOTECOMMAND";
case LOG_FILTER_WARDEN:
return "WARDEN";
case LOG_FILTER_AUTHSERVER:
return "AUTHSERVER";
case LOG_FILTER_WORLDSERVER:
return "WORLDSERVER";
case LOG_FILTER_GAMEEVENTS:
return "GAMEEVENTS";
case LOG_FILTER_CALENDAR:
return "CALENDAR";
case LOG_FILTER_CHARACTER:
return "CHARACTER";
case LOG_FILTER_ARENAS:
return "ARENAS";
case LOG_FILTER_SQL_DRIVER:
return "SQL DRIVER";
case LOG_FILTER_SQL_DEV:
return "SQL DEV";
case LOG_FILTER_PLAYER_DUMP:
return "PLAYER DUMP";
case LOG_FILTER_BATTLEFIELD:
return "BATTLEFIELD";
case LOG_FILTER_SERVER_LOADING:
return "SERVER LOADING";
case LOG_FILTER_OPCODES:
return "OPCODE";
case LOG_FILTER_SOAP:
return "SOAP";
case LOG_FILTER_RBAC:
return "RBAC";
case LOG_FILTER_CHEAT:
return "CHEAT";
default:
break;
}
return "???";
}
+2 -54
View File
@@ -24,57 +24,6 @@
#include <string>
enum LogFilterType
{
LOG_FILTER_GENERAL = 0, // This one should only be used inside Log.cpp
LOG_FILTER_UNITS = 1, // Anything related to units that doesn't fit in other categories. ie. creature formations
LOG_FILTER_PETS = 2,
LOG_FILTER_VEHICLES = 3,
LOG_FILTER_TSCR = 4, // C++ AI, instance scripts, etc.
LOG_FILTER_DATABASE_AI = 5, // SmartAI, EventAI, Creature* * AI
LOG_FILTER_MAPSCRIPTS = 6,
LOG_FILTER_NETWORKIO = 7,
LOG_FILTER_SPELLS_AURAS = 8,
LOG_FILTER_ACHIEVEMENTSYS = 9,
LOG_FILTER_CONDITIONSYS = 10,
LOG_FILTER_POOLSYS = 11,
LOG_FILTER_AUCTIONHOUSE = 12,
LOG_FILTER_BATTLEGROUND = 13,
LOG_FILTER_OUTDOORPVP = 14,
LOG_FILTER_CHATSYS = 15,
LOG_FILTER_LFG = 16,
LOG_FILTER_MAPS = 17,
LOG_FILTER_PLAYER = 18, // Any player log that does not fit in other player filters
LOG_FILTER_PLAYER_LOADING = 19, // Debug output from Player::_Load functions
LOG_FILTER_PLAYER_ITEMS = 20,
LOG_FILTER_PLAYER_SKILLS = 21,
LOG_FILTER_PLAYER_CHATLOG = 22,
LOG_FILTER_LOOT = 23,
LOG_FILTER_GUILD = 24,
LOG_FILTER_TRANSPORTS = 25,
LOG_FILTER_SQL = 26,
LOG_FILTER_GMCOMMAND = 27,
LOG_FILTER_REMOTECOMMAND = 28,
LOG_FILTER_WARDEN = 29,
LOG_FILTER_AUTHSERVER = 30,
LOG_FILTER_WORLDSERVER = 31,
LOG_FILTER_GAMEEVENTS = 32,
LOG_FILTER_CALENDAR = 33,
LOG_FILTER_CHARACTER = 34,
LOG_FILTER_ARENAS = 35,
LOG_FILTER_SQL_DRIVER = 36,
LOG_FILTER_SQL_DEV = 37,
LOG_FILTER_PLAYER_DUMP = 38,
LOG_FILTER_BATTLEFIELD = 39,
LOG_FILTER_SERVER_LOADING = 40,
LOG_FILTER_OPCODES = 41,
LOG_FILTER_SOAP = 42,
LOG_FILTER_RBAC = 43,
LOG_FILTER_CHEAT = 44
};
const uint8 MaxLogFilter = 45;
// Values assigned have their equivalent in enum ACE_Log_Priority
enum LogLevel
{
@@ -109,7 +58,7 @@ enum AppenderFlags
struct LogMessage
{
LogMessage(LogLevel _level, LogFilterType _type, std::string _text)
LogMessage(LogLevel _level, std::string const& _type, std::string const& _text)
: level(_level), type(_type), text(_text), mtime(time(NULL))
{ }
@@ -117,7 +66,7 @@ struct LogMessage
std::string getTimeStr();
LogLevel level;
LogFilterType type;
std::string type;
std::string text;
std::string prefix;
std::string param1;
@@ -145,7 +94,6 @@ class Appender
void setLogLevel(LogLevel);
void write(LogMessage& message);
static const char* getLogLevelString(LogLevel level);
static const char* getLogFilterTypeString(LogFilterType type);
private:
virtual void _write(LogMessage const& /*message*/) = 0;
+11 -23
View File
@@ -19,35 +19,23 @@
#include "Database/DatabaseEnv.h"
AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level)
: Appender(id, name, APPENDER_DB, level), realmId(0), enabled(false)
{
}
: Appender(id, name, APPENDER_DB, level), realmId(0), enabled(false) { }
AppenderDB::~AppenderDB()
{
}
AppenderDB::~AppenderDB() { }
void AppenderDB::_write(LogMessage const& message)
{
if (!enabled)
// Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type
if (!enabled || !message.type.find("sql"))
return;
switch (message.type)
{
case LOG_FILTER_SQL:
case LOG_FILTER_SQL_DRIVER:
case LOG_FILTER_SQL_DEV:
break; // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type
default:
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
stmt->setUInt64(0, message.mtime);
stmt->setUInt32(1, realmId);
stmt->setUInt8(2, uint8(message.type));
stmt->setUInt8(3, uint8(message.level));
stmt->setString(4, message.text);
LoginDatabase.Execute(stmt);
break;
}
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
stmt->setUInt64(0, message.mtime);
stmt->setUInt32(1, realmId);
stmt->setString(2, message.type);
stmt->setUInt8(3, uint8(message.level));
stmt->setString(4, message.text);
LoginDatabase.Execute(stmt);
}
void AppenderDB::setRealmId(uint32 _realmId)
+60 -73
View File
@@ -57,13 +57,6 @@ std::string GetConfigStringDefault(std::string base, const char* name, const cha
return sConfigMgr->GetStringDefault(base.c_str(), value);
}
// Returns default logger if the requested logger is not found
Logger* Log::GetLoggerByType(LogFilterType filterType)
{
LoggerMap::iterator it = loggers.find(static_cast<uint8>(filterType));
return it == loggers.end() ? &loggers[0] : &it->second;
}
Appender* Log::GetAppenderByName(std::string const& name)
{
AppenderMap::iterator it = appenders.begin();
@@ -73,24 +66,23 @@ Appender* Log::GetAppenderByName(std::string const& name)
return it == appenders.end() ? NULL : it->second;
}
void Log::CreateAppenderFromConfig(const char* name)
void Log::CreateAppenderFromConfig(std::string const& appenderName)
{
if (!name || *name == '\0')
if (appenderName.empty())
return;
// Format=type, level, flags, optional1, optional2
// if type = File. optional1 = file and option2 = mode
// if type = Console. optional1 = Color
std::string options = "Appender.";
options.append(name);
options = sConfigMgr->GetStringDefault(options.c_str(), "");
std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), "");
Tokenizer tokens(options, ',');
Tokenizer::const_iterator iter = tokens.begin();
uint8 size = tokens.size();
std::string name = appenderName.substr(9);
if (size < 2)
{
fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong configuration for appender %s. Config line: %s\n", name, options.c_str());
fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong configuration for appender %s. Config line: %s\n", name.c_str(), options.c_str());
return;
}
@@ -99,7 +91,7 @@ void Log::CreateAppenderFromConfig(const char* name)
LogLevel level = LogLevel(atoi(*(++iter)));
if (level > LOG_LEVEL_FATAL)
{
fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong Log Level %d for appender %s\n", level, name);
fprintf(stderr, "Log::CreateAppenderFromConfig: Wrong Log Level %d for appender %s\n", level, name.c_str());
return;
}
@@ -114,7 +106,7 @@ void Log::CreateAppenderFromConfig(const char* name)
appenders[appender->getId()] = appender;
if (size > 3)
appender->InitColors(*(++iter));
//fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type CONSOLE, Mask %u\n", appender->getName().c_str(), appender->getId(), appender->getLogLevel()); // DEBUG - RemoveMe
//fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type CONSOLE, Mask %u\n", appender->getName().c_str(), appender->getId(), appender->getLogLevel());
break;
}
case APPENDER_FILE:
@@ -124,7 +116,7 @@ void Log::CreateAppenderFromConfig(const char* name)
if (size < 4)
{
fprintf(stderr, "Log::CreateAppenderFromConfig: Missing file name for appender %s\n", name);
fprintf(stderr, "Log::CreateAppenderFromConfig: Missing file name for appender %s\n", name.c_str());
return;
}
@@ -148,7 +140,7 @@ void Log::CreateAppenderFromConfig(const char* name)
uint8 id = NextAppenderId();
appenders[id] = new AppenderFile(id, name, level, filename.c_str(), m_logsDir.c_str(), mode.c_str(), flags, maxFileSize);
//fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type FILE, Mask %u, File %s, Mode %s\n", name, id, level, filename.c_str(), mode.c_str()); // DEBUG - RemoveMe
//fprintf(stdout, "Log::CreateAppenderFromConfig: Created Appender %s (%u), Type FILE, Mask %u, File %s, Mode %s\n", name.c_str(), id, level, filename.c_str(), mode.c_str());
break;
}
case APPENDER_DB:
@@ -158,62 +150,53 @@ void Log::CreateAppenderFromConfig(const char* name)
break;
}
default:
fprintf(stderr, "Log::CreateAppenderFromConfig: Unknown type %d for appender %s\n", type, name);
fprintf(stderr, "Log::CreateAppenderFromConfig: Unknown type %d for appender %s\n", type, name.c_str());
break;
}
}
void Log::CreateLoggerFromConfig(const char* name)
void Log::CreateLoggerFromConfig(std::string const& appenderName)
{
if (!name || *name == '\0')
if (appenderName.empty())
return;
LogLevel level = LOG_LEVEL_DISABLED;
uint8 type = uint8(-1);
std::string options = "Logger.";
options.append(name);
options = sConfigMgr->GetStringDefault(options.c_str(), "");
std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), "");
std::string name = appenderName.substr(7);
if (options.empty())
{
fprintf(stderr, "Log::CreateLoggerFromConfig: Missing config option Logger.%s\n", name);
fprintf(stderr, "Log::CreateLoggerFromConfig: Missing config option Logger.%s\n", name.c_str());
return;
}
Tokenizer tokens(options, ',');
Tokenizer::const_iterator iter = tokens.begin();
if (tokens.size() != 3)
if (tokens.size() != 2)
{
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong config option Logger.%s=%s\n", name, options.c_str());
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong config option Logger.%s=%s\n", name.c_str(), options.c_str());
return;
}
type = uint8(atoi(*iter));
if (type > MaxLogFilter)
{
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong type %u for logger %s\n", type, name);
return;
}
Logger& logger = loggers[type];
Logger& logger = loggers[name];
if (!logger.getName().empty())
{
fprintf(stderr, "Error while configuring Logger %s. Already defined\n", name);
fprintf(stderr, "Error while configuring Logger %s. Already defined\n", name.c_str());
return;
}
++iter;
level = LogLevel(atoi(*iter));
if (level > LOG_LEVEL_FATAL)
{
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong Log Level %u for logger %s\n", type, name);
fprintf(stderr, "Log::CreateLoggerFromConfig: Wrong Log Level %u for logger %s\n", type, name.c_str());
return;
}
logger.Create(name, LogFilterType(type), level);
//fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Type %u, mask %u\n", name, LogFilterType(type), level); // DEBUG - RemoveMe
logger.Create(name, level);
//fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Level %u\n", name.c_str(), level);
++iter;
std::istringstream ss(*iter);
@@ -225,63 +208,67 @@ void Log::CreateLoggerFromConfig(const char* name)
if (Appender* appender = GetAppenderByName(str))
{
logger.addAppender(appender->getId(), appender);
//fprintf(stdout, "Log::CreateLoggerFromConfig: Added Appender %s to Logger %s\n", appender->getName().c_str(), name); // DEBUG - RemoveMe
//fprintf(stdout, "Log::CreateLoggerFromConfig: Added Appender %s to Logger %s\n", appender->getName().c_str(), name.c_str());
}
else
fprintf(stderr, "Error while configuring Appender %s in Logger %s. Appender does not exist", str.c_str(), name);
fprintf(stderr, "Error while configuring Appender %s in Logger %s. Appender does not exist", str.c_str(), name.c_str());
ss >> str;
}
}
void Log::ReadAppendersFromConfig()
{
std::istringstream ss(sConfigMgr->GetStringDefault("Appenders", ""));
std::string name;
std::list<std::string> keys = sConfigMgr->GetKeysByString("Appender.");
do
while (!keys.empty())
{
ss >> name;
CreateAppenderFromConfig(name.c_str());
name = "";
CreateAppenderFromConfig(keys.front());
keys.pop_front();
}
while (ss);
}
void Log::ReadLoggersFromConfig()
{
std::istringstream ss(sConfigMgr->GetStringDefault("Loggers", ""));
std::string name;
std::list<std::string> keys = sConfigMgr->GetKeysByString("Logger.");
do
while (!keys.empty())
{
ss >> name;
CreateLoggerFromConfig(name.c_str());
name = "";
CreateLoggerFromConfig(keys.front());
keys.pop_front();
}
while (ss);
// root logger must exist. Marking as disabled as its not configured
if (loggers.find(LOG_FILTER_GENERAL) == loggers.end())
loggers[LOG_FILTER_GENERAL].Create("root", LOG_FILTER_GENERAL, LOG_LEVEL_DISABLED);
// Bad config configuration, creating default config
if (loggers.find(LOGGER_ROOT) == loggers.end())
{
fprintf(stderr, "Wrong Loggers configuration. Review your Logger config section.\n"
"Creating default loggers [root (Error), server (Info)] to console\n");
Close(); // Clean any Logger or Appender created
AppenderConsole* appender = new AppenderConsole(NextAppenderId(), "Console", LOG_LEVEL_DEBUG, APPENDER_FLAGS_NONE);
appenders[appender->getId()] = appender;
Logger& logger = loggers[LOGGER_ROOT];
logger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR);
logger.addAppender(appender->getId(), appender);
logger = loggers["server"];
logger.Create("server", LOG_LEVEL_ERROR);
logger.addAppender(appender->getId(), appender);
}
}
void Log::vlog(LogFilterType filter, LogLevel level, char const* str, va_list argptr)
void Log::vlog(std::string const& filter, LogLevel level, char const* str, va_list argptr)
{
char text[MAX_QUERY_LEN];
vsnprintf(text, MAX_QUERY_LEN, str, argptr);
write(new LogMessage(level, filter, text));
}
void Log::write(LogMessage* msg)
void Log::write(LogMessage* msg) const
{
if (loggers.empty())
{
delete msg;
return;
}
Logger const* logger = GetLoggerByType(msg->type);
msg->text.append("\n");
Logger* logger = GetLoggerByType(msg->type);
if (worker)
worker->enqueue(new LogOperation(logger, msg));
@@ -336,7 +323,7 @@ bool Log::SetLogLevel(std::string const& name, const char* newLevelc, bool isLog
return true;
}
void Log::outTrace(LogFilterType filter, const char * str, ...)
void Log::outTrace(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
@@ -346,7 +333,7 @@ void Log::outTrace(LogFilterType filter, const char * str, ...)
va_end(ap);
}
void Log::outDebug(LogFilterType filter, const char * str, ...)
void Log::outDebug(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
@@ -356,7 +343,7 @@ void Log::outDebug(LogFilterType filter, const char * str, ...)
va_end(ap);
}
void Log::outInfo(LogFilterType filter, const char * str, ...)
void Log::outInfo(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
@@ -366,7 +353,7 @@ void Log::outInfo(LogFilterType filter, const char * str, ...)
va_end(ap);
}
void Log::outWarn(LogFilterType filter, const char * str, ...)
void Log::outWarn(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
@@ -376,7 +363,7 @@ void Log::outWarn(LogFilterType filter, const char * str, ...)
va_end(ap);
}
void Log::outError(LogFilterType filter, const char * str, ...)
void Log::outError(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
@@ -386,7 +373,7 @@ void Log::outError(LogFilterType filter, const char * str, ...)
va_end(ap);
}
void Log::outFatal(LogFilterType filter, const char * str, ...)
void Log::outFatal(std::string const& filter, const char * str, ...)
{
va_list ap;
va_start(ap, str);
+87 -22
View File
@@ -28,11 +28,60 @@
#include <string>
#include <ace/Singleton.h>
// TODO: Replace all defines in core
#define LOG_FILTER_ACHIEVEMENTSYS "achievement"
#define LOG_FILTER_AUCTIONHOUSE "auctionHouse"
#define LOG_FILTER_ARENAS "bg.arena"
#define LOG_FILTER_BATTLEFIELD "bg.battlefield"
#define LOG_FILTER_BATTLEGROUND "bg.battleground"
#define LOG_FILTER_PLAYER_CHATLOG "chat.log"
#define LOG_FILTER_CALENDAR "calendar"
#define LOG_FILTER_CHATSYS "chat.system"
#define LOG_FILTER_CHEAT "cheat"
#define LOG_FILTER_REMOTECOMMAND "commands.ra"
#define LOG_FILTER_GMCOMMAND "commands.gm"
#define LOG_FILTER_CONDITIONSYS "condition"
#define LOG_FILTER_PETS "entities.pet"
#define LOG_FILTER_CHARACTER "entities.player.character"
#define LOG_FILTER_PLAYER_DUMP "entities.player.dump"
#define LOG_FILTER_PLAYER "entities.player"
#define LOG_FILTER_PLAYER_ITEMS "entities.player.items"
#define LOG_FILTER_PLAYER_LOADING "entities.player.loading"
#define LOG_FILTER_PLAYER_SKILLS "entities.player.skills"
#define LOG_FILTER_TRANSPORTS "entities.transport"
#define LOG_FILTER_UNITS "entities.unit"
#define LOG_FILTER_VEHICLES "entities.vehicle"
#define LOG_FILTER_GAMEEVENTS "gameevent"
#define LOG_FILTER_GUILD "guild"
#define LOG_FILTER_LFG "lfg"
#define LOG_FILTER_LOOT "loot"
#define LOG_FILTER_MAPSCRIPTS "maps.script"
#define LOG_FILTER_MAPS "maps"
#define LOG_FILTER_GENERAL "misc"
#define LOG_FILTER_NETWORKIO "network"
#define LOG_FILTER_OPCODES "network.opcode"
#define LOG_FILTER_SOAP "network.soap"
#define LOG_FILTER_OUTDOORPVP "outdoorpvp"
#define LOG_FILTER_POOLSYS "pool"
#define LOG_FILTER_RBAC "rbac"
#define LOG_FILTER_TSCR "scripts"
#define LOG_FILTER_DATABASE_AI "scripts.ai"
#define LOG_FILTER_SERVER_LOADING "server.loading"
#define LOG_FILTER_AUTHSERVER "server.authserver"
#define LOG_FILTER_WORLDSERVER "server.worldserver"
#define LOG_FILTER_SPELLS_AURAS "spells"
#define LOG_FILTER_SQL_DEV "sql.dev"
#define LOG_FILTER_SQL_DRIVER "sql.driver"
#define LOG_FILTER_SQL "sql.sql"
#define LOG_FILTER_WARDEN "warden"
#define LOGGER_ROOT "root"
class Log
{
friend class ACE_Singleton<Log, ACE_Thread_Mutex>;
typedef UNORDERED_MAP<uint8, Logger> LoggerMap;
typedef UNORDERED_MAP<std::string, Logger> LoggerMap;
private:
Log();
@@ -41,15 +90,15 @@ class Log
public:
void LoadFromConfig();
void Close();
bool ShouldLog(LogFilterType type, LogLevel level) const;
bool ShouldLog(std::string const& type, LogLevel level) const;
bool SetLogLevel(std::string const& name, char const* level, bool isLogger = true);
void outTrace(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outDebug(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outInfo(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outWarn(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outError(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outFatal(LogFilterType f, char const* str, ...) ATTR_PRINTF(3, 4);
void outTrace(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outDebug(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outInfo(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outWarn(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outError(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outFatal(std::string const& f, char const* str, ...) ATTR_PRINTF(3, 4);
void outCommand(uint32 account, const char * str, ...) ATTR_PRINTF(3, 4);
void outCharDump(char const* str, uint32 account_id, uint32 guid, char const* name);
@@ -58,14 +107,14 @@ class Log
void SetRealmId(uint32 id);
private:
void vlog(LogFilterType f, LogLevel level, char const* str, va_list argptr);
void write(LogMessage* msg);
void vlog(std::string const& f, LogLevel level, char const* str, va_list argptr);
void write(LogMessage* msg) const;
Logger* GetLoggerByType(LogFilterType filter);
Logger const* GetLoggerByType(std::string const& type) const;
Appender* GetAppenderByName(std::string const& name);
uint8 NextAppenderId();
void CreateAppenderFromConfig(const char* name);
void CreateLoggerFromConfig(const char* name);
void CreateAppenderFromConfig(std::string const& name);
void CreateLoggerFromConfig(std::string const& name);
void ReadAppendersFromConfig();
void ReadLoggersFromConfig();
@@ -79,19 +128,35 @@ class Log
LogWorker* worker;
};
inline bool Log::ShouldLog(LogFilterType type, LogLevel level) const
inline Logger const* Log::GetLoggerByType(std::string const& type) const
{
LoggerMap::const_iterator it = loggers.find(uint8(type));
LoggerMap::const_iterator it = loggers.find(type);
if (it != loggers.end())
{
LogLevel logLevel = it->second.getLogLevel();
return logLevel != LOG_LEVEL_DISABLED && logLevel <= level;
}
return &(it->second);
if (type != LOG_FILTER_GENERAL)
return ShouldLog(LOG_FILTER_GENERAL, level);
else
if (type == LOGGER_ROOT)
return NULL;
std::string parentLogger = LOGGER_ROOT;
size_t found = type.find_last_of(".");
if (found != std::string::npos)
parentLogger = type.substr(0,found);
return GetLoggerByType(parentLogger);
}
inline bool Log::ShouldLog(std::string const& type, LogLevel level) const
{
// TODO: Use cache to store "Type.sub1.sub2": "Type" equivalence, should
// Speed up in cases where requesting "Type.sub1.sub2" but only configured
// Logger "Type"
Logger const* logger = GetLoggerByType(type);
if (!logger)
return false;
LogLevel logLevel = logger->getLogLevel();
return logLevel != LOG_LEVEL_DISABLED && logLevel <= level;
}
#define sLog ACE_Singleton<Log, ACE_Thread_Mutex>::instance()
+3 -3
View File
@@ -24,7 +24,7 @@ struct LogMessage;
class LogOperation
{
public:
LogOperation(Logger* _logger, LogMessage* _msg)
LogOperation(Logger const* _logger, LogMessage* _msg)
: logger(_logger), msg(_msg)
{ }
@@ -33,8 +33,8 @@ class LogOperation
int call();
protected:
Logger *logger;
LogMessage *msg;
Logger const* logger;
LogMessage* msg;
};
#endif
+4 -12
View File
@@ -17,14 +17,11 @@
#include "Logger.h"
Logger::Logger(): name(""), type(LOG_FILTER_GENERAL), level(LOG_LEVEL_DISABLED)
{
}
Logger::Logger(): name(""), level(LOG_LEVEL_DISABLED) { }
void Logger::Create(std::string const& _name, LogFilterType _type, LogLevel _level)
void Logger::Create(std::string const& _name, LogLevel _level)
{
name = _name;
type = _type;
level = _level;
}
@@ -40,11 +37,6 @@ std::string const& Logger::getName() const
return name;
}
LogFilterType Logger::getType() const
{
return type;
}
LogLevel Logger::getLogLevel() const
{
return level;
@@ -70,7 +62,7 @@ void Logger::setLogLevel(LogLevel _level)
level = _level;
}
void Logger::write(LogMessage& message)
void Logger::write(LogMessage& message) const
{
if (!level || level > message.level || message.text.empty())
{
@@ -78,7 +70,7 @@ void Logger::write(LogMessage& message)
return;
}
for (AppenderMap::iterator it = appenders.begin(); it != appenders.end(); ++it)
for (AppenderMap::const_iterator it = appenders.begin(); it != appenders.end(); ++it)
if (it->second)
it->second->write(message);
}
+2 -4
View File
@@ -26,19 +26,17 @@ class Logger
Logger();
~Logger();
void Create(std::string const& name, LogFilterType type, LogLevel level);
void Create(std::string const& name, LogLevel level);
void addAppender(uint8 type, Appender *);
void delAppender(uint8 type);
std::string const& getName() const;
LogFilterType getType() const;
LogLevel getLogLevel() const;
void setLogLevel(LogLevel level);
void write(LogMessage& message);
void write(LogMessage& message) const;
private:
std::string name;
LogFilterType type;
LogLevel level;
AppenderMap appenders;
};
+2 -2
View File
@@ -35,7 +35,7 @@ template <typename Result, typename ParamType, bool chain = false>
class QueryCallback
{
public:
QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {}
QueryCallback() : _param(), _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { }
//! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery
void SetFutureResult(ACE_Future<Result> value)
@@ -115,7 +115,7 @@ template <typename Result, typename ParamType1, typename ParamType2, bool chain
class QueryCallback_2
{
public:
QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) {}
QueryCallback_2() : _stage(chain ? 0 : CALLBACK_STAGE_INVALID) { }
//! The parameter of this function should be a resultset returned from either .AsyncQuery or .AsyncPQuery
void SetFutureResult(ACE_Future<Result> value)
@@ -10,9 +10,7 @@ DelayExecutor* DelayExecutor::instance()
}
DelayExecutor::DelayExecutor()
: pre_svc_hook_(0), post_svc_hook_(0), activated_(false)
{
}
: pre_svc_hook_(0), post_svc_hook_(0), activated_(false) { }
DelayExecutor::~DelayExecutor()
{
+2 -2
View File
@@ -30,7 +30,7 @@ namespace ACE_Based
class Runnable
{
public:
virtual ~Runnable() {}
virtual ~Runnable() { }
virtual void run() = 0;
void incReference() { ++m_refs; }
@@ -100,7 +100,7 @@ namespace ACE_Based
typedef ACE_TSS<Thread> ThreadStorage;
//global object - container for Thread class representation of every thread
static ThreadStorage m_ThreadStorage;
//use this object to determine current OS thread priority values mapped to enum Priority{}
//use this object to determine current OS thread priority values mapped to enum Priority{ }
static ThreadPriority m_TpEnum;
};
+2 -2
View File
@@ -35,8 +35,8 @@ namespace ByteConverter
convert<T - 2>(val + 1);
}
template<> inline void convert<0>(char *) {}
template<> inline void convert<1>(char *) {} // ignore central byte
template<> inline void convert<0>(char *) { }
template<> inline void convert<1>(char *) { } // ignore central byte
template<typename T> inline void apply(T *val)
{
+2 -2
View File
@@ -29,7 +29,7 @@ class BasicEvent
{
public:
BasicEvent() { to_Abort = false; }
virtual ~BasicEvent() {} // override destructor to perform some actions on event removal
virtual ~BasicEvent() { } // override destructor to perform some actions on event removal
// this method executes when the event is triggered
// return false if event does not want to be deleted
@@ -38,7 +38,7 @@ class BasicEvent
virtual bool IsDeletable() const { return true; } // this event can be safely deleted
virtual void Abort(uint64 /*e_time*/) {} // this method executes when the event is aborted
virtual void Abort(uint64 /*e_time*/) { } // this method executes when the event is aborted
bool to_Abort; // set by externals when the event is aborted, aborted events don't execute
// and get Abort call when deleted
+1 -1
View File
@@ -33,7 +33,7 @@ class SignalHandler : public ACE_Event_Handler
HandleSignal(SigNum);
return 0;
}
virtual void HandleSignal(int /*SigNum*/) {};
virtual void HandleSignal(int /*SigNum*/) { };
};
}