lxc-monitor multiple paths

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index 336061dd4ef6155e4abaf202bf1f47ec63a9e5be..b460843c4394579a04842cc47ab1382ce1ed168d 100644 (file)
--- a/doc/lxc-monitor.sgml.in
+++ b/doc/lxc-monitor.sgml.in
@@ -63,6 +63,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
       to monitor all the containers, several of them or just one.
     </para>
 
+    <para>
+      The <option>-P, --lxcpath</option>=PATH option may be specified multiple
+      times to monitor more than one container path. Note however that
+      containers with the same name in multiple paths will be
+      indistinguishable in the output.
+    </para>
+
   </refsect1>
 
   &commonoptions;

diff --git a/src/lxc/arguments.c b/src/lxc/arguments.c
index f61c6eb84be8e258515e2963f66bb92b99199b87..5f1c1af66b48f22ff9182590f857cf7bb245090d 100644 (file)
--- a/src/lxc/arguments.c
+++ b/src/lxc/arguments.c
@@ -150,13 +150,32 @@ See the %s man page for further information.\n\n",
        exit(code);
 }
 
+static int lxc_arguments_lxcpath_add(struct lxc_arguments *args,
+                                    const char *lxcpath)
+{
+       if (args->lxcpath_additional != -1 &&
+           args->lxcpath_cnt > args->lxcpath_additional) {
+               fprintf(stderr, "This command only accepts %d -P,--lxcpath arguments\n",
+                       args->lxcpath_additional + 1);
+               exit(EXIT_FAILURE);
+       }
+
+       args->lxcpath = realloc(args->lxcpath, (args->lxcpath_cnt + 1) *
+                                sizeof(args->lxcpath[0]));
+       if (args->lxcpath == NULL) {
+               lxc_error(args, "no memory");
+               return ENOMEM;
+       }
+       args->lxcpath[args->lxcpath_cnt++] = lxcpath;
+       return 0;
+}
+
 extern int lxc_arguments_parse(struct lxc_arguments *args,
                               int argc, char * const argv[])
 {
        char shortopts[256];
        int  ret = 0;
 
-       args->lxcpath = default_lxc_path();
        ret = build_shortopts(args->options, shortopts, sizeof(shortopts));
        if (ret < 0) {
                lxc_error(args, "build_shortopts() failed : %s",
@@ -176,7 +195,11 @@ extern int lxc_arguments_parse(struct lxc_arguments *args,
                case 'l':       args->log_priority = optarg; break;
                case 'c':       args->console = optarg; break;
                case 'q':       args->quiet = 1; break;
-               case 'P':       args->lxcpath = optarg; break;
+               case 'P':
+                       ret = lxc_arguments_lxcpath_add(args, optarg);
+                       if (ret < 0)
+                               return ret;
+                       break;
                case OPT_USAGE: print_usage(args->options, args);
                case '?':       print_help(args, 1);
                case 'h':       print_help(args, 0);
@@ -195,6 +218,13 @@ extern int lxc_arguments_parse(struct lxc_arguments *args,
        args->argv = &argv[optind];
        args->argc = argc - optind;
 
+       /* If no lxcpaths were given, use default */
+       if (!args->lxcpath_cnt) {
+               ret = lxc_arguments_lxcpath_add(args, default_lxc_path());
+               if (ret < 0)
+                       return ret;
+       }
+
        /* Check the command options */
 
        if (!args->name) {

diff --git a/src/lxc/arguments.h b/src/lxc/arguments.h
index 6f6826b75790d455baad1f6f2b0fd9175761ab98..002a919616304aa7d95c90573457fcefd3269134 100644 (file)
--- a/src/lxc/arguments.h
+++ b/src/lxc/arguments.h
@@ -47,7 +47,10 @@ struct lxc_arguments {
        const char *console;
        const char *console_log;
        const char *pidfile;
-       const char *lxcpath;
+       const char **lxcpath;
+       int lxcpath_cnt;
+       /* set to 0 to accept only 1 lxcpath, -1 for unlimited */
+       int lxcpath_additional;
 
        /* for lxc-checkpoint/restart */
        const char *statefile;

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index db921f0ffd0aa726917d562deb0e55a6ca2d6c55..9057757c520af4bd023d02b0b3b179ad89132a8f 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -28,6 +28,7 @@ extern "C" {
 #endif
 
 #include <stddef.h>
+#include <sys/types.h>
 #include <lxc/state.h>
 
 struct lxc_msg;
@@ -77,16 +78,36 @@ extern int lxc_execute(const char *name, char *const argv[], int quiet,
 extern int lxc_monitor_open(const char *lxcpath);
 
 /*
- * Read the state of the container if this one has changed
- * The function will block until there is an event available
- * @fd : the file descriptor provided by lxc_monitor_open
- * @state : the variable which will be filled with the state
+ * Blocking read for the next container state change
+ * @fd  : the file descriptor provided by lxc_monitor_open
+ * @msg : the variable which will be filled with the state
  * Returns 0 if the monitored container has exited, > 0 if
- * data was readen, < 0 otherwise
+ * data was read, < 0 otherwise
  */
 extern int lxc_monitor_read(int fd, struct lxc_msg *msg);
+
+/*
+ * Blocking read for the next container state change with timeout
+ * @fd      : the file descriptor provided by lxc_monitor_open
+ * @msg     : the variable which will be filled with the state
+ * @timeout : the timeout in seconds to wait for a state change
+ * Returns 0 if the monitored container has exited, > 0 if
+ * data was read, < 0 otherwise
+ */
 extern int lxc_monitor_read_timeout(int fd, struct lxc_msg *msg, int timeout);
 
+/*
+ * Blocking read from multiple monitors for the next container state
+ * change with timeout
+ * @rfds    : an fd_set of file descriptors provided by lxc_monitor_open
+ * @nfds    : the maximum fd number in rfds + 1
+ * @msg     : the variable which will be filled with the state
+ * @timeout : the timeout in seconds to wait for a state change
+ * Returns 0 if the monitored container has exited, > 0 if
+ * data was read, < 0 otherwise
+ */
+extern int lxc_monitor_read_fdset(fd_set *rfds, int nfds, struct lxc_msg *msg, int timeout);
+
 /*
  * Close the fd associated with the monitoring
  * @fd : the file descriptor provided by lxc_monitor_open

diff --git a/src/lxc/lxc_attach.c b/src/lxc/lxc_attach.c
index 300bc922d40a6fe08f6992d9433b1ee5f9c5cc05..e0c253b4b81ac6920fdca97a3c2d61140c7b3b75 100644 (file)
--- a/src/lxc/lxc_attach.c
+++ b/src/lxc/lxc_attach.c
@@ -292,11 +292,11 @@ int main(int argc, char *argv[])
                return ret;
 
        ret = lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                          my_args.progname, my_args.quiet, my_args.lxcpath);
+                          my_args.progname, my_args.quiet, my_args.lxcpath[0]);
        if (ret)
                return ret;
 
-       init_pid = get_init_pid(my_args.name, my_args.lxcpath);
+       init_pid = get_init_pid(my_args.name, my_args.lxcpath[0]);
        if (init_pid < 0) {
                ERROR("failed to get the init pid");
                return -1;
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
         * by asking lxc-start
         */
        if (namespace_flags == -1) {
-               namespace_flags = lxc_get_clone_flags(my_args.name, my_args.lxcpath);
+               namespace_flags = lxc_get_clone_flags(my_args.name, my_args.lxcpath[0]);
                /* call failed */
                if (namespace_flags == -1) {
                        ERROR("failed to automatically determine the "
@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
                }
 
                if (!elevated_privileges) {
-                       ret = lxc_cgroup_attach(grandchild, my_args.name, my_args.lxcpath);
+                       ret = lxc_cgroup_attach(grandchild, my_args.name, my_args.lxcpath[0]);
                        if (ret < 0) {
                                ERROR("failed to attach process to cgroup");
                                return -1;

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 7684f1b1f1c1bce1b195f3516089830aca6cb6a1..094686da9399de9d6a4b2067e772f2c0377c9a71 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
        state_object = my_args.argv[0];
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
                value = my_args.argv[1];
 
        if (value) {
-               if (lxc_cgroup_set(my_args.name, state_object, value, my_args.lxcpath)) {
+               if (lxc_cgroup_set(my_args.name, state_object, value, my_args.lxcpath[0])) {
                        ERROR("failed to assign '%s' value to '%s' for '%s'",
                                value, state_object, my_args.name);
                        return -1;
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
                int ret;
                char buffer[len];
 
-               ret = lxc_cgroup_get(my_args.name, state_object, buffer, len, my_args.lxcpath);
+               ret = lxc_cgroup_get(my_args.name, state_object, buffer, len, my_args.lxcpath[0]);
                if (ret < 0) {
                        ERROR("failed to retrieve value of '%s' for '%s'",
                              state_object, my_args.name);

diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index 8b3a02abe96204686b14a2de60c1f6d2dc9b6762..ee41ba12ffa0299fdf0929cc320717c102cd4ea8 100644 (file)
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
                return ret;
 
        ret = lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                          my_args.progname, my_args.quiet, my_args.lxcpath);
+                          my_args.progname, my_args.quiet, my_args.lxcpath[0]);
        if (ret)
                return ret;
 

diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index 1d779a1612c338b5469f13b0d70e991c6d7717d1..795b54c245481a3bdae6638612127e89cf8f5472 100644 (file)
--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
                return -1;
 
        err = lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                          my_args.progname, my_args.quiet, my_args.lxcpath);
+                          my_args.progname, my_args.quiet, my_args.lxcpath[0]);
        if (err)
                return -1;
 
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       err = lxc_console(my_args.name, my_args.ttynum, &master, my_args.lxcpath);
+       err = lxc_console(my_args.name, my_args.ttynum, &master, my_args.lxcpath[0]);
        if (err)
                goto out;
 

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 0fa2d2516a71e43ffaade2f40ffb6c13f8db0a33..3c070cf9620ad4e11885379ee2b23f0b096be247 100644 (file)
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
        /* rcfile is specified in the cli option */
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
        else {
                int rc;
 
-               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath, my_args.name);
+               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath[0], my_args.name);
                if (rc == -1) {
                        SYSERROR("failed to allocate memory");
                        return -1;
@@ -137,5 +137,5 @@ int main(int argc, char *argv[])
        if (lxc_config_define_load(&defines, conf))
                return -1;
 
-       return lxc_execute(my_args.name, my_args.argv, my_args.quiet, conf, my_args.lxcpath);
+       return lxc_execute(my_args.name, my_args.argv, my_args.quiet, conf, my_args.lxcpath[0]);
 }

diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
index ff3cdd5778aaae8fa01eaf00b479eb68e3ef8bf4..3bd5e286641d8479563eb4dde79943d5886f8946 100644 (file)
--- a/src/lxc/lxc_freeze.c
+++ b/src/lxc/lxc_freeze.c
@@ -55,9 +55,9 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
-       return lxc_freeze(my_args.name, my_args.lxcpath);
+       return lxc_freeze(my_args.name, my_args.lxcpath[0]);
 }
 

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index b19b1d02f13ebdaee050adb66e3be752de559d84..f815b0f47a00d7cccb914f3db155ce2f1eec87f1 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -80,14 +80,14 @@ int main(int argc, char *argv[])
                return 1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return 1;
 
        if (!state && !pid)
                state = pid = true;
 
        if (state || test_state) {
-               ret = lxc_getstate(my_args.name, my_args.lxcpath);
+               ret = lxc_getstate(my_args.name, my_args.lxcpath[0]);
                if (ret < 0)
                        return 1;
                if (test_state)
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
        }
 
        if (pid)
-               printf("pid:%10d\n", get_init_pid(my_args.name, my_args.lxcpath));
+               printf("pid:%10d\n", get_init_pid(my_args.name, my_args.lxcpath[0]));
 
        return 0;
 }

diff --git a/src/lxc/lxc_kill.c b/src/lxc/lxc_kill.c
index e08993139f7f691694b417f603b86f70d49f9988..9a24209dd619a088eda93618a07baf899c8012ae 100644 (file)
--- a/src/lxc/lxc_kill.c
+++ b/src/lxc/lxc_kill.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[], char *envp[])
                return ret;
 
        ret = lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                          my_args.progname, my_args.quiet, my_args.lxcpath);
+                          my_args.progname, my_args.quiet, my_args.lxcpath[0]);
        if (ret)
                return ret;
 
@@ -76,7 +76,7 @@ int main(int argc, char *argv[], char *envp[])
        } else
                sig=SIGKILL;
 
-       pid = get_init_pid(my_args.name, my_args.lxcpath);
+       pid = get_init_pid(my_args.name, my_args.lxcpath[0]);
        if (pid < 0) {
                ERROR("failed to get the init pid");
                return -1;

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 5ddb2913a681e3e4a250e34ab60ff4a75ab2ebef..e41686fbdeed21052b95e0f7ea617520515632c4 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -52,6 +52,7 @@ Options :\n\
        .options  = my_longopts,
        .parser   = NULL,
        .checker  = NULL,
+       .lxcpath_additional = -1,
 };
 
 int main(int argc, char *argv[])
@@ -59,14 +60,14 @@ int main(int argc, char *argv[])
        char *regexp;
        struct lxc_msg msg;
        regex_t preg;
-       int fd;
-       int len, rc;
+       fd_set rfds, rfds_save;
+       int len, rc, i, nfds = -1;
 
        if (lxc_arguments_parse(&my_args, argc, argv))
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
        len = strlen(my_args.name) + 3;
@@ -87,16 +88,33 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       lxc_monitord_spawn(my_args.lxcpath);
+       if (my_args.lxcpath_cnt > FD_SETSIZE) {
+               ERROR("too many paths requested, only the first %d will be monitored", FD_SETSIZE);
+               my_args.lxcpath_cnt = FD_SETSIZE;
+       }
 
-       fd = lxc_monitor_open(my_args.lxcpath);
-       if (fd < 0)
-               return -1;
+       FD_ZERO(&rfds);
+       for (i = 0; i < my_args.lxcpath_cnt; i++) {
+               int fd;
+
+               lxc_monitord_spawn(my_args.lxcpath[i]);
+
+               fd = lxc_monitor_open(my_args.lxcpath[i]);
+               if (fd < 0)
+                       return -1;
+               FD_SET(fd, &rfds);
+               if (fd > nfds)
+                       nfds = fd;
+       }
+       memcpy(&rfds_save, &rfds, sizeof(rfds_save));
+       nfds++;
 
        setlinebuf(stdout);
 
        for (;;) {
-               if (lxc_monitor_read(fd, &msg) < 0)
+               memcpy(&rfds, &rfds_save, sizeof(rfds));
+
+               if (lxc_monitor_read_fdset(&rfds, nfds, &msg, -1) < 0)
                        return -1;
 
                msg.name[sizeof(msg.name)-1] = '\0';
@@ -118,4 +136,3 @@ int main(int argc, char *argv[])
 
        return 0;
 }
-

diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index 77099b14907cf371ff78707ae2a67976fd6f0cf3..3b8eedc1743f265cff6fad74c6908d15db1e46b2 100644 (file)
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
        /* rcfile is specified in the cli option */
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
        else {
                int rc;
 
-               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath, my_args.name);
+               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath[0], my_args.name);
                if (rc == -1) {
                        SYSERROR("failed to allocate memory");
                        return -1;
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       ret = lxc_restart(my_args.name, sfd, conf, my_args.flags, my_args.lxcpath);
+       ret = lxc_restart(my_args.name, sfd, conf, my_args.flags, my_args.lxcpath[0]);
 
        if (my_args.statefile)
                close(sfd);

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 12aacb8cc54d082fbaa066d98f17f1cc0e3b0d1d..490dbadd84bfd2692e4038439161bc9538fd2995 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
                args = my_args.argv;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return err;
 
        /* rcfile is specified in the cli option */
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
        else {
                int rc;
 
-               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath, my_args.name);
+               rc = asprintf(&rcfile, "%s/%s/config", my_args.lxcpath[0], my_args.name);
                if (rc == -1) {
                        SYSERROR("failed to allocate memory");
                        return err;
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
        if (my_args.close_all_fds)
                conf->close_all_fds = 1;
 
-       err = lxc_start(my_args.name, args, conf, my_args.lxcpath);
+       err = lxc_start(my_args.name, args, conf, my_args.lxcpath[0]);
 
        /*
         * exec ourself, that requires to have all opened fd

diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
index 0967a156f8cbbfda272159cab5b233f8bab8bcfc..d7c7283736d9c1b9371f77dbfa0d4bcee41b278a 100644 (file)
--- a/src/lxc/lxc_stop.c
+++ b/src/lxc/lxc_stop.c
@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
-       return lxc_stop(my_args.name, my_args.lxcpath);
+       return lxc_stop(my_args.name, my_args.lxcpath[0]);
 }

diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
index 44d3cc02116266b1c70b26dad6e0f05c05a7ed99..095f2908400781362cc321e225d54245536c730b 100644 (file)
--- a/src/lxc/lxc_unfreeze.c
+++ b/src/lxc/lxc_unfreeze.c
@@ -54,9 +54,9 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
-       return lxc_unfreeze(my_args.name, my_args.lxcpath);
+       return lxc_unfreeze(my_args.name, my_args.lxcpath[0]);
 }
 

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index d21578b6c5950e74d46251c813e6c187c3aeaba8..f1a065c1fe680120ad64fd0c481d6174eccd4062 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -84,8 +84,9 @@ int main(int argc, char *argv[])
                return -1;
 
        if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
-                        my_args.progname, my_args.quiet, my_args.lxcpath))
+                        my_args.progname, my_args.quiet, my_args.lxcpath[0]))
                return -1;
 
-       return lxc_wait(strdup(my_args.name), my_args.states, my_args.timeout, my_args.lxcpath);
+       return lxc_wait(strdup(my_args.name), my_args.states, my_args.timeout,
+                       my_args.lxcpath[0]);
 }

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 5648b86b5819d94745cade74cc6addfb21a77d7a..c04bb73d3db62a611ef574ecd43274ba73ae2b76 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -147,33 +147,50 @@ err1:
        return ret;
 }
 
-int lxc_monitor_read_timeout(int fd, struct lxc_msg *msglxc, int timeout)
+int lxc_monitor_read_fdset(fd_set *rfds, int nfds, struct lxc_msg *msg,
+                          int timeout)
 {
-       fd_set rfds;
-       struct timeval tv;
-       int ret;
+       struct timeval tval,*tv = NULL;
+       int ret,i;
 
        if (timeout != -1) {
-               FD_ZERO(&rfds);
-               FD_SET(fd, &rfds);
-
-               tv.tv_sec = timeout;
-               tv.tv_usec = 0;
-
-               ret = select(fd+1, &rfds, NULL, NULL, &tv);
-               if (ret == -1)
-                       return -1;
-               else if (!ret)
-                       return -2;  // timed out
+               tv = &tval;
+               tv->tv_sec = timeout;
+               tv->tv_usec = 0;
        }
 
-       ret = recv(fd, msglxc, sizeof(*msglxc), 0);
-       if (ret <= 0) {
-               SYSERROR("client failed to recv (monitord died?) %s",
-                        strerror(errno));
+       ret = select(nfds, rfds, NULL, NULL, tv);
+       if (ret == -1)
                return -1;
+       else if (ret == 0)
+               return -2;  // timed out
+
+       /* only read from the first ready fd, the others will remain ready
+        * for when this routine is called again
+        */
+       for (i = 0; i < nfds; i++) {
+               if (FD_ISSET(i, rfds)) {
+                       ret = recv(i, msg, sizeof(*msg), 0);
+                       if (ret <= 0) {
+                               SYSERROR("client failed to recv (monitord died?) %s",
+                                        strerror(errno));
+                               return -1;
+                       }
+                       return ret;
+               }
        }
-       return ret;
+       SYSERROR("no ready fd found?");
+       return -1;
+}
+
+int lxc_monitor_read_timeout(int fd, struct lxc_msg *msg, int timeout)
+{
+       fd_set rfds;
+
+       FD_ZERO(&rfds);
+       FD_SET(fd, &rfds);
+
+       return lxc_monitor_read_fdset(&rfds, fd+1, msg, timeout);
 }
 
 int lxc_monitor_read(int fd, struct lxc_msg *msg)