From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 2 May 2007 12:42:44 -0000 Subject: [Cluster-devel] cluster/ccs/daemon cluster_mgr.c Message-ID: <20070502124244.20213.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: fabbione at sourceware.org 2007-05-02 12:42:43 Modified files: ccs/daemon : cluster_mgr.c Log message: pretty self explanatory, this code is not used anywhere. Get rid of it. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/cluster_mgr.c.diff?cvsroot=cluster&r1=1.25&r2=1.26 --- cluster/ccs/daemon/cluster_mgr.c 2007/05/02 12:42:19 1.25 +++ cluster/ccs/daemon/cluster_mgr.c 2007/05/02 12:42:43 1.26 @@ -41,15 +41,11 @@ static member_list_t *get_member_list(cman_handle_t handle); static void free_member_list(member_list_t *list); static char *member_id_to_name(member_list_t *list, int node); -static int member_name_to_id(member_list_t *list, char *name); static int member_addr_to_id(member_list_t *list, struct sockaddr *addr); -static int member_online_node(member_list_t *list, int node); -static int member_online_name(member_list_t *list, char *name); static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds, struct timeval *timeout); -static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout); static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout); static int check_update_doc(xmlDocPtr tmp_doc) @@ -607,20 +603,6 @@ } -static int member_name_to_id(member_list_t *list, char *name) -{ - int i; - - for (i = 0; i < list->count; i++) { - if (!strcasecmp(list->nodes[i].cn_name, name)) { - return list->nodes[i].cn_nodeid; - } - } - - return 0; -} - - static int member_addr_to_id(member_list_t *list, struct sockaddr *addr) { int i; @@ -637,34 +619,6 @@ } -static int member_online_node(member_list_t *list, int node) -{ - int i; - - for (i = 0; i < list->count; i++) { - if (list->nodes[i].cn_nodeid == node) { - return list->nodes[i].cn_member; - } - } - - return 0; -} - - -static int member_online_name(member_list_t *list, char *name) -{ - int i; - - for (i = 0; i < list->count; i++) { - if (!strcasecmp(list->nodes[i].cn_name, name)) { - return list->nodes[i].cn_member; - } - } - - return 0; -} - - static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds, struct timeval *timeout) { @@ -681,68 +635,6 @@ } -static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout) -{ - int n, total = 0, remain = count, rv = 0; - fd_set wfds, xfds; - - while (total < count) - { - /* Create the write FD set of 1... */ - FD_ZERO(&wfds); - FD_SET(fd, &wfds); - FD_ZERO(&xfds); - FD_SET(fd, &xfds); - - /* wait for the fd to be available for writing */ - rv = select_retry(fd + 1, NULL, &wfds, &xfds, timeout); - if (rv == -1) { - return -1; - } - else if (rv == 0) { - errno = ETIMEDOUT; - return -1; - } - - if (FD_ISSET(fd, &xfds)) { - errno = EPIPE; - return -1; - } - - /* - * Attempt to write to fd - */ - n = write(fd, buf + (off_t) total, remain); - - /* - * When we know our fd was select()ed and we receive 0 bytes - * when we write, the fd was closed. - */ - if ((n == 0) && (rv == 1)) { - errno = EPIPE; - return -1; - } - - if (n == -1) { - if ((errno == EAGAIN) || (errno == EINTR)) { - /* - * Not ready? - */ - continue; - } - - /* Other errors: EIO, EINVAL, etc */ - return -1; - } - - total += n; - remain -= n; - } - - return total; -} - - static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout) { int n, total = 0, remain = count, rv = 0;