Changeset 2f0141c49bb55157f24738404aa77367a6a45fed for src/rh-task-bandwidth.c

Timestamp:

06/08/09 18:29:43 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

5987af1b79b0c1fbd4aa9d30a53ec6879853ece3

Parents:

03dc5e370ef4fbf66e34cbe5bc5b878ed764149c

git-committer:

Neutron Soutmun <neo.neutron@…> (06/08/09 18:29:43)

Message:

Implement IFB to replace the IMQ

• IFB (Intermediate Functional Block) is more clearly work in the SMP.
• Implement IFB on config, bandwidth task and support scripts.
• IMQ is now deprecated. (not support).

Files:

• src/rh-task-bandwidth.c (modified) (11 diffs)

src/rh-task-bandwidth.c

@@ -18 +18 @@
 #include "rh-task-memset.h"
 #include "rh-utils.h"
-
-
 
 #define BANDWIDTH_WRAPPER "/etc/rahunas/bandwidth.sh"
@@ -136 +134 @@
 }
 
-int bandwidth_start(void)
-{
-  char *args[3];
+int bandwidth_start(struct vserver *vs)
+{
+  char *args[5];
+  struct interfaces *iface = vs->vserver_config->iface;
+  int  ret;
 
   DP("Bandwidth: start");
@@ -144 +144 @@
   args[0] = BANDWIDTH_WRAPPER;
   args[1] = "start";
-  args[2] = (char *) 0;
-
-  return bandwidth_exec(NULL, args);
-}
-
-int bandwidth_stop(void)
-{
-  char *args[3];
+  args[2] = iface->dev_internal;
+  args[3] = iface->dev_ifb;
+  args[4] = (char *) 0;
+
+  ret = bandwidth_exec(vs, args);
+  return ret; 
+}
+
+int bandwidth_stop(struct vserver *vs)
+{
+  char *args[5];
+  struct interfaces *iface = vs->vserver_config->iface;
+  int  ret;
 
   DP("Bandwidth: stop");
@@ -157 +162 @@
   args[0] = BANDWIDTH_WRAPPER;
   args[1] = "stop";
-  args[2] = (char *) 0;
-
-  return bandwidth_exec(NULL, args);
+  args[2] = iface->dev_internal;
+  args[3] = iface->dev_ifb;
+  args[4] = (char *) 0;
+
+  ret = bandwidth_exec(vs, args);
+  return ret; 
 }
 
 int bandwidth_add(struct vserver *vs, struct bandwidth_req *bw_req)
 {
-  char *args[7];
+  char *args[9];
+  struct interfaces *iface = vs->vserver_config->iface;
 
   DP("Bandwidth: request %s %s %s %s", bw_req->slot_id, 
@@ -175 +184 @@
   args[4] = bw_req->bandwidth_max_down;
   args[5] = bw_req->bandwidth_max_up;
-  args[6] = (char *) 0;
+  args[6] = iface->dev_internal;
+  args[7] = iface->dev_ifb;
+  args[8] = (char *) 0;
 
   return bandwidth_exec(vs, args);
@@ -182 +193 @@
 int bandwidth_del(struct vserver *vs, struct bandwidth_req *bw_req)
 {
-  char *args[4];
+  char *args[6];
+  struct interfaces *iface = vs->vserver_config->iface;
 
   DP("Bandwidth: request %s", bw_req->slot_id);
@@ -189 +201 @@
   args[1] = "del";
   args[2] = bw_req->slot_id;
-  args[3] = (char *) 0;
+  args[3] = iface->dev_internal;
+  args[4] = iface->dev_ifb;
+  args[5] = (char *) 0;
 
   return bandwidth_exec(vs, args);
@@ -197 +211 @@
 static int startservice (void)
 {
-  return bandwidth_start();
+  /* Do nothing */
 }
 
@@ -203 +217 @@
 static int stopservice (void)
 {
-  return bandwidth_stop();
+  /* Do nothing */
 }
 
@@ -209 +223 @@
 static void init (struct vserver *vs)
 {
-  /* Do nothing */
+  struct interfaces *iface = NULL;
+  if (!vs)
+    return;
+
+  if (vs->vserver_config->init_flag == VS_RELOAD)
+    return;
+
+  interfaces_list = append_interface (interfaces_list, 
+                                      vs->vserver_config->dev_internal);
+  vs->vserver_config->iface = get_interface (interfaces_list, 
+                                             vs->vserver_config->dev_internal);
+  iface = vs->vserver_config->iface;
+  if (!iface->init)
+    if (bandwidth_start(vs) >= 0)
+      iface->init = 1;
 }
 
@@ -215 +243 @@
 static int cleanup (struct vserver *vs)
 {
-  /* Do nothing */
+  struct interfaces *iface = NULL;
+  if (!vs)
+    return;
+
+  if (vs->vserver_config->init_flag == VS_RELOAD)
+    return;
+
+  iface = vs->vserver_config->iface;
+  DP ("Bandwidth Cleanup: init=%d, hit=%d", iface->init, iface->hit);
+  if (iface->init && iface->hit <= 1)
+    if (bandwidth_stop(vs) >= 0)
+      iface->init = 0;
+
+  interfaces_list = remove_interface (interfaces_list, 
+                                      vs->vserver_config->dev_internal);
 }