Skip to content

Commit

Permalink
Merge pull request #276 from SlySven/(release_30)enhance_allowSupress…
Browse files Browse the repository at this point in the history 
…ionOfShortIntervalTimerDebugOutput

(release_30)Bugfix/Enhance:  Suppress debug output from short interval timers
  • Loading branch information
@SlySven
SlySven committed Oct 30, 2015
2 parents b19e2b3 + 9e6e764 commit 3d06729
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 42 deletions.
8 changes: 8 additions & 0 deletions src/Host.h
View file
Expand Up @@ -321,6 +321,14 @@ class Host : public QObject
bool mFORCE_MXP_NEGOTIATION_OFF;
bool mHaveMapperScript;
QSet<QChar> mDoubleClickIgnore;
int mTimerDebugOutputSuppressionInterval;
// Set from last page of profile preferences if the
// timer interval is less than this in milliseconds then
// the normal reoccuring debug output of the entire
// command and script for any timer with a timeout LESS
// than this is NOT shown - this is so the spammy output
// from short timeout timers can be suppressed. The
// single execute OK line will still be shown.
};

#endif // MUDLET_HOST_H
57 changes: 30 additions & 27 deletions src/TTimer.cpp
View file
Expand Up @@ -237,64 +237,67 @@ bool TTimer::checkRestart()

void TTimer::execute()
{
if( ! isActive() || mIsFolder )
{
if( ! isActive() || mIsFolder ) {
mpTimer->stop();
return;
}

if( mudlet::debugMode ) {TDebug(QColor(Qt::darkYellow),QColor(Qt::darkBlue)) << "\n[TIMER EXECUTES]: "<<mName<<" fired. Executing command="<<mCommand<<" and executing script:"<<mScript<<"\n" >> 0;}
if( mudlet::debugMode
&& mpTimer->interval() > mpHost->mTimerDebugOutputSuppressionInterval ) {
// Second term is to suppress execution debug output from short interval timers
TDebug( QColor(Qt::darkYellow), QColor(Qt::darkBlue) ) << "\n[TIMER EXECUTES]: "
<< mName
<< " fired. Executing command="
<< mCommand
<< " and executing script:"
<< mScript
<< "\n"
>> 0;
}

if( mIsTempTimer )
{
if( mScript == "" )
{
if( mIsTempTimer ) {
if( mScript.isEmpty() ) {
mpHost->mLuaInterpreter.call_luafunction( this );
}
else
{
else {
mpHost->mLuaInterpreter.compileAndExecuteScript( mScript );
}
mpTimer->stop();
mpHost->mTimerUnit.markCleanup( this );
return;
}

if( ( ! isFolder() && hasChildren() ) || ( isOffsetTimer() ) )
{
if( ( ! isFolder() && hasChildren() )
|| ( isOffsetTimer() ) ) {

typedef list<TTimer *>::const_iterator I;
for( I it = mpMyChildrenList->begin(); it != mpMyChildrenList->end(); it++)
{
for( I it = mpMyChildrenList->begin();
it != mpMyChildrenList->end();
++it ) {

TTimer * pChild = *it;
if( pChild->isOffsetTimer() )
{
if( pChild->isOffsetTimer() ) {
pChild->enableTimer( pChild->getID() );
}
}
if( isOffsetTimer() )
{
if( isOffsetTimer() ) {
disableTimer( mID );
deactivate();
}
}

if( mCommand.size() > 0 )
{
if( ! mCommand.isEmpty() ) {
mpHost->send( mCommand );
}

if( mScript.size() > 0 )
{
if( mNeedsToBeCompiled )
{
if( ! compileScript() )
{
if( ! mScript.isEmpty() ) {
if( mNeedsToBeCompiled ) {
if( ! compileScript() ) {
disableTimer();
return;
}
}
if( ! mpHost->mLuaInterpreter.call( mFuncName, mName ) )
{
if( ! mpHost->mLuaInterpreter.call( mFuncName, mName ) ) {
mpTimer->stop();
}
}
Expand Down
16 changes: 14 additions & 2 deletions src/dlgProfilePreferences.cpp
View file
Expand Up @@ -456,6 +456,10 @@ dlgProfilePreferences::dlgProfilePreferences( QWidget * pF, Host * pH )
ignore = ignore.append(it.next());
doubleclick_ignore_lineedit->setText( ignore );

timeEdit_timerDebugOutputMinimumInterval->setTime( QTime( 0, 0, 0, 1).addMSecs( pHost->mTimerDebugOutputSuppressionInterval - 1 ) );
// The above funky setting method is because a zero time is INVALID
// and since Qt 5.0-ish adding any value to an invalid time still leaves
// the time as "invalid".
}
}

Expand Down Expand Up @@ -1544,9 +1548,17 @@ void dlgProfilePreferences::slot_save_and_exit()
mudlet::self()->mConsoleMap[pHost]->changeColors();
}
QString lIgnore = doubleclick_ignore_lineedit->text();
mpHost->mDoubleClickIgnore.clear();
pHost->mDoubleClickIgnore.clear();
for(int i=0;i<lIgnore.size();i++){
mpHost->mDoubleClickIgnore.insert(lIgnore.at(i));
pHost->mDoubleClickIgnore.insert(lIgnore.at(i));
}
QTime _midnight( 0, 0, 0, 1 );
// zero time is NOT valid and QTime::msecsTo( const QTime & other ) returns
// 0 if EITHER time is invalid
pHost->mTimerDebugOutputSuppressionInterval = _midnight.msecsTo( timeEdit_timerDebugOutputMinimumInterval->time() ) - 1;
if( pHost->mTimerDebugOutputSuppressionInterval < 0 ) {
// Clean up if the control IS at zero, so the msecTo() fails and returns 0
pHost->mTimerDebugOutputSuppressionInterval = 0;
}

//pHost->mIRCNick = ircNick->text();
Expand Down
73 changes: 60 additions & 13 deletions src/ui/profile_preferences.ui
View file
Expand Up @@ -1810,19 +1810,6 @@ or some other computer model that has a small screen.</string>
<string>Special Options</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_7">
<item row="1" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
Expand Down Expand Up @@ -1888,6 +1875,66 @@ or some other computer model that has a small screen.</string>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_Debug">
<property name="title">
<string>Other Special options</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_timerDebugOutputMinimumInterval">
<property name="text">
<string>Minimum interval for a Timer to show execution output in debug window:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QTimeEdit" name="timeEdit_timerDebugOutputMinimumInterval">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::PlusMinus</enum>
</property>
<property name="specialValueText">
<string>show all</string>
</property>
<property name="accelerated">
<bool>true</bool>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
<property name="currentSection">
<enum>QDateTimeEdit::HourSection</enum>
</property>
<property name="displayFormat">
<string notr="true">h:mm:ss.zzz</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down

0 comments on commit 3d06729

Please sign in to comment.