This patch implements loading files from /etc/cgconfig.d/. It uses
already implemented functions. To hold list of files to be read for
template reloading, new static variable for this list (list of template
files) has been added to config.c. It is the same list as file list read
with cgconfigparser (cgconfig.c file), i.e. the same functions are
called. Because parser reads only one file, it is called for each file
in template file list. Thus initialization, resp. template duplication
has to be called before, resp. after each file parsing. Thus new
functions has been presented, thus modifying config.[h|c] api and
libcgroup.map. Again parsing more files for templates is analogy to
parsing files for groups in cgconfig.c.
cgroup_reload_cached_templates_from_file and
cgroup_init_templates_cache_from_files are modification of
cgroup_reload_cached_templates and cgroup_init_templates_cache. Only for
loop and auxiliary variables added.
Signed-off-by: Jan Chaloupka<jchal...@redhat.com>
---
include/libcgroup/config.h | 18 ++++
src/config.c | 203
++++++++++++++++++++++++++++++++++++++++++++-
src/libcgroup.map | 6 ++
3 files changed, 224 insertions(+), 3 deletions(-)
diff --git a/include/libcgroup/config.h b/include/libcgroup/config.h
index 43568e1..cf52922 100644
--- a/include/libcgroup/config.h
+++ b/include/libcgroup/config.h
@@ -84,6 +84,24 @@ int cgroup_init_templates_cache(char *pathname);
int cgroup_reload_cached_templates(char *pathname);
/**
+ * Initializes the templates cache from files.
+ */
+struct cgroup_string_list;
+int cgroup_init_templates_cache_from_files(int * file_index);
+
+/**
+ * Reloads the templates list, using the given configuration files.
+ */
+int cgroup_reload_cached_templates_from_file(int * file_index);
+
+/**
+ * Setting source files of templates. This function has to be called before
+ * any call of cgroup_init_templates_cache_from_files and
+ * cgroup_reload_cached_templates_from_file.
+ */
+void cgroup_templates_cache_set_source_files(struct cgroup_string_list
* tmpl_files);
+
+/**
* Physically create a new control group in kernel, based on given control
* group template and configuration file. If given template is not set in
* configuration file, then the procedure works create the control group
diff --git a/src/config.c b/src/config.c
index e1ee0a8..c6096b2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -41,6 +41,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include "tools/tools-common.h"
+
unsigned int MAX_CGROUPS = 64; /* NOTE: This value changes
dynamically */
unsigned int MAX_TEMPLATES = 64;
/* NOTE: This value changes dynamically */
@@ -89,6 +91,7 @@ static int config_template_table_index;
*/
static struct cgroup *template_table;
static int template_table_index;
+static struct cgroup_string_list * template_files = NULL;
/*
@@ -1572,6 +1575,199 @@ int cgroup_init_templates_cache(char *pathname)
}
+/**
+ * Setting source files of templates. This function has to be called before
+ * any call of cgroup_init_templates_cache_from_files and
+ * cgroup_reload_cached_templates_from_file.
+ * @param tmpl_files
+ */
+void cgroup_templates_cache_set_source_files(struct cgroup_string_list
* tmpl_files) {
+ template_files = tmpl_files;
+}
+
+/**
+ * Initializes the templates cache from files.
+ * @return 0 on success, > 0 on error
+ */
+int cgroup_init_templates_cache_from_files(int * file_index) {
+ int ret = 0;
+ int i, j;
+
+ if (!template_files) {
+ /* source files has not been set */
+ cgroup_dbg("Template source files have not been set\n");
+ ret = ECGOTHER;
+ *file_index = -1;
+ return ret;
+ }
+
+ if (template_table) {
+ /* template structures have to be free */
+ for (i = 0; i < template_table_index; i++)
+ cgroup_free_controllers(&template_table[i]);
+ free(template_table);
+ template_table = NULL;
+ }
+ template_table_index = 0;
+
+ if ((config_template_table_index != 0) || (config_table_index != 0)) {
+ /* config structures have to be clean */
+ cgroup_free_config();
+ }
+
+ char * pathname;
+ int template_table_last_index = 0;
+
+ for (j = 0; j < template_files->count; j++) {
+ pathname = template_files->items[j];
+
+ cgroup_dbg("Loading cached templates from %s.\n", pathname);
+ /* Attempt to read the configuration file and cache the
rules. */
+ ret = cgroup_parse_config(pathname);
+ if (ret) {
+ cgroup_dbg("Could not initialize rule cache, error
was: %d\n",
+ ret);
+ *file_index = j;
+ return ret;
+ }
+
+ /* copy template data to templates cache structures */
+ if (config_template_table_index > 0) {
+ template_table_last_index = template_table_index;
+ template_table_index += config_template_table_index;
+ template_table = realloc(template_table,
template_table_index*sizeof(struct cgroup));
+
+ if (template_table == NULL) {
+ ret = ECGOTHER;
+ return ret;
+ }
+
+ for (i = 0; i < config_template_table_index; i++) {
+ template_table[i + template_table_last_index].index
= 0;
+ }
+ }
+
+ cgroup_dbg("Init cache: copying templates to template table
from %s.\n", pathname);
+ for (i = 0; i < config_template_table_index; i++) {
+ int ti = i + template_table_last_index;
+ cgroup_copy_cgroup(&template_table[ti],
+ &config_template_table[i]);
+ strcpy((template_table[ti]).name,
+ (config_template_table[i]).name);
+ template_table[ti].tasks_uid =
+ config_template_table[i].tasks_uid;
+ template_table[ti].tasks_gid =
+ config_template_table[i].tasks_gid;
+ template_table[ti].task_fperm =
+ config_template_table[i].task_fperm;
+ template_table[ti].control_uid =
+ config_template_table[i].control_uid;
+ template_table[ti].control_gid =
+ config_template_table[i].control_gid;
+ template_table[ti].control_fperm =
+ config_template_table[i].control_fperm;
+ template_table[ti].control_dperm =
+ config_template_table[i].control_dperm;
+ }
+ cgroup_dbg("Init cache: Templates to template table copied\n");
+ }
+
+ return ret;
+}
+
+/**
+ * Reloads the templates list, using the given configuration files.
+ * @return 0 on success, > 0 on failure
+ */
+int cgroup_reload_cached_templates_from_file(int * file_index)
+{
+ int i, j;
+ int ret = 0;
+
+ if (!template_files) {
+ /* source files has not been set */
+ cgroup_dbg("Template source files have not been set\n");
+ ret = ECGOTHER;
+ *file_index = -1;
+ return ret;
+ }
+
+ if (template_table) {
+ /* template structures have to be free */
+ for (i = 0; i < template_table_index; i++)
+ cgroup_free_controllers(&template_table[i]);
+ free(template_table);
+ template_table = NULL;
+ }
+ template_table_index = 0;
+
+ if ((config_template_table_index != 0) || (config_table_index != 0)) {
+ /* config template structures have to be free as well*/
+ cgroup_free_config();
+ }
+
+
+ char * pathname;
+ int template_table_last_index = 0;
+
+ for (j = 0; j < template_files->count; j++) {
+ pathname = template_files->items[j];
+
+ /* reloading data to config template structures */
+ cgroup_dbg("Reloading cached templates from %s.\n", pathname);
+ ret = cgroup_parse_config(pathname);
+ if (ret) {
+ cgroup_dbg("Could not reload template cache, error
was: %d\n",
+ ret);
+ *file_index = j;
+ return ret;
+ }
+
+ /* copy data to templates cache structures */
+ if (config_template_table_index > 0) {
+ template_table_last_index = template_table_index;
+ template_table_index += config_template_table_index;
+ template_table = realloc(template_table,
template_table_index*sizeof(struct cgroup));
+
+ if (template_table == NULL) {
+ ret = ECGOTHER;
+ return ret;
+ }
+
+ /* clear cgroups of new templates */
+ for (i = 0; i < config_template_table_index; i++) {
+ template_table[i + template_table_last_index].index
= 0;
+ }
+ }
+
+ cgroup_dbg("Reload cache: copying templates to template
table from %s.\n", pathname);
+ for (i = 0; i < config_template_table_index; i++) {
+ int ti = i + template_table_last_index;
+ cgroup_copy_cgroup(&template_table[ti],
+ &config_template_table[i]);
+ strcpy((template_table[ti]).name,
+ (config_template_table[i]).name);
+ template_table[ti].tasks_uid =
+ config_template_table[i].tasks_uid;
+ template_table[ti].tasks_gid =
+ config_template_table[i].tasks_gid;
+ template_table[ti].task_fperm =
+ config_template_table[i].task_fperm;
+ template_table[ti].control_uid =
+ config_template_table[i].control_uid;
+ template_table[ti].control_gid =
+ config_template_table[i].control_gid;
+ template_table[ti].control_fperm =
+ config_template_table[i].control_fperm;
+ template_table[ti].control_dperm =
+ config_template_table[i].control_dperm;
+ }
+ cgroup_dbg("Reload cache: Templates to template table
copied\n");
+ }
+
+ return ret;
+}
+
/*
* Create a given cgroup, based on template configuration if it is present
* if the template is not present cgroup is creted using
cgroup_create_cgroup
@@ -1593,13 +1789,14 @@ int cgroup_config_create_template_group(struct
cgroup *cgroup,
* use CGCONFIG_CONF_FILE by default
*/
if (!(flags & CGFLAG_USE_TEMPLATE_CACHE)) {
+ int fileindex;
if (template_table_index == 0)
/* the rules cache is empty */
- ret = cgroup_init_templates_cache(CGCONFIG_CONF_FILE);
+ ret =
cgroup_init_templates_cache_from_files(&fileindex);
+
else
/* cache is not empty */
- ret = cgroup_reload_cached_templates(
- CGCONFIG_CONF_FILE);
+ ret =
cgroup_reload_cached_templates_from_file(&fileindex);
if (ret != 0) {
cgroup_dbg("Failed initialize templates cache.\n");
return ret;
diff --git a/src/libcgroup.map b/src/libcgroup.map
index b0c162c..f853af0 100644
--- a/src/libcgroup.map
+++ b/src/libcgroup.map
@@ -117,3 +117,9 @@ CGROUP_0.39 {
cgroup_log;
cgroup_parse_log_level_str;
} CGROUP_0.38;
+
+CGROUP_0.40 {
+ cgroup_init_templates_cache_from_files;
+ cgroup_reload_cached_templates_from_file;
+ cgroup_templates_cache_set_source_files;
+} CGROUP_0.39;
--
1.9.0
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
