projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modbus plugin: Add documentation and rename to "datagroup".
[collectd.git]
/
src
/
modbus.c
diff --git
a/src/modbus.c
b/src/modbus.c
index
7145c8a
..
661ab11
100644
(file)
--- a/
src/modbus.c
+++ b/
src/modbus.c
@@
-1,6
+1,7
@@
/**
* collectd - src/modbus.c
* Copyright (C) 2010 noris network AG
/**
* collectd - src/modbus.c
* Copyright (C) 2010 noris network AG
+ * Copyright (C) 2011 Universiteit Gent
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
@@
-18,6
+19,7
@@
*
* Authors:
* Florian Forster <octo at noris.net>
*
* Authors:
* Florian Forster <octo at noris.net>
+ * Ivo De Decker <ivo.dedecker at ugent.be>
**/
#include "collectd.h"
**/
#include "collectd.h"
@@
-88,14
+90,14
@@
struct mb_data_s /* {{{ */
mb_data_t *next;
}; /* }}} */
mb_data_t *next;
}; /* }}} */
-struct mb_data
set
_s;
-typedef struct mb_data
set_s mb_dataset
_t;
-struct mb_data
set
_s /* {{{ */
+struct mb_data
group
_s;
+typedef struct mb_data
group_s mb_datagroup
_t;
+struct mb_data
group
_s /* {{{ */
{
char *name;
mb_data_t *collect;
{
char *name;
mb_data_t *collect;
- mb_data
set
_t *next;
+ mb_data
group
_t *next;
}; /* }}} */
struct mb_slave_s /* {{{ */
}; /* }}} */
struct mb_slave_s /* {{{ */
@@
-141,7
+143,7
@@
struct mb_data_group_s /* {{{ */
* Global variables
*/
static mb_data_t *data_definitions = NULL;
* Global variables
*/
static mb_data_t *data_definitions = NULL;
-static mb_data
set_t *data_set
s = NULL;
+static mb_data
group_t *data_group
s = NULL;
/*
* Functions
/*
* Functions
@@
-235,10
+237,10
@@
static int data_copy_by_name (mb_data_t **dst, mb_data_t *src, /* {{{ */
return (data_copy (dst, ptr));
} /* }}} int data_copy_by_name */
return (data_copy (dst, ptr));
} /* }}} int data_copy_by_name */
-static mb_data
set_t *dataset_get_by_name (mb_dataset
_t *src, /* {{{ */
+static mb_data
group_t *datagroup_get_by_name (mb_datagroup
_t *src, /* {{{ */
const char *name)
{
const char *name)
{
- mb_data
set
_t *ptr;
+ mb_data
group
_t *ptr;
if (name == NULL)
return (NULL);
if (name == NULL)
return (NULL);
@@
-248,11
+250,11
@@
static mb_dataset_t *dataset_get_by_name (mb_dataset_t *src, /* {{{ */
return (ptr);
return (NULL);
return (ptr);
return (NULL);
-} /* }}} mb_data
set_t *dataset
_get_by_name */
+} /* }}} mb_data
group_t *datagroup
_get_by_name */
-static int data
set_append (mb_dataset_t **dst, mb_dataset
_t *src) /* {{{ */
+static int data
group_append (mb_datagroup_t **dst, mb_datagroup
_t *src) /* {{{ */
{
{
- mb_data
set
_t *ptr;
+ mb_data
group
_t *ptr;
if ((dst == NULL) || (src == NULL))
return (EINVAL);
if ((dst == NULL) || (src == NULL))
return (EINVAL);
@@
-271,12
+273,12
@@
static int dataset_append (mb_dataset_t **dst, mb_dataset_t *src) /* {{{ */
ptr->next = src;
return (0);
ptr->next = src;
return (0);
-} /* }}} int data
set
_append */
+} /* }}} int data
group
_append */
-/* Copy a single mb_data
set
_t and append it to another list. */
-static int data
set_copy (mb_dataset_t **dst, const mb_dataset
_t *src) /* {{{ */
+/* Copy a single mb_data
group
_t and append it to another list. */
+static int data
group_copy (mb_datagroup_t **dst, const mb_datagroup
_t *src) /* {{{ */
{
{
- mb_data
set
_t *tmp;
+ mb_data
group
_t *tmp;
int status;
if ((dst == NULL) || (src == NULL))
int status;
if ((dst == NULL) || (src == NULL))
@@
-296,7
+298,7
@@
static int dataset_copy (mb_dataset_t **dst, const mb_dataset_t *src) /* {{{ */
return (ENOMEM);
}
return (ENOMEM);
}
- status = data
set
_append (dst, tmp);
+ status = data
group
_append (dst, tmp);
if (status != 0)
{
sfree (tmp->name);
if (status != 0)
{
sfree (tmp->name);
@@
-305,7
+307,7
@@
static int dataset_copy (mb_dataset_t **dst, const mb_dataset_t *src) /* {{{ */
}
return (0);
}
return (0);
-} /* }}} int data
set
_copy */
+} /* }}} int data
group
_copy */
/* Read functions */
/* Read functions */
@@
-878,14
+880,14
@@
static int mb_config_add_slave (mb_host_t *host, oconfig_item_t *ci) /* {{{ */
data_copy_by_name (&slave->collect, data_definitions, buffer);
status = 0; /* continue after failure. */
}
data_copy_by_name (&slave->collect, data_definitions, buffer);
status = 0; /* continue after failure. */
}
- else if (strcasecmp ("Data
set
", child->key) == 0)
+ else if (strcasecmp ("Data
group
", child->key) == 0)
{
char buffer[1024];
{
char buffer[1024];
- mb_data
set
_t *ds;
+ mb_data
group
_t *ds;
status = cf_util_get_string_buffer (child, buffer, sizeof (buffer));
if (status == 0) {
status = cf_util_get_string_buffer (child, buffer, sizeof (buffer));
if (status == 0) {
- ds = data
set_get_by_name (data_set
s, buffer);
+ ds = data
group_get_by_name (data_group
s, buffer);
if (ds) {
mb_data_t *data;
for (data = ds->collect; data != NULL; data = data->next)
if (ds) {
mb_data_t *data;
for (data = ds->collect; data != NULL; data = data->next)
@@
-1006,18
+1008,18
@@
static int mb_config_add_host (oconfig_item_t *ci) /* {{{ */
} /* }}} int mb_config_add_host */
} /* }}} int mb_config_add_host */
-static int mb_config_add_data
set
(oconfig_item_t *ci) /* {{{ */
+static int mb_config_add_data
group
(oconfig_item_t *ci) /* {{{ */
{
{
- mb_data
set_t dataset
;
+ mb_data
group_t datagroup
;
int status;
int i;
int status;
int i;
- memset (&data
set, 0, sizeof (dataset
));
- data
set
.name = NULL;
- data
set
.collect = NULL;
- data
set
.next = NULL;
+ memset (&data
group, 0, sizeof (datagroup
));
+ data
group
.name = NULL;
+ data
group
.collect = NULL;
+ data
group
.next = NULL;
- status = cf_util_get_string (ci, &data
set
.name);
+ status = cf_util_get_string (ci, &data
group
.name);
for (i = 0; i < ci->children_num; i++)
{
for (i = 0; i < ci->children_num; i++)
{
@@
-1029,7
+1031,7
@@
static int mb_config_add_dataset (oconfig_item_t *ci) /* {{{ */
char buffer[1024];
status = cf_util_get_string_buffer (child, buffer, sizeof (buffer));
if (status == 0) {
char buffer[1024];
status = cf_util_get_string_buffer (child, buffer, sizeof (buffer));
if (status == 0) {
- data_copy_by_name (&data
set
.collect, data_definitions, buffer);
+ data_copy_by_name (&data
group
.collect, data_definitions, buffer);
}
status = 0; /* continue after failure. */
}
}
status = 0; /* continue after failure. */
}
@@
-1043,14
+1045,14
@@
static int mb_config_add_dataset (oconfig_item_t *ci) /* {{{ */
break;
} /* for (i = 0; i < ci->children_num; i++) */
break;
} /* for (i = 0; i < ci->children_num; i++) */
- if ((status == 0) && (data
set
.collect == NULL))
+ if ((status == 0) && (data
group
.collect == NULL))
status = EINVAL;
if (status == 0)
status = EINVAL;
if (status == 0)
- data
set_copy (&data_sets, &dataset
);
+ data
group_copy (&data_groups, &datagroup
);
return (status);
return (status);
-} /* }}} int mb_config_add_data
set
*/
+} /* }}} int mb_config_add_data
group
*/
static int mb_config (oconfig_item_t *ci) /* {{{ */
{
static int mb_config (oconfig_item_t *ci) /* {{{ */
{
@@
-1067,8
+1069,8
@@
static int mb_config (oconfig_item_t *ci) /* {{{ */
mb_config_add_data (child);
else if (strcasecmp ("Host", child->key) == 0)
mb_config_add_host (child);
mb_config_add_data (child);
else if (strcasecmp ("Host", child->key) == 0)
mb_config_add_host (child);
- else if (strcasecmp ("Data
set
", child->key) == 0)
- mb_config_add_data
set
(child);
+ else if (strcasecmp ("Data
group
", child->key) == 0)
+ mb_config_add_data
group
(child);
else
ERROR ("Modbus plugin: Unknown configuration option: %s", child->key);
}
else
ERROR ("Modbus plugin: Unknown configuration option: %s", child->key);
}