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

Implement TimePeriod::RemoveSegment().

This commit is contained in:
Gunnar Beutner 2013-03-14 07:29:53 +01:00
parent 442a2dbc7d
commit d99671ba0e
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/icinga.vcxproj.filters
View File

@ -70,6 +70,9 @@
<ClCompile Include="icinga-type.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="timeperiod.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="i2-icinga.h">
@ -126,6 +129,9 @@
<ClInclude Include="usergroup.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="timeperiod.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Headerdateien">

22
lib/icinga/timeperiod.cpp
View File

@ -119,12 +119,32 @@ void TimePeriod::RemoveSegment(double begin, double end)
if (!segments)
return;
Array::Ptr newSegments = boost::make_shared<Array>();
/* Try to split or adjust an existing segment. */
ObjectLock dlock(segments);
BOOST_FOREACH(const Dictionary::Ptr& segment, segments) {
BOOST_THROW_EXCEPTION(runtime_error("Not implemented."));
/* Fully contained in the specified range? */
if (segment->Get("begin") >= begin && segment->Get("end") <= end)
continue;
/* Not overlapping at all? */
if (segment->Get("end") < begin || segment->Get("begin") > end) {
newSegments->Add(segment);
continue;
}
/* Create a new segment and adjust its begin/end timestamps
* so as to not overlap with the specified range. */
Dictionary::Ptr newSegment = boost::make_shared<Dictionary>();
newSegment->Set("begin", (segment->Get("begin") < end) ? end : segment->Get("begin"));
newSegment->Set("end", (segment->Get("end") > begin) ? begin : segment->Get("end"));
newSegments->Add(newSegment);
}
m_Segments = newSegments;
Touch("segments");
}