Added container priority command line

diff --git a/src/liblxc/lxc.h b/src/liblxc/lxc.h
index 378da8d38df8a6e84ac6dd74edac0ccdd78cd176..0369a68330a47cfc74a70f3da696469a7de259b3 100644 (file)
--- a/src/liblxc/lxc.h
+++ b/src/liblxc/lxc.h
@@ -42,7 +42,6 @@
 #define MAXPIDLEN 20
 
 struct lxc_mem_stat;
-struct lxc_conf;
 
 typedef int (*lxc_callback_t)(const char *name, int argc, 
                              char *argv[], void *data);

diff --git a/src/liblxc/lxc_cgroup.c b/src/liblxc/lxc_cgroup.c
index bcc68a5dc5c2ffb31e4eb0a1d970b009b8435b88..dc185a08dc0706e9ae2a04aa177024ac911d1cb5 100644 (file)
--- a/src/liblxc/lxc_cgroup.c
+++ b/src/liblxc/lxc_cgroup.c
@@ -154,7 +154,7 @@ int lxc_get_priority(const char *name, int *priority)
        ret = 0;
 out:
        free(path);
-       return 0;
+       return ret;
 }
 
 int lxc_set_memory(const char *name, size_t memmax)

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index b88040fdd609f5b6976b89b245c0fb482c88b7eb..c57e76c89c038d0199372ae106427cbb651dc083 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -14,7 +14,8 @@ bin_PROGRAMS = \
        lxc-state \
        lxc-kill \
        lxc-freeze \
-       lxc-unfreeze
+       lxc-unfreeze \
+       lxc-priority
 
 lxc_create_SOURCES = lxc_create.c config.c config.h
 lxc_create_LDADD = \
@@ -59,3 +60,7 @@ lxc_freeze_LDADD = \
 lxc_unfreeze_SOURCES = lxc_unfreeze.c
 lxc_unfreeze_LDADD = \
         $(top_builddir)/src/liblxc/liblxc.a
+
+lxc_priority_SOURCES = lxc_priority.c
+lxc_priority_LDADD = \
+        $(top_builddir)/src/liblxc/liblxc.a

diff --git a/src/lxc/lxc_priority.c b/src/lxc/lxc_priority.c
new file mode 100644 (file)
index 0000000..9b1c5cc
--- /dev/null
+++ b/src/lxc/lxc_priority.c
@@ -0,0 +1,78 @@
+/*
+ * lxc: linux Container library
+ *
+ * (C) Copyright IBM Corp. 2007, 2008
+ *
+ * Authors:
+ * Daniel Lezcano <dlezcano at fr.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <sys/types.h>
+
+#include <lxc.h>
+
+void usage(char *cmd)
+{
+       fprintf(stderr, "%s\n", basename(cmd));
+       fprintf(stderr, "\t -n <name>       : name of the container\n");
+       fprintf(stderr, "\t [-p <priority>] : priority of the container\n");
+       _exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+       char opt;
+       char *name = NULL, *priority = NULL;
+       int prio, nbargs = 0;
+
+       while ((opt = getopt(argc, argv, "p:n:")) != -1) {
+               switch (opt) {
+               case 'n':
+                       name = optarg;
+                       break;
+               case 'p':
+                       priority = optarg;
+                       break;
+               }
+
+               nbargs++;
+       }
+
+       if (!name)
+               usage(argv[0]);
+
+       if (!priority) {
+               if (lxc_get_priority(name, &prio)) {
+                       fprintf(stderr, "failed to retrieve the priority of '%s'\n", name);
+                       return 1;
+               }
+               
+               printf("'%s' has priority %d\n", name, prio);
+               return 0;
+       }
+
+       prio = atoi(priority);
+       if (lxc_set_priority(name, prio)) {
+               fprintf(stderr, "failed to assign priority  %d to of '%s'", 
+                       prio, name);
+               return 1;
+       }
+
+       return 0;
+}