From fa4b063c6edc4182cc4f87cae350e4c0225231ad Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Wed, 7 Oct 2009 16:06:09 +0200 Subject: [PATCH] remove dead code in monitor.c This code is not used in lxc. Signed-off-by: Michel Normand Signed-off-by: Daniel Lezcano --- src/lxc/lxc.h | 11 --------- src/lxc/monitor.c | 63 +---------------------------------------------- 2 files changed, 1 insertion(+), 73 deletions(-) diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h index f7ae86519..89572f2c6 100644 --- a/src/lxc/lxc.h +++ b/src/lxc/lxc.h @@ -82,17 +82,6 @@ extern int lxc_start(const char *name, char *const argv[]); */ extern int lxc_stop(const char *name); -/* - * Monitor the container, each time the state of the container - * is changed, a state data is send through a file descriptor passed to - * the function with output_fd. - * The function will block until the container is destroyed. - * @name : the name of the container - * @output_fd : the file descriptor where to send the states - * Returns 0 on success, < 0 otherwise - */ -extern int lxc_monitor(const char *name, int output_fd); - /* * Open the monitoring mechanism for a specific container * The function will return an fd corresponding to the events diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c index 17d0a8e5e..700f5bc3d 100644 --- a/src/lxc/monitor.c +++ b/src/lxc/monitor.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -46,66 +45,6 @@ lxc_log_define(lxc_monitor, lxc); #define UNIX_PATH_MAX 108 #endif -int lxc_monitor(const char *name, int output_fd) -{ - char path[MAXPATHLEN]; - int err = -1, nfd, wfd, state; - - nfd = inotify_init(); - if (nfd < 0) { - SYSERROR("failed to initialize inotify"); - return -1; - } - - snprintf(path, MAXPATHLEN, LXCPATH "/%s/state", name); - - wfd = inotify_add_watch(nfd, path, IN_DELETE_SELF|IN_CLOSE_WRITE); - if (wfd < 0) { - SYSERROR("failed to add a watch on %s", path); - goto out; - } - - for(;;) { - struct inotify_event evt; - - if (read(nfd, &evt, sizeof(evt)) < 0) { - SYSERROR("failed to read inotify event"); - goto out; - } - - if (evt.mask & IN_CLOSE_WRITE) { - - state = lxc_getstate(name); - if (state < 0) { - ERROR("failed to get the state for %s", - name); - goto out; - } - - if (write(output_fd, &state, sizeof(state)) < 0) { - SYSERROR("failed to send state to %d", - output_fd); - goto out; - } - continue; - } - - if (evt.mask & IN_DELETE_SELF) { - close(output_fd); - err = 0; - goto out; - } - - ERROR("unknown evt for inotity (%d)", evt.mask); - goto out; - } - -out: - inotify_rm_watch(nfd, wfd); - close(nfd); - return err; -} - static void lxc_monitor_send(struct lxc_msg *msg) { int fd; @@ -162,7 +101,7 @@ int lxc_monitor_read(int fd, struct lxc_msg *msg) socklen_t len = sizeof(from); int ret; - ret = recvfrom(fd, msg, sizeof(*msg), 0, + ret = recvfrom(fd, msg, sizeof(*msg), 0, (struct sockaddr *)&from, &len); if (ret < 0) { SYSERROR("failed to receive state"); -- 2.47.2