Procházet zdrojové kódy

Add corosync-quorumtool

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2406 fd59a12c-fef9-0310-b244-a6a79926bd2f
Christine Caulfield před 16 roky
rodič
revize
6f3fabe398
2 změnil soubory, kde provedl 6 přidání a 1 odebrání
  1. 2 0
      lib/coroipcc.c
  2. 4 1
      tools/Makefile.am

+ 2 - 0
lib/coroipcc.c

@@ -819,9 +819,11 @@ coroipcc_dispatch_get (
 		goto error_put;
 		goto error_put;
 	} else
 	} else
 	if (poll_events == -1) {
 	if (poll_events == -1) {
+		error = CS_ERR_LIBRARY;
 		goto error_put;
 		goto error_put;
 	} else
 	} else
 	if (poll_events == 0) {
 	if (poll_events == 0) {
+		error = CS_ERR_TRY_AGAIN;
 		goto error_put;
 		goto error_put;
 	}
 	}
 	if (poll_events == 1 && (ufds.revents & (POLLERR|POLLHUP))) {
 	if (poll_events == 1 && (ufds.revents & (POLLERR|POLLHUP))) {

+ 4 - 1
tools/Makefile.am

@@ -34,7 +34,7 @@ INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
 
 sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
 sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
 			  corosync-keygen corosync-objctl \
 			  corosync-keygen corosync-objctl \
-			  corosync-pload corosync-cpgtool
+			  corosync-pload corosync-cpgtool corosync-quorumtool
 
 
 corosync_pload_LDADD	= -lpload -lcoroipcc
 corosync_pload_LDADD	= -lpload -lcoroipcc
 corosync_pload_LDFLAGS	= -L../lib
 corosync_pload_LDFLAGS	= -L../lib
@@ -44,6 +44,9 @@ corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
 corosync_cfgtool_LDFLAGS= -L../lib
 corosync_cfgtool_LDFLAGS= -L../lib
 corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
 corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
 corosync_cpgtool_LDFLAGS= -L../lib
 corosync_cpgtool_LDFLAGS= -L../lib
+corosync_quorumtool_LDADD = -lconfdb -lcfg -lquorum \
+			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
+corosync_quorumtool_LDFLAGS = -L../lib
 
 
 lint:
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c