Changeset 714

Timestamp:

03/08/10 19:49:12 (2 years ago)

Author:

cryptronic

Message:

Make the cgroup stuff more configurable.

Location:

trunk/daemon

Files:

• openvcpd.conf (modified) (1 diff)
• src/get.c (modified) (2 diffs)
• src/main.c (modified) (1 diff)
• src/parseconfig.c (modified) (2 diffs)
• src/parseconfig.h (modified) (1 diff)
• src/set.c (modified) (1 diff)

trunk/daemon/openvcpd.conf

@@ -28 +28 @@
 AdminEmail=openvcp@lists.openvcp.org
 
+# options for cgroup handling
+CGroupMountPoint=/dev/cgroup
+CGroupMountOptions=cpu,cpuset,memory,cpuacct,devices,freezer,net_cls
+

trunk/daemon/src/get.c

@@ -465 +465 @@
         response = ovcp_response_new();
 
-        ovcp_response_struct_new(response);
-
         while(cgroup_params[i] != NULL)
         {
@@ -473 +471 @@
                 if(file_exist(path))
                 {
-                        value = file_read(path);
-
+                        ovcp_response_struct_new(response);
+
+                        ovcp_response_struct_add_string(response, "name", cgroup_params[i]);
+
+                        value = file_read(path);
                         if(value != NULL)
                         {
                                 trim_string(value);
-                                ovcp_response_struct_add_string(response, cgroup_params[i], value);
+                                ovcp_response_struct_add_string(response, "value", value);
                                 free(value);
                         }
+                        else
+                        {
+                            ovcp_response_struct_add_string(response, "value", "");
+                        }
+
+                        ovcp_response_struct_end(response);
                 }
 
                 i++;
         }
-
-        ovcp_response_struct_end(response);
 
         return response;

trunk/daemon/src/main.c

@@ -120 +120 @@
         if(!fs_cgroup_support())
         {
-            if(!dir_exist("/dev/cgroup"))
-                mkdir("/dev/cgroup", 0755);
-            execb_cmd("mount", "mount", "-ocpu,cpuset", "-t", "cgroup", "none", "/dev/cgroup", NULL);
+            if(!dir_exist(config_st.cgroupdir))
+                mkdir(config_st.cgroupdir, 0755);
+            execb_cmd("mount", "mount", config_st.cgroupmountoptions, "-t", "cgroup", "none", config_st.cgroupdir NULL);
         }
 

trunk/daemon/src/parseconfig.c

@@ -157 +157 @@
                                         config->adminemail = (char *) malloc(strlen(directives[1])+1);
                                         strcpy(config->adminemail, directives[1]);
+                                }
+                                else
+                                if(strcasecmp(directives[0], "CGroupMountPoint") == 0)
+                                {
+                                        config->cgroupdir = (char *) malloc(strlen(directives[1])+1);
+                                        strcpy(config->cgroupdir, directives[1]);
+                                }
+                                else
+                                if(strcasecmp(directives[0], "CGroupMountOptions") == 0)
+                                {
+                                        config->cgroupmountoptions = (char *) malloc(strlen(directives[1])+1);
+                                        strcpy(config->cgroupmountoptions, directives[1]);
                                 }
 
@@ -203 +215 @@
         if(config->userbackup_dir == NULL)
                 die("ERROR: UserBackupDir Directive not Found\n");
+        if(config->cgroupdir == NULL)
+                die("ERROR: CGroupMountPoint Directive not Found\n");
+        if(config->cgroupmountoptions == NULL)
+                die("ERROR: CGroupMountOptions Directive not Found\n");
 
         if(!dir_exist(config->root_dir))

trunk/daemon/src/parseconfig.h

@@ -45 +45 @@
 
                 char *adminemail;
+                char *cgroupdir;
+                char *cgroupmountoptions;
         };
 

trunk/daemon/src/set.c

@@ -727 +727 @@
 
                                         //try to apply the new limits directly
-                                        sconcat(filepath, BUF_SIZE, "/dev/cgroup/", name, cgroup_params[i], NULL);
+                                        sconcat(filepath, BUF_SIZE, global_settings.cgroupdir, name, cgroup_params[i], NULL);
                                         if(file_exist(filepath))
                                         {