No OneTemporary
Actions

Size

33 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/Makefile.am b/Makefile.am
	index 443c664..6a20ac3 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,155 +1,155 @@
	# Copyright (c) 2009 Red Hat, Inc.
	#
	# Authors: Andrew Beekhof
	# Steven Dake (sdake@redhat.com)
	#
	# This software licensed under BSD license, the text of which follows:
	#
	# Redistribution and use in source and binary forms, with or without
	# modification, are permitted provided that the following conditions are met:
	#
	# - Redistributions of source code must retain the above copyright notice,
	# this list of conditions and the following disclaimer.
	# - Redistributions in binary form must reproduce the above copyright notice,
	# this list of conditions and the following disclaimer in the documentation
	# and/or other materials provided with the distribution.
	# - Neither the name of the MontaVista Software, Inc. nor the names of its
	# contributors may be used to endorse or promote products derived from this
	# software without specific prior written permission.
	#
	# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	# THE POSSIBILITY OF SUCH DAMAGE.

	SPEC = $(PACKAGE_NAME).spec

	TARFILE = $(PACKAGE_NAME)-$(VERSION).tar.gz

	EXTRA_DIST = autogen.sh conf/booth.conf.example $(bootharbitrator_SCRIPTS) $(boothsite_SCRIPTS)

	AUTOMAKE_OPTIONS = foreign

	MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
	config.guess config.sub missing install-sh \
	autoheader automake autoconf test_lense.sh

	dist_doc_DATA = README COPYING

	notrans_dist_man8_MANS = docs/boothd.8

	boothconfdir = ${BOOTHSYSCONFDIR}

	boothconf_DATA = conf/booth.conf.example

	boothsitedir = /usr/lib/ocf/resource.d/pacemaker

	boothsite_SCRIPTS = script/ocf/booth-site

	bootharbitratordir = ${INITDDIR}

	bootharbitrator_SCRIPTS = script/lsb/booth-arbitrator

	TESTS = test/runtests.py

	-SUBDIRS = src
	+SUBDIRS = src docs

	coverity:
	cov-build --dir=cov make
	cov-analyze --dir cov --concurrency --wait-for-license
	cov-format-errors --dir cov

	install-exec-local:
	$(INSTALL) -d $(DESTDIR)/${boothconfdir}
	$(INSTALL) -d $(DESTDIR)/${bootharbitratordir}
	$(INSTALL) -d $(DESTDIR)/${boothsitedir}
	$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}

	install-exec-hook:
	ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/booth

	uninstall-local:
	rmdir $(DESTDIR)/${boothconfdir} \|\| :;
	rmdir $(DESTDIR)/${bootharbitratordir} \|\| :;
	rmdir $(DESTDIR)/${boothsitedir} \|\| :;
	rmdir $(DESTDIR)/${SOCKETDIR} \|\| :;

	test: check

	lint:
	for dir in src; do make -C $$dir lint; done

	dist-clean-local:
	rm -f autoconf automake autoheader

	dist-hook:
	echo $(VERSION) > $(distdir)/.tarball-version


	## make rpm/srpm section.

	$(SPEC): $(SPEC).in
	rm -f $@-t $@
	date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
	if [ -f .tarball-version ]; then \
	gitver="$(shell cat .tarball-version)" && \
	rpmver=$$gitver && \
	alphatag="" && \
	dirty="" && \
	numcomm="0"; \
	else \
	gitver="$(shell git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
	rpmver=`echo $$gitver \| sed -e "s/^v//" -e "s/-.*//g"` && \
	alphatag=`echo $$gitver \| sed -e "s/.*-//" -e "s/^g//"` && \
	vtag=`echo $$gitver \| sed -e "s/-.*//g"` && \
	numcomm=`git rev-list $$vtag..HEAD \| wc -l` && \
	git update-index --refresh > /dev/null 2>&1 \|\| true && \
	dirty=`git diff-index --name-only HEAD 2>/dev/null`; \
	fi && \
	if [ -n "$$dirty" ]; then dirty="dirty"; else dirty=""; fi && \
	if [ "$$numcomm" = "0" ]; then \
	sed \
	-e "s#@version@#$$rpmver#g" \
	-e "s#%glo.alpha.##g" \
	-e "s#%glo.numcomm.##g" \
	-e "s#@dirty@#$$dirty#g" \
	-e "s#@date@#$$date#g" \
	$< > $@-t; \
	else \
	sed \
	-e "s#@version@#$$rpmver#g" \
	-e "s#@alphatag@#$$alphatag#g" \
	-e "s#@numcomm@#$$numcomm#g" \
	-e "s#@dirty@#$$dirty#g" \
	-e "s#@date@#$$date#g" \
	$< > $@-t; \
	fi; \
	if [ -z "$$dirty" ]; then sed -i -e "s#%glo.dirty.##g" $@-t; fi
	chmod a-w $@-t
	mv $@-t $@

	$(TARFILE):
	$(MAKE) dist

	RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
	--define "_specdir $(abs_builddir)" \
	--define "_builddir $(abs_builddir)" \
	--define "_srcrpmdir $(abs_builddir)" \
	--define "_rpmdir $(abs_builddir)"

	srpm: clean
	autoreconf -if
	$(MAKE) $(SPEC) $(TARFILE)
	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) --nodeps -bs $(SPEC)

	rpm: clean
	autoreconf -if
	$(MAKE) $(SPEC) $(TARFILE)
	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) -ba $(SPEC)
	diff --git a/configure.ac b/configure.ac
	index 0fb4314..d7d4c33 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,430 +1,433 @@
	# -- Autoconf --
	# Process this file with autoconf to produce a configure script.

	# bootstrap / init
	AC_PREREQ([2.61])

	AC_INIT([booth], [0.2.0], [pacemaker@oss.clusterlabs.org])

	AM_INIT_AUTOMAKE([-Wno-portability])

	AC_CONFIG_SRCDIR([src/main.c])
	AC_CONFIG_HEADER([src/b_config.h src/booth_config.h])

	AC_CANONICAL_HOST

	AC_LANG([C])

	AC_SUBST(WITH_LIST, [""])

	dnl Fix default variables - "prefix" variable if not specified
	if test "$prefix" = "NONE"; then
	prefix="/usr"

	dnl Fix "localstatedir" variable if not specified
	if test "$localstatedir" = "\${prefix}/var"; then
	localstatedir="/var"
	fi
	dnl Fix "sysconfdir" variable if not specified
	if test "$sysconfdir" = "\${prefix}/etc"; then
	sysconfdir="/etc"
	fi
	dnl Fix "libdir" variable if not specified
	if test "$libdir" = "\${exec_prefix}/lib"; then
	if test -e /usr/lib64; then
	libdir="/usr/lib64"
	else
	libdir="/usr/lib"
	fi
	fi
	fi

	if test "$srcdir" = "."; then
	AC_MSG_NOTICE([building in place srcdir:$srcdir])
	AC_DEFINE([BUILDING_IN_PLACE], 1, [building in place])
	else
	AC_MSG_NOTICE([building out of tree srcdir:$srcdir])
	fi

	# Checks for programs.

	# check stolen from gnulib/m4/gnu-make.m4
	if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
	AC_MSG_ERROR([you don't seem to have GNU make; it is required])
	fi

	AC_PROG_CC
	AC_PROG_INSTALL
	AC_PROG_LN_S
	AC_PROG_MAKE_SET
	AC_PROG_RANLIB

	-AC_PATH_PROGS(HELP2MAN, help2man)
	AC_PATH_PROGS(PKGCONFIG, pkg-config)
	-AM_CONDITIONAL(HAVE_HELP2MAN, test x"${HELP2MAN}" != x"")
	+AC_PATH_PROGS(ASCIIDOC, asciidoc)
	+
	+AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"")

	# Checks for libraries.
	AC_CHECK_LIB([socket], [socket])
	AC_CHECK_LIB([nsl], [t_open])
	AC_CHECK_LIB([gpl], [cl_log])

	PKG_CHECK_MODULES(GLIB, [glib-2.0])

	# Checks for header files.
	AC_FUNC_ALLOCA
	AC_HEADER_DIRENT
	AC_HEADER_STDC
	AC_HEADER_SYS_WAIT
	AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
	stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
	sys/time.h syslog.h unistd.h sys/types.h getopt.h malloc.h \
	sys/sockio.h utmpx.h])
	AC_CHECK_HEADERS(heartbeat/glue_config.h)

	# Checks for typedefs, structures, and compiler characteristics.
	AC_C_CONST
	AC_TYPE_UID_T
	AC_C_INLINE
	AC_TYPE_INT16_T
	AC_TYPE_INT32_T
	AC_TYPE_INT64_T
	AC_TYPE_INT8_T
	AC_TYPE_SIZE_T
	AC_TYPE_SSIZE_T
	AC_HEADER_TIME
	AC_TYPE_UINT16_T
	AC_TYPE_UINT32_T
	AC_TYPE_UINT64_T
	AC_TYPE_UINT8_T
	AC_C_VOLATILE

	# Checks for library functions.
	AC_FUNC_CLOSEDIR_VOID
	AC_FUNC_ERROR_AT_LINE
	AC_REPLACE_FNMATCH
	AC_FUNC_FORK
	AC_PROG_GCC_TRADITIONAL
	AC_FUNC_MALLOC
	AC_FUNC_MEMCMP
	AC_FUNC_REALLOC
	AC_FUNC_SELECT_ARGTYPES
	AC_TYPE_SIGNAL
	AC_FUNC_VPRINTF
	AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
	getcwd getpeerucred getpeereid gettimeofday inet_ntoa memmove \
	memset mkdir scandir select socket strcasecmp strchr strdup \
	strerror strrchr strspn strstr \
	sched_get_priority_max sched_setscheduler])

	AC_CONFIG_FILES([Makefile
	- src/Makefile])
	+ src/Makefile
	+ docs/Makefile])

	# ===============================================
	# Helpers
	# ===============================================

	## helper for CC stuff
	cc_supports_flag() {
	local CFLAGS="-Werror $@"
	AC_MSG_CHECKING(whether $CC supports "$@")
	- AC_COMPILE_IFELSE([int main(){return 0;}] ,[RC=0; AC_MSG_RESULT(yes)],[RC=1; AC_MSG_RESULT(no)])
	+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(){return 0;}]])],
	+ [RC=0; AC_MSG_RESULT(yes)],[RC=1; AC_MSG_RESULT(no)])
	return $RC
	}

	## cleanup
	AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
	case $prefix in
	NONE) prefix=/usr/local;;
	esac

	AC_MSG_NOTICE(Sanitizing exec_prefix: ${exec_prefix})
	case $exec_prefix in
	dnl For consistency with Corosync, map NONE->$prefix
	NONE) exec_prefix=$prefix;;
	prefix) exec_prefix=$prefix;;
	esac

	## local defines
	PACKAGE_FEATURES=""

	LINT_FLAGS="-weak -unrecog +posixlib +ignoresigns -fcnuse \
	-badflag -D__gnuc_va_list=va_list -D__attribute$x$="

	# local options

	AC_ARG_ENABLE([fatal-warnings],
	[ --enable-fatal-warnings : enable fatal warnings. ],
	[ default="no" ])

	AC_ARG_ENABLE([debug],
	[ --enable-debug : enable debug build. ],
	[ default="no" ])

	AC_ARG_ENABLE([user-flags],
	[ --enable-user-flags : rely on user environment. ],
	[ default="no" ])

	AC_ARG_ENABLE([coverage],
	[ --enable-coverage : coverage analysis of the codebase. ],
	[ default="no" ])

	AC_ARG_ENABLE([small-memory-footprint],
	[ --enable-small-memory-footprint : Use small message queues and small messages sizes. ],
	[ default="no" ])

	AC_ARG_WITH([initddir],
	[ --with-initddir=DIR : path to init script directory. ],
	[ INITDDIR="$withval" ],
	[ INITDDIR="$sysconfdir/init.d" ])

	AC_ARG_ENABLE([resource-monitor],
	[ --enable-resource-monitor : Enabling Resource Monitor ],
	[ default="no" ])

	# OS detection
	# THIS SECTION MUST DIE!
	CP=cp
	OS_LDL="-ldl"
	have_linux="no"
	case "$host_os" in
	linux)
	AC_DEFINE_UNQUOTED([BOOTH_LINUX], [1],
	[Compiling for Linux platform])
	OS_CFLAGS=""
	OS_CPPFLAGS="-D_GNU_SOURCE"
	OS_LDFLAGS=""
	OS_DYFLAGS="-rdynamic"
	DARWIN_OPTS=""
	have_linux="yes"
	;;
	darwin*)
	AC_DEFINE_UNQUOTED([BOOTH_DARWIN], [1],
	[Compiling for Darwin platform])
	CP=rsync
	OS_CFLAGS=""
	OS_CPPFLAGS=""
	OS_LDFLAGS=""
	OS_DYFLAGS=""
	DARWIN_OPTS="-dynamiclib -bind_at_load \
	-current_version ${SONAME} \
	-compatibility_version ${SONAME} -install_name \$(libdir)/\$(@)"
	AC_DEFINE_UNQUOTED([MAP_ANONYMOUS], [MAP_ANON],
	[Shared memory define for Darwin platform])
	AC_DEFINE_UNQUOTED([PATH_MAX], [4096],
	[Number of chars in a path name including nul])
	AC_DEFINE_UNQUOTED([NAME_MAX], [255],
	[Number of chars in a file name])
	;;
	bsd)
	AC_DEFINE_UNQUOTED([BOOTH_BSD], [1],
	[Compiling for BSD platform])
	AC_DEFINE_UNQUOTED([MAP_ANONYMOUS], [MAP_ANON],
	[Shared memory define for Darwin platform])
	OS_CFLAGS=""
	OS_CPPFLAGS="-I/usr/local/include"
	OS_LDFLAGS="-L/usr/local/lib"
	OS_DYFLAGS="-export-dynamic"
	DARWIN_OPTS=""
	OS_LDL=""
	case "$host_os" in
	freebsd[[234567]])
	;;
	freebsd)
	AC_DEFINE_UNQUOTED([BOOTH_FREEBSD_GE_8], [1],
	[Compiling for FreeBSD >= 8 platform])
	;;
	esac
	;;
	solaris)
	AC_DEFINE_UNQUOTED([BOOTH_SOLARIS], [1],
	[Compiling for Solaris platform])
	AC_DEFINE_UNQUOTED([TS_CLASS], [1],
	[Prevent being scheduled RR])
	AC_DEFINE_UNQUOTED([_SEM_SEMUN_UNDEFINED], [1],
	[The semun structure is undefined])
	CP=rsync
	OS_CFLAGS=""
	OS_CPPFLAGS="-D_REENTRANT"
	OS_LDFLAGS=""
	OS_DYFLAGS="-Wl,-z,lazyload"
	DARWIN_OPTS=""
	SOLARIS_OPTS=" "
	;;
	*)
	AC_MSG_ERROR([Unsupported OS? hmmmm])
	;;
	esac

	AC_SUBST(CP)
	# *FLAGS handling goes here

	ENV_CFLAGS="$CFLAGS"
	ENV_CPPFLAGS="$CPPFLAGS"
	ENV_LDFLAGS="$LDFLAGS"

	# debug build stuff
	if test "x${enable_debug}" = xyes; then
	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
	OPT_CFLAGS="-O0"
	PACKAGE_FEATURES="$PACKAGE_FEATURES debug"
	else
	OPT_CFLAGS="-O3"
	fi

	# gdb flags
	if test "x${GCC}" = xyes; then
	GDB_FLAGS="-ggdb3"
	else
	GDB_FLAGS="-g"
	fi

	# extra warnings
	EXTRA_WARNINGS=""

	WARNLIST="
	all
	shadow
	missing-prototypes
	missing-declarations
	strict-prototypes
	declaration-after-statement
	pointer-arith
	write-strings
	bad-function-cast
	missing-format-attribute
	format=2
	format-security
	format-nonliteral
	no-long-long
	unsigned-char
	gnu89-inline
	no-strict-aliasing
	"

	for j in $WARNLIST; do
	if cc_supports_flag -W$j; then
	EXTRA_WARNINGS="$EXTRA_WARNINGS -W$j";
	fi
	done

	if test "x${enable_coverage}" = xyes && \
	cc_supports_flag -ftest-coverage && \
	cc_supports_flag -fprofile-arcs ; then
	AC_MSG_NOTICE([Enabling Coverage (enable -O0 by default)])
	OPT_CFLAGS="-O0"
	COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
	COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
	COVERAGE_LCRSO_EXTRA_LDFLAGS="-rdynamic"
	PACKAGE_FEATURES="$PACKAGE_FEATURES coverage"
	else
	COVERAGE_CFLAGS=""
	COVERAGE_LDFLAGS=""
	COVERAGE_LCRSO_EXTRA_LDFLAGS=""
	fi


	if test "x${enable_small_memory_footprint}" = xyes ; then
	AC_DEFINE_UNQUOTED([HAVE_SMALL_MEMORY_FOOTPRINT], 1, [have small_memory_footprint])
	PACKAGE_FEATURES="$PACKAGE_FEATURES small-memory-footprint"
	fi

	if test "x${enable_ansi}" = xyes && \
	cc_supports_flag -std=iso9899:199409 ; then
	AC_MSG_NOTICE([Enabling ANSI Compatibility])
	ANSI_CPPFLAGS="-ansi -D_GNU_SOURCE -DANSI_ONLY"
	PACKAGE_FEATURES="$PACKAGE_FEATURES ansi"
	else
	ANSI_CPPFLAGS=""
	fi

	if test "x${enable_fatal_warnings}" = xyes && \
	cc_supports_flag -Werror ; then
	AC_MSG_NOTICE([Enabling Fatal Warnings (-Werror)])
	WERROR_CFLAGS="-Werror"
	PACKAGE_FEATURES="$PACKAGE_FEATURES fatal-warnings"
	else
	WERROR_CFLAGS=""
	fi

	# don't add addtional cflags
	if test "x${enable_user_flags}" = xyes; then
	OPT_CFLAGS=""
	GDB_FLAGS=""
	EXTRA_WARNINGS=""
	fi

	# final build of *FLAGS
	CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
	CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS $GLIB_CFLAGS $RESMON_CFLAGS"
	LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"

	# substitute what we need:
	AC_SUBST([INITDDIR])

	AC_SUBST([COVERAGE_LCRSO_EXTRA_LDFLAGS])
	AC_SUBST([OS_DYFLAGS])

	AC_SUBST([OS_LDL])

	AM_CONDITIONAL(BUILD_DARWIN, test -n "${DARWIN_OPTS}")
	AM_CONDITIONAL(BUILD_SOLARIS, test -n "${SOLARIS_OPTS}")
	AC_SUBST([DARWIN_OPTS])
	AC_SUBST([SOLARIS_OPTS])

	AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")

	AC_SUBST([LINT_FLAGS])

	AC_DEFINE_UNQUOTED([LCRSODIR], "$(eval echo ${LCRSODIR})", [LCRSO directory])
	AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket directory])
	AC_DEFINE_UNQUOTED([LOCALSTATEDIR], "$(eval echo ${localstatedir})", [localstate directory])

	BOOTHSYSCONFDIR=${sysconfdir}/booth
	AC_SUBST([HAVE_LOG_CIB_DIFF])
	AC_SUBST([HAVE_XML_LOG_PATCHSET])
	AC_SUBST([BOOTHSYSCONFDIR])
	AC_DEFINE_UNQUOTED([BOOTHSYSCONFDIR], "$(eval echo ${BOOTHSYSCONFDIR})", [booth config directory])

	AC_DEFINE_UNQUOTED([PACKAGE_FEATURES], "${PACKAGE_FEATURES}", [booth built-in features])

	AC_OUTPUT

	AC_MSG_RESULT([])
	AC_MSG_RESULT([$PACKAGE configuration:])
	AC_MSG_RESULT([ Version = ${VERSION}])
	AC_MSG_RESULT([ Prefix = ${prefix}])
	AC_MSG_RESULT([ Executables = ${sbindir}])
	AC_MSG_RESULT([ Man pages = ${mandir}])
	AC_MSG_RESULT([ Doc dir = ${docdir}])
	AC_MSG_RESULT([ Libraries = ${libdir}])
	AC_MSG_RESULT([ Header files = ${includedir}])
	AC_MSG_RESULT([ Arch-independent files = ${datadir}])
	AC_MSG_RESULT([ State information = ${localstatedir}])
	AC_MSG_RESULT([ System configuration = ${sysconfdir}])
	AC_MSG_RESULT([ System init.d directory = ${INITDDIR}])
	AC_MSG_RESULT([ booth config dir = ${BOOTHSYSCONFDIR}])
	AC_MSG_RESULT([ SOCKETDIR = ${SOCKETDIR}])
	AC_MSG_RESULT([ Features =${PACKAGE_FEATURES}])
	AC_MSG_RESULT([])
	AC_MSG_RESULT([$PACKAGE build info:])
	AC_MSG_RESULT([ Library SONAME = ${SONAME}])
	LIB_MSG_RESULT(m4_shift(local_soname_list))dnl
	AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
	AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
	AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
	AC_MSG_RESULT([ Env. defined CFLAG = ${ENV_CFLAGS}])
	AC_MSG_RESULT([ Env. defined CPPFLAGS = ${ENV_CPPFLAGS}])
	AC_MSG_RESULT([ Env. defined LDFLAGS = ${ENV_LDFLAGS}])
	AC_MSG_RESULT([ OS defined CFLAGS = ${OS_CFLAGS}])
	AC_MSG_RESULT([ OS defined CPPFLAGS = ${OS_CPPFLAGS}])
	AC_MSG_RESULT([ OS defined LDFLAGS = ${OS_LDFLAGS}])
	AC_MSG_RESULT([ OS defined LDL = ${OS_LDL}])
	AC_MSG_RESULT([ OS defined DYFLAGS = ${OS_DYFLAGS}])
	AC_MSG_RESULT([ ANSI defined CPPFLAGS = ${ANSI_CPPFLAGS}])
	AC_MSG_RESULT([ Coverage CFLAGS = ${COVERAGE_CFLAGS}])
	AC_MSG_RESULT([ Coverage LDFLAGS = ${COVERAGE_LDFLAGS}])
	AC_MSG_RESULT([ Fatal War. CFLAGS = ${WERROR_CFLAGS}])
	AC_MSG_RESULT([ Final CFLAGS = ${CFLAGS}])
	AC_MSG_RESULT([ Final CPPFLAGS = ${CPPFLAGS}])
	AC_MSG_RESULT([ Final LDFLAGS = ${LDFLAGS}])
	diff --git a/docs/Makefile b/docs/Makefile
	deleted file mode 100644
	index a2fa74d..0000000
	--- a/docs/Makefile
	+++ /dev/null
	@@ -1,14 +0,0 @@
	-
	-
	-
	-all: boothd.8 boothd.html boothd.xml
	-
	-
	-boothd.8: boothd.8.txt
	- a2x --doctype manpage --format manpage --verbose $<
	-
	-boothd.html: boothd.8.txt
	- a2x --doctype manpage --format xhtml --verbose $<
	-
	-boothd.xml: boothd.8.txt
	- a2x --doctype manpage --format docbook --verbose $<
	diff --git a/docs/Makefile.am b/docs/Makefile.am
	new file mode 100644
	index 0000000..d5792dc
	--- /dev/null
	+++ b/docs/Makefile.am
	@@ -0,0 +1,40 @@
	+#
	+# docs: booth manual pages
	+#
	+# Copyright (C) 2014 Dejan Muhamedagic
	+#
	+# This program is free software; you can redistribute it and/or
	+# modify it under the terms of the GNU General Public License
	+# as published by the Free Software Foundation; either version 2
	+# of the License, or (at your option) any later version.
	+#
	+# This program 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 General Public License for more details.
	+#
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	+#
	+MAINTAINERCLEANFILES = Makefile.in
	+
	+asciiman = boothd.8.txt
	+doc_DATA = $(generated_docs)
	+
	+generated_docs =
	+generated_mans =
	+
	+if BUILD_ASCIIDOC
	+generated_docs += $(ascii:%.txt=%.html) $(asciiman:%.txt=%.html)
	+generated_mans += $(asciiman:%.8.txt=%.8)
	+$(generated_mans): $(asciiman)
	+man8_MANS = $(generated_mans)
	+endif
	+
	+%.html: %.txt
	+ $(ASCIIDOC) --unsafe --backend=xhtml11 $<
	+%.8: %.8.txt
	+ a2x -f manpage $<
	+clean-local:
	+ -rm -rf $(generated_docs) $(generated_mans)
	diff --git a/src/Makefile.am b/src/Makefile.am
	index 4292a7a..b3b60dd 100644
	--- a/src/Makefile.am
	+++ b/src/Makefile.am
	@@ -1,33 +1,21 @@
	MAINTAINERCLEANFILES = Makefile.in

	AM_CFLAGS = -fPIC -Werror -funsigned-char -Wno-pointer-sign


	AM_CPPFLAGS = -I$(top_builddir)/include

	sbin_PROGRAMS = boothd

	boothd_SOURCES = config.c main.c raft.c ticket.c transport.c \
	pacemaker.c handler.c

	boothd_LDFLAGS = $(OS_DYFLAGS) -L./
	boothd_LDADD = -lplumb -lplumbgpl -lz -lm
	boothd_CPPFLAGS = $(GLIB_CFLAGS)

	noinst_HEADERS = booth.h pacemaker.h \
	config.h log.h raft.h ticket.h transport.h handler.h

	-if HAVE_HELP2MAN
	-man_MANS = booth.8 boothd.8
	-MAINTAINERCLEANFILES += $(man_MANS)
	-EXTRA_DIST = $(man_MANS)
	-
	-%.8: %
	- $(HELP2MAN) -s 8 -N -o $@ ./$<
	-
	-booth.8: boothd.8
	- cp $< $@
	-endif
	-
	lint:
	-splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c
	diff --git a/src/handler.c b/src/handler.c
	index 719fc4c..00c4492 100644
	--- a/src/handler.c
	+++ b/src/handler.c
	@@ -1,70 +1,70 @@
	/*
	* Copyright (C) 2014 Philipp Marek <philipp.marek@linbit.com>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU 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 software 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
	* General Public License for more details.
	*
	* You should have received a copy of the GNU 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 <stdlib.h>
	#include <string.h>
	#include <errno.h>
	#include <arpa/inet.h>
	#include <inttypes.h>
	#include <stdio.h>
	#include <assert.h>
	#include <time.h>
	#include "ticket.h"
	#include "config.h"
	#include "inline-fn.h"
	#include "log.h"
	#include "pacemaker.h"
	#include "booth.h"
	#include "handler.h"



	/** Runs an external handler.
	* See eg. 'before-acquire-handler'.
	* TODO: timeout, async operation?. */
	int run_handler(struct ticket_config *tk,
	const char *cmd, int synchronous)
	{
	int rv;
	char expires[16];

	if (!cmd)
	return 0;

	assert(synchronous);
	- sprintf(expires, "%" PRId64, tk->term_expires);
	+ sprintf(expires, "%" PRId64, (int64_t)(tk->term_expires));

	rv = setenv("BOOTH_TICKET", tk->name, 1) \|\|
	setenv("BOOTH_LOCAL", local->addr_string, 1) \|\|
	setenv("BOOTH_CONF_NAME", booth_conf->name, 1) \|\|
	setenv("BOOTH_CONF_PATH", cl.configfile, 1) \|\|
	setenv("BOOTH_TICKET_EXPIRES", expires, 1);

	if (rv) {
	log_error("Cannot set environment: %d", errno);
	} else {
	rv = system(cmd);
	if (rv)
	log_error("Error calling \"%s\": %s",
	cmd, interpret_rv(rv));
	else
	log_info("Ran \"%s\" successfully.", cmd);
	}

	return rv;
	}
	diff --git a/src/raft.c b/src/raft.c
	index 76d7c0c..d6dfd7a 100644
	--- a/src/raft.c
	+++ b/src/raft.c
	@@ -1,509 +1,509 @@
	/*
	* Copyright (C) 2014 Philipp Marek <philipp.marek@linbit.com>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU 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 software 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
	* General Public License for more details.
	*
	* You should have received a copy of the GNU 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 <stdlib.h>
	#include <inttypes.h>
	#include <string.h>
	#include <errno.h>
	#include <arpa/inet.h>
	#include "booth.h"
	#include "transport.h"
	#include "inline-fn.h"
	#include "config.h"
	#include "raft.h"
	#include "ticket.h"
	#include "log.h"



	inline static void clear_election(struct ticket_config *tk)
	{
	int i;
	struct booth_site *site;

	log_info("clear election");
	tk->votes_received = 0;
	foreach_node(i, site)
	tk->votes_for[site->index] = NULL;
	}


	inline static void site_voted_for(struct ticket_config *tk,
	struct booth_site *who,
	struct booth_site *vote)
	{
	log_info("site \"%s\" votes for \"%s\"",
	site_string(who),
	site_string(vote));

	if (!tk->votes_for[who->index]) {
	tk->votes_for[who->index] = vote;
	tk->votes_received \|= who->bitmask;
	} else {
	if (tk->votes_for[who->index] != vote)
	log_error("voted previously (but in same term!) for \"%s\"...",
	tk->votes_for[who->index]->addr_string);
	}
	}


	static void become_follower(struct ticket_config *tk,
	struct boothc_ticket_msg *msg)
	{
	uint32_t i;
	int duration;

	tk->state = ST_FOLLOWER;


	duration = tk->term_duration;
	if (msg)
	duration = min(duration, ntohl(msg->ticket.term_valid_for));
	tk->term_expires = time(NULL) + duration;


	if (msg) {
	i = ntohl(msg->ticket.term);
	tk->current_term = max(i, tk->current_term);

	/* § 5.3 */
	i = ntohl(msg->ticket.leader_commit);
	tk->commit_index = max(i, tk->commit_index);
	}


	ticket_write(tk);
	}


	static struct booth_site majority_votes(struct ticket_config tk)
	{
	int i, n;
	struct booth_site *v;
	int count[MAX_NODES] = { 0, };


	for(i=0; i<booth_conf->site_count; i++) {
	v = tk->votes_for[i];
	if (!v)
	continue;

	n = v->index;
	count[n]++;
	log_info("Majority: %d \"%s\" wants %d \"%s\" => %d",
	i, booth_conf->site[i].addr_string,
	n, v->addr_string,
	count[n]);

	if (count[n]*2 <= booth_conf->site_count)
	continue;


	log_info("Majority reached: %d of %d for \"%s\"",
	count[n], booth_conf->site_count,
	v->addr_string);
	return v;
	}

	return NULL;
	}


	static int newer_term(struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg)
	{
	uint32_t term;

	term = ntohl(msg->ticket.term);
	/* §5.1 */
	if (term > tk->current_term) {
	tk->state = ST_FOLLOWER;
	tk->leader = leader;
	log_info("higher term %d vs. %d, following \"%s\"",
	term, tk->current_term,
	ticket_leader_string(tk));

	tk->current_term = term;
	return 1;
	}

	return 0;
	}

	static int term_too_low(struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg)
	{
	uint32_t term;

	term = ntohl(msg->ticket.term);
	/* §5.1 */
	if (term < tk->current_term)
	{
	log_info("sending REJECT, term too low.");
	send_reject(sender, tk, RLT_TERM_OUTDATED);
	return 1;
	}

	return 0;
	}




	/* For follower. */
	static int answer_HEARTBEAT (
	struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	uint32_t term;
	struct boothc_ticket_msg omsg;



	term = ntohl(msg->ticket.term);
	log_debug("leader: %s, have %s; term %d vs %d",
	site_string(leader), ticket_leader_string(tk),
	term, tk->current_term);

	/* No reject. (?) */
	if (term < tk->current_term)
	return 0;

	/* Needed? */
	newer_term(tk, sender, leader, msg);

	become_follower(tk, msg);
	/* Racy??? */
	assert(sender == leader \|\| !leader);

	tk->leader = leader;

	ticket_activate_timeout(tk);

	/* Yeth, mathter. */
	init_ticket_msg(&omsg, OP_HEARTBEAT, RLT_SUCCESS, tk);
	return booth_udp_send(sender, &omsg, sizeof(omsg));
	}


	/* For leader. */
	static int process_HEARTBEAT(
	struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	uint32_t term;


	if (newer_term(tk, sender, leader, msg)) {
	/* Uh oh. Higher term?? Should we simply believe that? */
	log_error("Got higher term number from");
	return 0;
	}


	term = ntohl(msg->ticket.term);

	/* Don't send a reject. */
	if (term < tk->current_term) {
	/* Doesn't know what he's talking about - perhaps
	* doesn't receive our packets? */
	log_error("Stale/wrong heartbeat from \"%s\": "
	"term %d instead of %d",
	site_string(sender),
	term, tk->current_term);
	return 0;
	}


	if (term == tk->current_term &&
	leader == tk->leader) {
	/* Hooray, an ACK! */
	/* So at least _someone_ is listening. */
	tk->hb_received \|= sender->bitmask;

	log_debug("Got heartbeat ACK from \"%s\", %d/%d agree.",
	site_string(sender),
	count_bits(tk->hb_received),
	booth_conf->site_count);


	if (majority_of_bits(tk, tk->hb_received)) {
	/* OK, at least half of the nodes are reachable;
	* no need to do anything until
	* the next heartbeat should be sent. */
	set_ticket_wakeup(tk);
	tk->retry_number = 0;
	} else {
	/* Not enough answers yet;
	* wait until timeout expires. */
	ticket_activate_timeout(tk);
	}
	}

	return 0;
	}


	static int process_VOTE_FOR(
	struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	uint32_t term;
	struct booth_site *new_leader;


	term = ntohl(msg->ticket.term);
	if (term_too_low(tk, sender, leader, msg))
	return 0;


	if (term == tk->current_term &&
	tk->election_end < time(NULL)) {
	/* Election already ended - either by time or majority.
	* Ignore. */
	return 0;
	}


	if (newer_term(tk, sender, leader, msg)) {
	clear_election(tk);
	}


	site_voted_for(tk, sender, leader);


	/* §5.2 */
	new_leader = majority_votes(tk);
	if (new_leader) {
	tk->leader = new_leader;

	tk->term_expires = time(NULL) + tk->term_duration;
	tk->election_end = 0;
	tk->voted_for = NULL;

	if ( new_leader == local) {
	tk->commit_index++; // ??
	tk->state = ST_LEADER;
	send_heartbeat(tk);
	ticket_write(tk);
	}
	else
	become_follower(tk, NULL);
	}

	set_ticket_wakeup(tk);
	return 0;
	}


	static int process_REJECTED(
	struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	uint32_t rv;

	rv = ntohl(msg->header.result);

	if (tk->state == ST_CANDIDATE &&
	rv == RLT_TERM_OUTDATED) {
	log_info("Am out of date, become follower.");
	tk->leader = leader;
	become_follower(tk, msg);
	return 0;
	}


	if (tk->state == ST_CANDIDATE &&
	rv == RLT_TERM_STILL_VALID) {
	log_error("There's a leader that I don't see: \"%s\"",
	site_string(leader));
	tk->leader = leader;
	become_follower(tk, msg);
	return 0;
	}

	log_error("unhandled reject: in state %s, got %s.",
	state_to_string(tk->state),
	state_to_string(rv));
	tk->leader = leader;
	become_follower(tk, msg);
	return 0;
	}


	/* §5.2 */
	static int answer_REQ_VOTE(
	struct ticket_config *tk,
	struct booth_site *sender,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	uint32_t term;
	int valid;
	struct boothc_ticket_msg omsg;


	if (term_too_low(tk, sender, leader, msg))
	return 0;
	if (newer_term(tk, sender, leader, msg))
	goto vote_for_her;


	term = ntohl(msg->ticket.term);
	/* Important: Ignore duplicated packets! */
	valid = term_valid_for(tk);
	if (valid &&
	term == tk->current_term &&
	sender == tk->leader) {
	log_debug("Duplicate OP_VOTE_FOR ignored.");
	return 0;
	}

	if (valid) {
	log_debug("no election allowed, term valid for %d??", valid);
	return send_reject(sender, tk, RLT_TERM_STILL_VALID);
	}

	/* §5.2, §5.4 */
	if (!tk->voted_for) {
	vote_for_her:
	tk->voted_for = sender;
	site_voted_for(tk, sender, leader);
	goto yes_you_can;
	}


	yes_you_can:
	init_ticket_msg(&omsg, OP_VOTE_FOR, RLT_SUCCESS, tk);
	omsg.ticket.leader = htonl(get_node_id(tk->voted_for));

	return transport()->broadcast(&omsg, sizeof(omsg));
	}


	int new_election(struct ticket_config tk, struct booth_site preference)
	{
	struct booth_site *new_leader;
	time_t now;


	time(&now);
	log_debug("start new election?, now=%" PRIi64 ", end %" PRIi64,
	- now, tk->election_end);
	+ (int64_t)now, (int64_t)(tk->election_end));
	if (now <= tk->election_end)
	return 0;


	/* §5.2 */
	/* If there was _no_ answer, don't keep incrementing the term number
	* indefinitely. If there was no peer, there'll probably be no one
	* listening now either.
	* Own vote can be disregarded.
	* Not entirely correct? After startup the term should be incremented
	* once, to speed up becoming a leader?
	* Perhaps only increment once, and then try to rebuild with the same
	* term number? With 5 nodes the 2 node partition would still increment
	* endlessly. */
	if (count_bits(tk->votes_received) > 1)
	tk->current_term++;

	tk->term_expires = 0;
	tk->election_end = now + tk->term_duration;

	log_debug("start new election! term=%d, until %" PRIi64,
	- tk->current_term, tk->election_end);
	+ tk->current_term, (int64_t)tk->election_end);
	clear_election(tk);

	if(preference)
	new_leader = preference;
	else
	new_leader = (local->type == SITE) ? local : NULL;
	site_voted_for(tk, local, new_leader);
	tk->voted_for = new_leader;

	tk->state = ST_CANDIDATE;

	ticket_broadcast(tk, OP_REQ_VOTE, RLT_SUCCESS);
	return 0;
	}


	int raft_answer(
	struct ticket_config *tk,
	struct booth_site *from,
	struct booth_site *leader,
	struct boothc_ticket_msg *msg
	)
	{
	int cmd;
	int rv;

	rv = 0;
	cmd = ntohl(msg->header.cmd);
	R(tk);

	log_debug("got message %s from \"%s\"",
	state_to_string(cmd),
	from->addr_string);


	switch (cmd) {
	case OP_REQ_VOTE:
	rv = answer_REQ_VOTE(tk, from, leader, msg);
	break;
	case OP_VOTE_FOR:
	rv = process_VOTE_FOR(tk, from, leader, msg);
	break;
	case OP_HEARTBEAT:
	if (tk->leader == local &&
	tk->state == ST_LEADER)
	rv = process_HEARTBEAT(tk, from, leader, msg);
	else if (tk->leader != local &&
	tk->state == ST_FOLLOWER)
	rv = answer_HEARTBEAT(tk, from, leader, msg);
	else
	assert("invalid combination - leader, follower");
	break;
	case OP_REJECTED:
	rv = process_REJECTED(tk, from, leader, msg);
	break;
	default:
	log_error("unprocessed message, cmd %x", cmd);
	rv = -EINVAL;
	}
	R(tk);
	return rv;
	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jan 25, 7:04 AM (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1321166
Default Alt Text: (33 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions