mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
wl1668 -
Add support for getting events via mgmapi removed all traces of stat port BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b: Delete: ndb/src/mgmsrv/NodeLogLevel.cpp BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c: Delete: ndb/src/mgmsrv/NodeLogLevel.hpp BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf: Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7: Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp ndb/include/debugger/EventLogger.hpp: Split EventLogger into two classes ndb/include/kernel/LogLevel.hpp: Add some nice to have methods + use uint8 for storage ndb/include/kernel/signaldata/EventSubscribeReq.hpp: operator= ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: operator= ndb/include/mgmapi/mgmapi.h: remove deprecated vars ndb/src/common/debugger/EventLogger.cpp: Split into 2 ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Remove hardcoded mgm stuff ndb/src/mgmsrv/CommandInterpreter.cpp: #if 0 some deprecated code ndb/src/mgmsrv/Makefile.am: remove NodeLogLevel* ndb/src/mgmsrv/MgmtSrvr.cpp: Remove dead code Handle multiple event listeners in mgmapi ndb/src/mgmsrv/MgmtSrvr.hpp: Remove dead code Handle multiple event listeners in mgmapi ndb/src/mgmsrv/Services.cpp: listen event method in mgmapi ndb/src/mgmsrv/Services.hpp: listen event method in mgmapi ndb/src/mgmsrv/main.cpp: remove stat port
This commit is contained in:
@ -130,18 +130,25 @@ public:
|
||||
*/
|
||||
Uint32 getLogLevel(EventCategory ec) const;
|
||||
|
||||
/**
|
||||
* Set this= max(this, ll) per category
|
||||
*/
|
||||
LogLevel& set_max(const LogLevel& ll);
|
||||
|
||||
bool operator==(const LogLevel& l) const {
|
||||
return memcmp(this, &l, sizeof(* this)) == 0;
|
||||
}
|
||||
|
||||
private:
|
||||
/**
|
||||
* The actual data
|
||||
*/
|
||||
Uint32 logLevelData[LOGLEVEL_CATEGORIES];
|
||||
|
||||
LogLevel(const LogLevel &);
|
||||
Uint8 logLevelData[LOGLEVEL_CATEGORIES];
|
||||
};
|
||||
|
||||
inline
|
||||
LogLevel::LogLevel(){
|
||||
clear();
|
||||
clear();
|
||||
}
|
||||
|
||||
inline
|
||||
@ -176,5 +183,14 @@ LogLevel::getLogLevel(EventCategory ec) const{
|
||||
return logLevelData[ec];
|
||||
}
|
||||
|
||||
inline
|
||||
LogLevel &
|
||||
LogLevel::set_max(const LogLevel & org){
|
||||
for(Uint32 i = 0; i<LOGLEVEL_CATEGORIES; i++){
|
||||
if(logLevelData[i] < org.logLevelData[i])
|
||||
logLevelData[i] = org.logLevelData[i];
|
||||
}
|
||||
return * this;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user