Merge branch 'support/2.10'

[icinga2] / lib / livestatus / invsumaggregator.cpp

diff --git a/lib/livestatus/invsumaggregator.cpp b/lib/livestatus/invsumaggregator.cpp
index 095b4e96fd42005657158f9cc6c519a31bba4a8c..c955667fc23a02a0afdad7f9373c841f65c74cb1 100644 (file)
--- a/lib/livestatus/invsumaggregator.cpp
+++ b/lib/livestatus/invsumaggregator.cpp
@@ -1,40 +1,37 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "livestatus/invsumaggregator.hpp"
 
 using namespace icinga;
 
-InvSumAggregator::InvSumAggregator(const String& attr)
-    : m_InvSum(0), m_InvSumAttr(attr)
+InvSumAggregator::InvSumAggregator(String attr)
+       : m_InvSumAttr(std::move(attr))
 { }
 
-void InvSumAggregator::Apply(const Table::Ptr& table, const Value& row)
+InvSumAggregatorState *InvSumAggregator::EnsureState(AggregatorState **state)
+{
+       if (!*state)
+               *state = new InvSumAggregatorState();
+
+       return static_cast<InvSumAggregatorState *>(*state);
+}
+
+void InvSumAggregator::Apply(const Table::Ptr& table, const Value& row, AggregatorState **state)
 {
        Column column = table->GetColumn(m_InvSumAttr);
 
        Value value = column.ExtractValue(row);
 
-       m_InvSum += (1.0 / value);
+       InvSumAggregatorState *pstate = EnsureState(state);
+
+       pstate->InvSum += (1.0 / value);
 }
 
-double InvSumAggregator::GetResult(void) const
+double InvSumAggregator::GetResultAndFreeState(AggregatorState *state) const
 {
-       return m_InvSum;
+       InvSumAggregatorState *pstate = EnsureState(&state);
+       double result = pstate->InvSum;
+       delete pstate;
+
+       return result;
 }