X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=8139c63123f0bf25eac0922cd1f8e5c5197ae43a;hb=f0b9430b0c0f45ada6f655dd4b9c64a8cbdf8d66;hp=876ee23ee71c8c33d2f230170bf94147a6012404;hpb=e9cc06595b478d522773be7cd03423f84f8d43b6;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 876ee23e..8139c631 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -69,7 +69,7 @@ typedef struct cf_complex_callback_s
 typedef struct cf_value_map_s
 {
 	char *key;
-	int (*func) (const oconfig_item_t *);
+	int (*func) (oconfig_item_t *);
 } cf_value_map_t;
 
 typedef struct cf_global_option_s
@@ -82,9 +82,10 @@ typedef struct cf_global_option_s
 /*
  * Prototypes of callback functions
  */
-static int dispatch_value_typesdb (const oconfig_item_t *ci);
-static int dispatch_value_plugindir (const oconfig_item_t *ci);
-static int dispatch_loadplugin (const oconfig_item_t *ci);
+static int dispatch_value_typesdb (oconfig_item_t *ci);
+static int dispatch_value_plugindir (oconfig_item_t *ci);
+static int dispatch_loadplugin (oconfig_item_t *ci);
+static int dispatch_block_plugin (oconfig_item_t *ci);
 
 /*
  * Private variables
@@ -96,7 +97,8 @@ static cf_value_map_t cf_value_map[] =
 {
 	{"TypesDB",    dispatch_value_typesdb},
 	{"PluginDir",  dispatch_value_plugindir},
-	{"LoadPlugin", dispatch_loadplugin}
+	{"LoadPlugin", dispatch_loadplugin},
+	{"Plugin",     dispatch_block_plugin}
 };
 static int cf_value_map_num = STATIC_ARRAY_SIZE (cf_value_map);
 
@@ -109,6 +111,8 @@ static cf_global_option_t cf_global_options[] =
 	{"Interval",    NULL, NULL},
 	{"ReadThreads", NULL, "5"},
 	{"WriteThreads", NULL, "5"},
+	{"WriteQueueLimitHigh", NULL, NULL},
+	{"WriteQueueLimitLow", NULL, NULL},
 	{"Timeout",     NULL, "2"},
 	{"AutoLoadPlugin", NULL, "false"},
 	{"PreCacheChain",  NULL, "PreCache"},
@@ -146,9 +150,12 @@ static int cf_dispatch (const char *type, const char *orig_key,
 	int ret;
 	int i;
 
+	if (orig_key == NULL)
+		return (EINVAL);
+
 	DEBUG ("type = %s, key = %s, value = %s",
 			ESCAPE_NULL(type),
-			ESCAPE_NULL(orig_key),
+			orig_key,
 			ESCAPE_NULL(orig_value));
 
 	if ((cf_cb = cf_search (type)) == NULL)
@@ -189,8 +196,6 @@ static int cf_dispatch (const char *type, const char *orig_key,
 	free (key);
 	free (value);
 
-	DEBUG ("cf_dispatch: return (%i)", ret);
-
 	return (ret);
 } /* int cf_dispatch */
 
@@ -217,7 +222,7 @@ static int dispatch_global_option (const oconfig_item_t *ci)
 	return (-1);
 } /* int dispatch_global_option */
 
-static int dispatch_value_typesdb (const oconfig_item_t *ci)
+static int dispatch_value_typesdb (oconfig_item_t *ci)
 {
 	int i = 0;
 
@@ -243,7 +248,7 @@ static int dispatch_value_typesdb (const oconfig_item_t *ci)
 	return (0);
 } /* int dispatch_value_typesdb */
 
-static int dispatch_value_plugindir (const oconfig_item_t *ci)
+static int dispatch_value_plugindir (oconfig_item_t *ci)
 {
 	assert (strcasecmp (ci->key, "PluginDir") == 0);
 	
@@ -256,7 +261,7 @@ static int dispatch_value_plugindir (const oconfig_item_t *ci)
 	return (0);
 }
 
-static int dispatch_loadplugin (const oconfig_item_t *ci)
+static int dispatch_loadplugin (oconfig_item_t *ci)
 {
 	int i;
 	const char *name;
@@ -342,7 +347,7 @@ static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
 	return (cf_dispatch (plugin, ci->key, buffer_ptr));
 } /* int dispatch_value_plugin */
 
-static int dispatch_value (const oconfig_item_t *ci)
+static int dispatch_value (oconfig_item_t *ci)
 {
 	int ret = -2;
 	int i;
@@ -382,9 +387,19 @@ static int dispatch_block_plugin (oconfig_item_t *ci)
 
 	if (IS_TRUE (global_option_get ("AutoLoadPlugin")))
 	{
+		plugin_ctx_t ctx;
+		plugin_ctx_t old_ctx;
 		int status;
 
+		/* default to the global interval set before loading this plugin */
+		memset (&ctx, 0, sizeof (ctx));
+		ctx.interval = cf_get_default_interval ();
+
+		old_ctx = plugin_set_ctx (ctx);
 		status = plugin_load (name, /* flags = */ 0);
+		/* reset to the "global" context */
+		plugin_set_ctx (old_ctx);
+
 		if (status != 0)
 		{
 			ERROR ("Automatically loading plugin \"%s\" failed "
@@ -475,6 +490,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
 
 	/* Resize the memory containing the children to be big enough to hold
 	 * all children. */
+	if (dst->children_num + src->children_num - 1 == 0)
+	{
+		dst->children_num = 0;
+		return (0);
+	}
+
 	temp = (oconfig_item_t *) realloc (dst->children,
 			sizeof (oconfig_item_t)
 			* (dst->children_num + src->children_num - 1));
@@ -586,10 +607,14 @@ static int cf_include_all (oconfig_item_t *root, int depth)
 		sfree (pattern);
 
 		if (new == NULL)
-			continue;
+			return (-1);
 
 		/* Now replace the i'th child in `root' with `new'. */
-		cf_ci_replace_child (root, new, i);
+		if (cf_ci_replace_child (root, new, i) < 0) {
+			sfree (new->values);
+			sfree (new);
+			return (-1);
+		}
 
 		/* ... and go back to the new i'th child. */
 		--i;
@@ -605,6 +630,7 @@ static oconfig_item_t *cf_read_file (const char *file,
 		const char *pattern, int depth)
 {
 	oconfig_item_t *root;
+	int status;
 
 	assert (depth < CF_MAX_DEPTH);
 
@@ -636,7 +662,12 @@ static oconfig_item_t *cf_read_file (const char *file,
 		return (NULL);
 	}
 
-	cf_include_all (root, depth);
+	status = cf_include_all (root, depth);
+	if (status != 0)
+	{
+		oconfig_free (root);
+		return (NULL);
+	}
 
 	return (root);
 } /* oconfig_item_t *cf_read_file */
@@ -672,6 +703,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 	if (root == NULL)
 	{
 		ERROR ("configfile: malloc failed.");
+		closedir (dh);
 		return (NULL);
 	}
 	memset (root, 0, sizeof (oconfig_item_t));
@@ -691,6 +723,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 			ERROR ("configfile: Not including `%s/%s' because its"
 					" name is too long.",
 					dir, de->d_name);
+			closedir (dh);
 			for (i = 0; i < filenames_num; ++i)
 				free (filenames[i]);
 			free (filenames);
@@ -703,6 +736,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 				filenames_num * sizeof (*filenames));
 		if (tmp == NULL) {
 			ERROR ("configfile: realloc failed.");
+			closedir (dh);
 			for (i = 0; i < filenames_num - 1; ++i)
 				free (filenames[i]);
 			free (filenames);
@@ -714,6 +748,12 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 		filenames[filenames_num - 1] = sstrdup (name);
 	}
 
+	if (filenames == NULL)
+	{
+		closedir (dh);
+		return (root);
+	}
+
 	qsort ((void *) filenames, filenames_num, sizeof (*filenames),
 			cf_compare_string);
 
@@ -737,11 +777,12 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 		free (name);
 	}
 
+	closedir (dh);
 	free(filenames);
 	return (root);
 } /* oconfig_item_t *cf_read_dir */
 
-/* 
+/*
  * cf_read_generic
  *
  * Path is stat'ed and either cf_read_file or cf_read_dir is called
@@ -829,12 +870,6 @@ static oconfig_item_t *cf_read_generic (const char *path,
 
 	wordfree (&we);
 
-	if (root->children == NULL)
-	{
-		oconfig_free (root);
-		return (NULL);
-	}
-
 	return (root);
 } /* oconfig_item_t *cf_read_generic */
 /* #endif HAVE_WORDEXP_H */
@@ -915,6 +950,23 @@ const char *global_option_get (const char *option)
 			: cf_global_options[i].def);
 } /* char *global_option_get */
 
+long global_option_get_long (const char *option, long default_value)
+{
+		const char *str;
+		long value;
+
+		str = global_option_get (option);
+		if (NULL == str)
+			return (default_value);
+
+		errno = 0;
+		value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
+		if (errno != 0)
+			return (default_value);
+
+		return (value);
+} /* char *global_option_get_long */
+
 cdtime_t cf_get_default_interval (void)
 {
   char const *str = global_option_get ("Interval");
@@ -1046,6 +1098,12 @@ int cf_read (char *filename)
 		ERROR ("Unable to read config file %s.", filename);
 		return (-1);
 	}
+	else if (conf->children_num == 0)
+	{
+		ERROR ("Configuration file %s is empty.", filename);
+		oconfig_free (conf);
+		return (-1);
+	}
 
 	for (i = 0; i < conf->children_num; i++)
 	{