tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize signal calls. 

Refs #5049
This commit is contained in:
Gunnar Beutner 2013-11-10 16:53:57 +01:00
parent 45a6ca6cb3
commit 9a764d8a08
8 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/checker/checkercomponent.h
View File

@ -50,14 +50,7 @@ struct ServiceNextCheckExtractor
if (!service->HasAuthority("checker")) if (!service->HasAuthority("checker"))
return Utility::GetTime() + 60; return Utility::GetTime() + 60;
double next = service->GetNextCheck(); return service->GetNextCheck();
while (next == 0) {
service->UpdateNextCheck();
next = service->GetNextCheck();
}
return next;
} }
}; };

2
lib/icinga/notification.cpp
View File

@ -130,7 +130,7 @@ void Notification::SetNextNotification(double time, const String& authority)
{ {
SetNextNotificationRaw(time); SetNextNotificationRaw(time);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnNextNotificationChanged), GetSelf(), time, authority)); OnNextNotificationChanged(GetSelf(), time, authority);
} }
void Notification::UpdateNotificationNumber(void) void Notification::UpdateNotificationNumber(void)

20
lib/icinga/service-check.cpp
View File

@ -94,7 +94,7 @@ void Service::SetNextCheck(double nextCheck, const String& authority)
{ {
SetNextCheckRaw(nextCheck); SetNextCheckRaw(nextCheck);
Utility::QueueAsyncCallback(boost::bind(boost::ref(Service::OnNextCheckChanged), GetSelf(), nextCheck, authority)); OnNextCheckChanged(GetSelf(), nextCheck, authority);
} }
double Service::GetNextCheck(void) double Service::GetNextCheck(void)
@ -150,7 +150,7 @@ void Service::SetEnableActiveChecks(bool enabled, const String& authority)
{ {
SetOverrideEnableActiveChecks(enabled); SetOverrideEnableActiveChecks(enabled);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableActiveChecksChanged), GetSelf(), enabled, authority)); OnEnableActiveChecksChanged(GetSelf(), enabled, authority);
} }
bool Service::GetEnablePassiveChecks(void) const bool Service::GetEnablePassiveChecks(void) const
@ -165,7 +165,7 @@ void Service::SetEnablePassiveChecks(bool enabled, const String& authority)
{ {
SetOverrideEnablePassiveChecks(enabled); SetOverrideEnablePassiveChecks(enabled);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnablePassiveChecksChanged), GetSelf(), enabled, authority)); OnEnablePassiveChecksChanged(GetSelf(), enabled, authority);
} }
bool Service::GetForceNextCheck(void) const bool Service::GetForceNextCheck(void) const
@ -177,7 +177,7 @@ void Service::SetForceNextCheck(bool forced, const String& authority)
{ {
SetForceNextCheckRaw(forced); SetForceNextCheckRaw(forced);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnForceNextCheckChanged), GetSelf(), forced, authority)); OnForceNextCheckChanged(GetSelf(), forced, authority);
} }
void Service::ProcessCheckResult(const CheckResult::Ptr& cr, const String& authority) void Service::ProcessCheckResult(const CheckResult::Ptr& cr, const String& authority)
@ -367,15 +367,13 @@ void Service::ProcessCheckResult(const CheckResult::Ptr& cr, const String& autho
// " threshold: " + Convert::ToString(GetFlappingThreshold()) + // " threshold: " + Convert::ToString(GetFlappingThreshold()) +
// "% current: " + Convert::ToString(GetFlappingCurrent()) + "%."); // "% current: " + Convert::ToString(GetFlappingCurrent()) + "%.");
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnNewCheckResult), GetSelf(), cr, authority)); OnNewCheckResult(GetSelf(), cr, authority);
OnStateChanged(GetSelf()); OnStateChanged(GetSelf());
if (hardChange) { if (hardChange)
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnStateChange), GetSelf(), cr, StateTypeHard, authority)); OnStateChange(GetSelf(), cr, StateTypeHard, authority);
} else if (stateChange)
else if (stateChange) { OnStateChange(GetSelf(), cr, StateTypeSoft, authority);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnStateChange), GetSelf(), cr, StateTypeSoft, authority));
}
if (call_eventhandler) if (call_eventhandler)
ExecuteEventHandler(); ExecuteEventHandler();

4
lib/icinga/service-comment.cpp
View File

@ -79,7 +79,7 @@ String Service::AddComment(CommentType entryType, const String& author,
l_CommentsCache[uid] = GetSelf(); l_CommentsCache[uid] = GetSelf();
} }
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnCommentAdded), GetSelf(), comment, authority)); OnCommentAdded(GetSelf(), comment, authority);
return uid; return uid;
} }
@ -126,7 +126,7 @@ void Service::RemoveComment(const String& id, const String& authority)
l_CommentsCache.erase(id); l_CommentsCache.erase(id);
} }
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnCommentRemoved), owner, comment, authority)); OnCommentRemoved(owner, comment, authority);
} }
String Service::GetCommentIDFromLegacyID(int id) String Service::GetCommentIDFromLegacyID(int id)

6
lib/icinga/service-downtime.cpp
View File

@ -99,7 +99,7 @@ String Service::AddDowntime(const String& author, const String& comment,
Log(LogWarning, "icinga", "added downtime with ID '" + Convert::ToString(downtime->GetLegacyId()) + "'."); Log(LogWarning, "icinga", "added downtime with ID '" + Convert::ToString(downtime->GetLegacyId()) + "'.");
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeAdded), GetSelf(), downtime, authority)); OnDowntimeAdded(GetSelf(), downtime, authority);
return uid; return uid;
} }
@ -132,7 +132,7 @@ void Service::RemoveDowntime(const String& id, bool cancelled, const String& aut
Log(LogWarning, "icinga", "removed downtime with ID '" + Convert::ToString(downtime->GetLegacyId()) + "' from service '" + owner->GetName() + "'."); Log(LogWarning, "icinga", "removed downtime with ID '" + Convert::ToString(downtime->GetLegacyId()) + "' from service '" + owner->GetName() + "'.");
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeRemoved), owner, downtime, authority)); OnDowntimeRemoved(owner, downtime, authority);
} }
void Service::TriggerDowntimes(void) void Service::TriggerDowntimes(void)
@ -185,7 +185,7 @@ void Service::TriggerDowntime(const String& id)
TriggerDowntime(tid); TriggerDowntime(tid);
} }
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnDowntimeTriggered), owner, downtime)); OnDowntimeTriggered(owner, downtime);
} }
String Service::GetDowntimeIDFromLegacyID(int id) String Service::GetDowntimeIDFromLegacyID(int id)

2
lib/icinga/service-flapping.cpp
View File

@ -50,7 +50,7 @@ void Service::SetEnableFlapping(bool enabled, const String& authority)
SetEnableFlappingRaw(enabled); SetEnableFlappingRaw(enabled);
OnFlappingChanged(GetSelf(), enabled ? FlappingEnabled : FlappingDisabled); OnFlappingChanged(GetSelf(), enabled ? FlappingEnabled : FlappingDisabled);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableFlappingChanged), GetSelf(), enabled, authority)); OnEnableFlappingChanged(GetSelf(), enabled, authority);
} }
void Service::UpdateFlappingStatus(bool stateChange) void Service::UpdateFlappingStatus(bool stateChange)

4
lib/icinga/service-notification.cpp
View File

@ -171,7 +171,7 @@ void Service::SetEnableNotifications(bool enabled, const String& authority)
{ {
SetEnableNotificationsRaw(enabled); SetEnableNotificationsRaw(enabled);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnEnableNotificationsChanged), GetSelf(), enabled, authority)); OnEnableNotificationsChanged(GetSelf(), enabled, authority);
} }
bool Service::GetForceNextNotification(void) const bool Service::GetForceNextNotification(void) const
@ -183,5 +183,5 @@ void Service::SetForceNextNotification(bool forced, const String& authority)
{ {
SetForceNextNotificationRaw(forced); SetForceNextNotificationRaw(forced);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnForceNextNotificationChanged), GetSelf(), forced, authority)); OnForceNextNotificationChanged(GetSelf(), forced, authority);
} }

5
lib/icinga/service.cpp
View File

@ -199,8 +199,7 @@ void Service::AcknowledgeProblem(const String& author, const String& comment, Ac
OnNotificationsRequested(GetSelf(), NotificationAcknowledgement, GetLastCheckResult(), author, comment); OnNotificationsRequested(GetSelf(), NotificationAcknowledgement, GetLastCheckResult(), author, comment);
boost::function<void (void)> f = boost::bind(boost::ref(Service::OnAcknowledgementSet), GetSelf(), author, comment, type, expiry, authority); OnAcknowledgementSet(GetSelf(), author, comment, type, expiry, authority);
Utility::QueueAsyncCallback(f);
} }
void Service::ClearAcknowledgement(const String& authority) void Service::ClearAcknowledgement(const String& authority)
@ -210,7 +209,7 @@ void Service::ClearAcknowledgement(const String& authority)
SetAcknowledgementRaw(AcknowledgementNone); SetAcknowledgementRaw(AcknowledgementNone);
SetAcknowledgementExpiry(0); SetAcknowledgementExpiry(0);
Utility::QueueAsyncCallback(boost::bind(boost::ref(OnAcknowledgementCleared), GetSelf(), authority)); OnAcknowledgementCleared(GetSelf(), authority);
} }
std::set<Host::Ptr> Service::GetParentHosts(void) const std::set<Host::Ptr> Service::GetParentHosts(void) const