X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fplugin.c;h=30a1ff1a304911f91e571fe56cd22c4d15535078;hb=480d66bbe1970d6cbb68765878f2ee6187bbd5b2;hp=6c7aa057cf2d272b126eadf6308a76188d3f3b1a;hpb=c27675331d874c85625d2e64ebcc229db588c5f2;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 6c7aa057..30a1ff1a 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1,19 +1,24 @@
 /**
  * collectd - src/plugin.c
- * Copyright (C) 2005-2013  Florian octo Forster
+ * Copyright (C) 2005-2014  Florian octo Forster
  *
- * 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; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * 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.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * 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
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Florian octo Forster <octo at collectd.org>
@@ -2089,6 +2094,65 @@ int plugin_dispatch_values (value_list_t const *vl)
 	return (0);
 }
 
+__attribute__((sentinel))
+int plugin_dispatch_multivalue (value_list_t const *template, /* {{{ */
+		_Bool store_percentage, ...)
+{
+	value_list_t *vl;
+	int failed = 0;
+	gauge_t sum = 0.0;
+	va_list ap;
+
+	assert (template->values_len == 1);
+
+	va_start (ap, store_percentage);
+	while (42)
+	{
+		char const *name;
+		gauge_t value;
+
+		name = va_arg (ap, char const *);
+		if (name == NULL)
+			break;
+
+		value = va_arg (ap, gauge_t);
+		if (!isnan (value))
+			sum += value;
+	}
+	va_end (ap);
+
+	vl = plugin_value_list_clone (template);
+	/* plugin_value_list_clone makes sure vl->time is set to non-zero. */
+	if (store_percentage)
+		sstrncpy (vl->type, "percent", sizeof (vl->type));
+
+	va_start (ap, store_percentage);
+	while (42)
+	{
+		char const *name;
+		int status;
+
+		/* Set the type instance. */
+		name = va_arg (ap, char const *);
+		if (name == NULL)
+			break;
+		sstrncpy (vl->type_instance, name, sizeof (vl->type_instance));
+
+		/* Set the value. */
+		vl->values[0].gauge = va_arg (ap, gauge_t);
+		if (store_percentage)
+			vl->values[0].gauge *= 100.0 / sum;
+
+		status = plugin_write_enqueue (vl);
+		if (status != 0)
+			failed++;
+	}
+	va_end (ap);
+
+	plugin_value_list_free (vl);
+	return (failed);
+} /* }}} int plugin_dispatch_multivalue */
+
 int plugin_dispatch_notification (const notification_t *notif)
 {
 	llentry_t *le;