Changeset 715

Timestamp:

03/08/10 20:05:37 (2 years ago)

Author:

cryptronic

Message:

Make the cgroup stuff apply to current standards in daemon (copyed from rlimit stuff)

Files:

• trunk/daemon/src/set.c (modified) (3 diffs)

trunk/daemon/src/set.c

@@ -684 +684 @@
 {
         struct ovcp_response_st *response = NULL;
-        struct ovcp_data_st *arg0, *arg1, *struct_element;
-        char filepath[BUF_SIZE], *value, *name;
+        struct ovcp_data_st *arg0, *arg1, *arg2, *struct_element;
+        char filepath[BUF_SIZE], *name, *cgname, *cgvalue;
         int i = 0;
 
@@ -703 +703 @@
                 return ovcp_response_error(OVCP_ERROR_CGROUP, OVCP_ERROR_CGROUP_DESC);
 
+        arg1 = ovcp_request_get_arg(request, 1);
+        cgname = (char *)ovcp_data_get(arg1);
+
+        if(!ovcp_data_is_string(arg1) || cgname == NULL)
+                return ovcp_response_error(OVCP_ERROR_ARGMISS, OVCP_ERROR_ARGMISS_DESC);
+
+        arg2 = ovcp_request_get_arg(request, 2);
+        cgvalue = (char *)ovcp_data_get(arg2);
+
+        if(!ovcp_data_is_string(arg2) || cgvalue == NULL)
+                return ovcp_response_error(OVCP_ERROR_ARGMISS, OVCP_ERROR_ARGMISS_DESC);
+
+
         sconcat(filepath, BUF_SIZE, global_settings.config_dir, "/", name, "/cgroup", NULL);
         if(!dir_exist(filepath))
@@ -708 +721 @@
 
 
-        arg1 = ovcp_request_get_arg(request, 1);
-
-
-        if(ovcp_data_is_struct(arg1))
-        {
-                while(cgroup_params[i] != NULL)
-                {
-                        struct_element = ovcp_struct_get_element(arg1, cgroup_params[i]);
-
-                        if(struct_element != NULL)
-                        {
-                                if(ovcp_data_is_string(struct_element))
-                                {
-                                        value = ovcp_data_get(struct_element);
-                                        sconcat(filepath, BUF_SIZE, global_settings.config_dir, "/", name, "/cgroup/", cgroup_params[i], NULL);
-
-                                        file_write_many(filepath, value, "\n", NULL);
-
-                                        //try to apply the new limits directly
-                                        sconcat(filepath, BUF_SIZE, global_settings.cgroupdir, name, cgroup_params[i], NULL);
-                                        if(file_exist(filepath))
-                                        {
-                                                file_write_many(filepath, value, "\n", NULL);
-                                        }
-                                }
-                                else
-                                {
-                                        response = ovcp_response_error(OVCP_ERROR_WRONGTYPE,
-                                                        "vserver.set_cgroup: "OVCP_ERROR_WRONGTYPE_DESC);
-                                        break;
-                                }
-                        }
-
-                        i++;
-                }
-
+        response = ovcp_response_new();
+
+        sconcat(filepath, BUF_SIZE, global_settings.config_dir, "/", name, "/cgroup/", cgname, NULL);
+
+        if(strcmp(cgvalue, "0") == 0)
+        {
+                if (file_exist(filepath))
+                {
+                    unlink(filepath);
+                }
+                
+                //try to apply the new limits directly
+                sconcat(filepath, BUF_SIZE, global_settings.cgroupdir, "/", name, "/", cgname, NULL);
+                if(file_exist(filepath))
+                {
+                    unlink(filepath);
+                }
         }
         else
         {
-                response = ovcp_response_error(OVCP_ERROR_WRONGTYPE,
-                                                "vserver.set_cgroup: "OVCP_ERROR_WRONGTYPE_DESC);
-        }
-
-
-        if(response == NULL)
-        {
-                response = ovcp_response_new();
-                ovcp_response_add_boolean(response, TRUE);
-        }
-
-
+                file_write_many(filepath, cgvalue, "\n", NULL);
+                //try to apply the new limits directly
+                sconcat(filepath, BUF_SIZE, global_settings.cgroupdir, "/", name, NULL);
+                if(dir_exist(filepath))
+                {
+                    sconcat(filepath, BUF_SIZE, global_settings.cgroupdir, "/", name, "/", cgname, NULL);
+                    file_write_many(filepath, cgvalue, "\n", NULL);
+                }
+        }
+
+        ovcp_response_add_boolean(response, TRUE);
+
+        free(filepath);
 
         return response;