diff options
| author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-09-29 12:26:50 +0000 |
|---|---|---|
| committer | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-09-29 12:26:50 +0000 |
| commit | d1ab753ba5d0d641b52cb90e00ce2eabfae476f4 (patch) | |
| tree | 984149374ff224629121be769d9e6a4e0eedcf63 /parse.y | |
| parent | 1d00fc725ba26db40b2c792c75888c2ed777730d (diff) | |
| download | libcg-d1ab753ba5d0d641b52cb90e00ce2eabfae476f4.tar.gz libcg-d1ab753ba5d0d641b52cb90e00ce2eabfae476f4.tar.xz libcg-d1ab753ba5d0d641b52cb90e00ce2eabfae476f4.zip | |
Configuration rewrite to use the main cgroups API and several bug fixes
and configuration enhancements. Primarliy Initiated by Dhaval Giani
Please see svn log of all branches/balbir-config-cleanup
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@201 4f4bb910-9a46-0410-90c8-c897d4f1cd53
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -18,6 +18,7 @@ #include <stdio.h> #include <string.h> #include <libcgroup.h> +#include <libcgroup-internal.h> int yylex(void); extern int line_no; @@ -67,7 +68,7 @@ group : GROUP ID '{' group_conf '}' { $$ = $4; if ($$) - cg_insert_group($2); + cgroup_config_insert_cgroup($2); else { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -80,7 +81,7 @@ group : GROUP ID '{' group_conf '}' group_conf : ID '{' namevalue_conf '}' { - $$ = cg_parse_controller_options($1, $3); + $$ = cgroup_config_parse_controller_options($1, $3); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -90,7 +91,7 @@ group_conf } | group_conf ID '{' namevalue_conf '}' { - $$ = cg_parse_controller_options($2, $4); + $$ = cgroup_config_parse_controller_options($2, $4); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -125,12 +126,16 @@ namevalue_conf $$ = strncat($2, $4, strlen($4)); free($4); } + | + { + $$ = NULL; + } ; task_namevalue_conf : ID '=' ID ';' { - $$ = cg_group_task_perm($1, $3); + $$ = cgroup_config_group_task_perm($1, $3); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -140,7 +145,7 @@ task_namevalue_conf } | task_namevalue_conf ID '=' ID ';' { - $$ = $1 && cg_group_task_perm($2, $4); + $$ = $1 && cgroup_config_group_task_perm($2, $4); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -153,7 +158,7 @@ task_namevalue_conf admin_namevalue_conf : ID '=' ID ';' { - $$ = cg_group_admin_perm($1, $3); + $$ = cgroup_config_group_admin_perm($1, $3); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -163,7 +168,7 @@ admin_namevalue_conf } | admin_namevalue_conf ID '=' ID ';' { - $$ = $1 && cg_group_admin_perm($2, $4); + $$ = $1 && cgroup_config_group_admin_perm($2, $4); if (!$$) { fprintf(stderr, "parsing failed at line number %d\n", line_no); @@ -223,8 +228,8 @@ task_conf: TASK '{' task_namevalue_conf '}' mountvalue_conf : ID '=' ID ';' { - if (!cg_insert_into_mount_table($1, $3)) { - cg_cleanup_mount_table(); + if (!cgroup_config_insert_into_mount_table($1, $3)) { + cgroup_config_cleanup_mount_table(); $$ = 0; return $$; } @@ -232,8 +237,8 @@ mountvalue_conf } | mountvalue_conf ID '=' ID ';' { - if (!cg_insert_into_mount_table($2, $4)) { - cg_cleanup_mount_table(); + if (!cgroup_config_insert_into_mount_table($2, $4)) { + cgroup_config_cleanup_mount_table(); $$ = 0; return $$; } |