Categorize mirror service commands

ryzomclassic-develop
kaetemi 5 years ago committed by Jan Boon
parent 93f6770fe4
commit 6c6a83bc5d

@ -3877,7 +3877,7 @@ NLNET_SERVICE_MAIN (CMirrorService, "MS", "mirror_service", 0, MirrorCallbackArr
/* /*
* displayMSTrackers command * displayMSTrackers command
*/ */
NLMISC_COMMAND( displayMSTrackers, "Display the trackers for one of all dataset(s)", "[<dataset>]" ) NLMISC_CATEGORISED_COMMAND( ms, displayMSTrackers, "Display the trackers for one of all dataset(s)", "[<dataset>]" )
{ {
if ( args.size() > 0 ) if ( args.size() > 0 )
{ {
@ -3902,7 +3902,7 @@ NLMISC_COMMAND( displayMSTrackers, "Display the trackers for one of all dataset(
} }
NLMISC_COMMAND( changeWeightOfProperty, "Change the weight of a property", "<propName> <weight>" ) NLMISC_CATEGORISED_COMMAND( ms, changeWeightOfProperty, "Change the weight of a property", "<propName> <weight>" )
{ {
if ( args.size() == 2 ) if ( args.size() == 2 )
{ {
@ -3915,7 +3915,7 @@ NLMISC_COMMAND( changeWeightOfProperty, "Change the weight of a property", "<pro
} }
NLMISC_COMMAND( displayWeights, "Display the weights of the properties", "" ) NLMISC_CATEGORISED_COMMAND( ms, displayWeights, "Display the weights of the properties", "" )
{ {
TNDataSetsMS::const_iterator ids; TNDataSetsMS::const_iterator ids;
for ( ids=MSInstance->NDataSets.begin(); ids!=MSInstance->NDataSets.end(); ++ids ) for ( ids=MSInstance->NDataSets.begin(); ids!=MSInstance->NDataSets.end(); ++ids )
@ -3924,14 +3924,14 @@ NLMISC_COMMAND( displayWeights, "Display the weights of the properties", "" )
} }
NLMISC_COMMAND( displayRemoteMS, "Display the list of remote MS", "" ) NLMISC_CATEGORISED_COMMAND( ms, displayRemoteMS, "Display the list of remote MS", "" )
{ {
MSInstance->displayRemoteMSList( log ); MSInstance->displayRemoteMSList( log );
return true; return true;
} }
NLMISC_COMMAND( displayClientServices, "Display the list of client services", "" ) NLMISC_CATEGORISED_COMMAND( ms, displayClientServices, "Display the list of client services", "" )
{ {
MSInstance->displayClientServices( log ); MSInstance->displayClientServices( log );
return true; return true;
@ -3939,7 +3939,7 @@ NLMISC_COMMAND( displayClientServices, "Display the list of client services", ""
#ifdef COUNT_MIRROR_PROP_CHANGES #ifdef COUNT_MIRROR_PROP_CHANGES
NLMISC_DYNVARIABLE( sint32, TotalNbChangesPerTickRowMgt, "Number of distinct changes per tick for non-local row management" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint32, TotalNbChangesPerTickRowMgt, "Number of distinct changes per tick for non-local row management" )
{ {
// We can only read the value // We can only read the value
if ( get ) if ( get )
@ -3952,7 +3952,7 @@ NLMISC_DYNVARIABLE( sint32, TotalNbChangesPerTickRowMgt, "Number of distinct cha
} }
} }
NLMISC_DYNVARIABLE( sint32, TotalNbChangesPerTickProps, "Number of distinct changes per tick for non-local prop changes" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint32, TotalNbChangesPerTickProps, "Number of distinct changes per tick for non-local prop changes" )
{ {
// We can only read the value // We can only read the value
if ( get ) if ( get )
@ -3967,7 +3967,7 @@ NLMISC_DYNVARIABLE( sint32, TotalNbChangesPerTickProps, "Number of distinct chan
#endif #endif
NLMISC_DYNVARIABLE( sint32, TotalNbChangesSentPerTickRowMgt, "Number of changes emitted to other MS for row management" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint32, TotalNbChangesSentPerTickRowMgt, "Number of changes emitted to other MS for row management" )
{ {
// We can only read the value // We can only read the value
if ( get ) if ( get )
@ -3976,7 +3976,7 @@ NLMISC_DYNVARIABLE( sint32, TotalNbChangesSentPerTickRowMgt, "Number of changes
} }
} }
NLMISC_DYNVARIABLE( sint32, TotalNbChangesSentPerTickProps, "Number of changes emitted to other MS for props" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint32, TotalNbChangesSentPerTickProps, "Number of changes emitted to other MS for props" )
{ {
// We can only read the value // We can only read the value
if ( get ) if ( get )
@ -3986,7 +3986,7 @@ NLMISC_DYNVARIABLE( sint32, TotalNbChangesSentPerTickProps, "Number of changes e
} }
NLMISC_DYNVARIABLE( sint32, TotalRemainingChangesProps, "Number of remaining prop changes not sent to other MS" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint32, TotalRemainingChangesProps, "Number of remaining prop changes not sent to other MS" )
{ {
// We can only read the value // We can only read the value
if ( get ) if ( get )
@ -3996,7 +3996,7 @@ NLMISC_DYNVARIABLE( sint32, TotalRemainingChangesProps, "Number of remaining pro
} }
NLMISC_COMMAND( verboseMessagesSent, "Turn on/off the display of msgs sent to other MSes", "1/0" ) NLMISC_CATEGORISED_COMMAND( ms, verboseMessagesSent, "Turn on/off the display of msgs sent to other MSes", "1/0" )
{ {
if ( args.size() < 1 ) if ( args.size() < 1 )
return false; return false;
@ -4006,7 +4006,7 @@ NLMISC_COMMAND( verboseMessagesSent, "Turn on/off the display of msgs sent to ot
} }
NLMISC_DYNVARIABLE( string, Status, "Mirrors online status" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, string, Status, "Mirrors online status" )
{ {
if ( get ) if ( get )
{ {
@ -4023,27 +4023,27 @@ NLMISC_DYNVARIABLE( string, Status, "Mirrors online status" )
static string MainNbEntities = "?"; static string MainNbEntities = "?";
// This command must be here to prevent to compile the same one in mirror.cpp (which would crash) // This command must be here to prevent to compile the same one in mirror.cpp (which would crash)
NLMISC_VARIABLE( string, MainNbEntities, "Not available on MS" ); NLMISC_CATEGORISED_VARIABLE( ms, string, MainNbEntities, "Not available on MS" );
NLMISC_DYNVARIABLE( float, EmittedKBPerSec, "Output rate for mirror deltas & messages" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, float, EmittedKBPerSec, "Output rate for mirror deltas & messages" )
{ {
if ( get ) if ( get )
*pointer = MSInstance->getEmittedKBytesPerSecond(); *pointer = MSInstance->getEmittedKBytesPerSecond();
} }
NLMISC_DYNVARIABLE( sint8, MainMTRTag, "Main MTR Tag" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, sint8, MainMTRTag, "Main MTR Tag" )
{ {
if ( get ) if ( get )
*pointer = MSInstance->mainTag().rawTag(); *pointer = MSInstance->mainTag().rawTag();
} }
NLMISC_DYNVARIABLE( bool, IsPureReceiver, "IsPureReceiver" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, bool, IsPureReceiver, "IsPureReceiver" )
{ {
if ( get ) if ( get )
*pointer = MSInstance->isPureReceiver(); *pointer = MSInstance->isPureReceiver();
} }
NLMISC_DYNVARIABLE( string, MirrorServiceVersion, "Version of MS" ) NLMISC_CATEGORISED_DYNVARIABLE( ms, string, MirrorServiceVersion, "Version of MS" )
{ {
if ( get ) if ( get )
*pointer = MirrorServiceVersion; *pointer = MirrorServiceVersion;

@ -528,13 +528,13 @@ void CMirrorService::serialToMessageFromLocalQueue( CMessage& msgout, const TMes
} }
NLMISC_COMMAND( displayAutomatonState, "Display the current state of the MS automaton", "" ) NLMISC_CATEGORISED_COMMAND( ms_automaton, displayAutomatonState, "Display the current state of the MS automaton", "" )
{ {
MSInstance->displayAutomatonState( &log ); MSInstance->displayAutomatonState( &log );
return true; return true;
} }
NLMISC_COMMAND( doNextTask, "Update automaton state", "" ) NLMISC_CATEGORISED_COMMAND( ms_automaton, doNextTask, "Update automaton state", "" )
{ {
MSInstance->doNextTask(); MSInstance->doNextTask();
return true; return true;

@ -467,7 +467,7 @@ void CTickProxy::init( void (*updateFunc)(),
} // init } // init
NLMISC_DYNVARIABLE(string, WaitingForServices, "Services that haven't tocked yet") NLMISC_CATEGORISED_DYNVARIABLE(tick_proxy, string, WaitingForServices, "Services that haven't tocked yet")
{ {
// we can only read the value // we can only read the value
if (get) if (get)
@ -478,14 +478,14 @@ NLMISC_DYNVARIABLE(string, WaitingForServices, "Services that haven't tocked yet
} }
NLMISC_DYNVARIABLE(NLMISC::TGameCycle, TickGameCycleProxy, "game cycle (in tick)") NLMISC_CATEGORISED_DYNVARIABLE(tick_proxy, NLMISC::TGameCycle, TickGameCycleProxy, "game cycle (in tick)")
{ {
// we can only read the value // we can only read the value
if (get) if (get)
*pointer = CTickProxy::getGameCycle (); *pointer = CTickProxy::getGameCycle ();
} }
NLMISC_DYNVARIABLE(NLMISC::TGameTime, TickGameTimeProxy, "game time (in second)") NLMISC_CATEGORISED_DYNVARIABLE(tick_proxy, NLMISC::TGameTime, TickGameTimeProxy, "game time (in second)")
{ {
// we can only read the value // we can only read the value
if (get) if (get)
@ -493,7 +493,7 @@ NLMISC_DYNVARIABLE(NLMISC::TGameTime, TickGameTimeProxy, "game time (in second)"
} }
NLMISC_COMMAND(displayTickProxyRecentHistory,"Display the history of tick events","") NLMISC_CATEGORISED_COMMAND(tick_proxy, displayTickProxyRecentHistory,"Display the history of tick events","")
{ {
RecentHistory.write( &log ); RecentHistory.write( &log );
return true; return true;

Loading…
Cancel
Save