[SCM] CTDB repository - branch 1.13 updated - ctdb-1.13-100-gc5c9507
Ronnie Sahlberg
sahlberg at samba.org
Wed Apr 25 16:49:12 MDT 2012
The branch, 1.13 has been updated
via c5c9507ea1e1836d51c2d4291721901bb6875a04 (commit)
via 9656584f6b21dbcb816e0a45c5fdba1ddd518777 (commit)
via 7dbfa76ce65ecad027de8bebee582146cbe0b37c (commit)
via 457e246bb379c4b07ca0729ebefbb0e067bddd4c (commit)
via 0f40ea2386892ae10b30beeded0e00edf4c019c3 (commit)
via a7aace3d165e6cb7d63950107e584edaee12a357 (commit)
via 670ebada4bafe79bd535c9bb5cc2d5d49d646af3 (commit)
via 2cd6a7ce648c1d2cc4d5580c3809858c100fa930 (commit)
via 483459c79884891b3639a8bb865d5e8318cde98c (commit)
via efbb7e0b9dcde547b46efd8e3b26c571e4fcf893 (commit)
via d1bc4a97ea649f5a07802178591688e438313ff8 (commit)
via 74539cc619b17ea187e34b5866869212896b0c1a (commit)
via 0681014ca5ed2a9b56f63fdace7f894beccf8a9a (commit)
via 9ae4389c2c959c5dcd8395fdae2b25ed7e1e873a (commit)
via 7218f17fa93716bf7b612b04284f654a5e95fc53 (commit)
via 79172330d10ae0d5a7e5bf724959c9e5784716b4 (commit)
via 83aea6488002aa75dd25752fa0d164afb8b4f300 (commit)
via a2ba2c4ec153c8844cf7f5b0de03b2269ec892f3 (commit)
via 98ac99c4a79fe2ee024890bb27c3ca68dc02d434 (commit)
via 10ab88a5c822ac403a70a9cd1a6c81020eb91d08 (commit)
via 2ade83de4e1f318c91489ec9a7f90d1b26f77e1b (commit)
via 94f1e02406c353c3a0235685acdd107ee5a7f285 (commit)
via 0cbe7a4f92795203f022252a50a240b8bd4238c3 (commit)
via 36e690faab3d76919780c8550fe6d49fb6bbfba5 (commit)
via 45773dab630ee44b39df0dd4b50f43fb1e7bb0ba (commit)
via a9e9444a7a78f5ef0e929a8dbd8ca0c68b40acd4 (commit)
via 00cd75595685dae829758abf1a4cb644af7ed50e (commit)
via 5cdeb0dd8827b13b06265c75dfac359bcd6ad10c (commit)
via 7293762046e25a9c96e6417e34e18c214ebc6e55 (commit)
via 5083b266dd68b292c4275505f3d1b878dbf12f11 (commit)
from 0489d75a27b63f3f2e69f18400498e667995738a (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.13
- Log -----------------------------------------------------------------
commit c5c9507ea1e1836d51c2d4291721901bb6875a04
Merge: 9656584f6b21dbcb816e0a45c5fdba1ddd518777 7218f17fa93716bf7b612b04284f654a5e95fc53
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Apr 26 08:40:49 2012 +1000
Merge branch '1.13' of 10.1.1.27:/shared/ctdb/ctdb-master into 1.13
commit 9656584f6b21dbcb816e0a45c5fdba1ddd518777
Merge: 7dbfa76ce65ecad027de8bebee582146cbe0b37c 670ebada4bafe79bd535c9bb5cc2d5d49d646af3
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Apr 26 08:40:01 2012 +1000
Merge remote branch 'amitay/talloc-sync' into 1.13
commit 7dbfa76ce65ecad027de8bebee582146cbe0b37c
Merge: 457e246bb379c4b07ca0729ebefbb0e067bddd4c 0f40ea2386892ae10b30beeded0e00edf4c019c3
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Apr 26 08:39:57 2012 +1000
Merge remote branch 'amitay/tdb-sync' into 1.13
commit 457e246bb379c4b07ca0729ebefbb0e067bddd4c
Merge: 0489d75a27b63f3f2e69f18400498e667995738a 483459c79884891b3639a8bb865d5e8318cde98c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Apr 26 08:39:52 2012 +1000
Merge remote branch 'amitay/tevent-sync' into 1.13
commit 7218f17fa93716bf7b612b04284f654a5e95fc53
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Apr 12 10:31:17 2012 +1000
Add test for NoIPTakeover
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 44 +-
client/ctdb_client.c | 1 -
common/cmdline.c | 1 -
common/ctdb_io.c | 1 -
common/ctdb_logging.c | 1 -
common/ctdb_ltdb.c | 1 -
common/ctdb_message.c | 1 -
common/ctdb_util.c | 1 -
common/system_freebsd.c | 1 -
common/system_gnu.c | 1 -
common/system_kfreebsd.c | 1 -
common/system_linux.c | 1 -
ib/ibw_ctdb.c | 1 -
ib/ibw_ctdb_init.c | 1 -
ib/ibwrapper_test.c | 1 -
include/includes.h | 7 +
lib/talloc/ABI/talloc-2.0.7.sigs | 62 +
lib/talloc/Makefile.in | 72 -
lib/talloc/aclocal.m4 | 1 -
lib/talloc/autogen.sh | 14 -
lib/talloc/config.guess | 1533 ------------------
lib/talloc/config.h.in | 702 --------
lib/talloc/config.mk | 13 -
lib/talloc/config.sub | 1693 --------------------
lib/talloc/configure.ac | 49 -
lib/talloc/libtalloc.m4 | 63 +-
lib/talloc/talloc.3 | 500 ------
lib/talloc/talloc.3.html | 433 -----
lib/talloc/talloc.3.xml | 19 +-
lib/talloc/talloc.c | 545 ++++++--
lib/talloc/talloc.h | 74 +-
lib/talloc/talloc.pc | 12 -
lib/talloc/talloc_guide.txt | 65 +-
lib/talloc/talloc_testsuite.h | 7 +
lib/talloc/testsuite.c | 220 +++-
lib/talloc/testsuite_main.c | 3 +-
lib/tdb/ABI/{tdb-1.2.6.sigs => tdb-1.2.10.sigs} | 5 +
lib/tdb/Makefile.in | 74 -
lib/tdb/aclocal.m4 | 1 -
lib/tdb/autogen.sh | 14 -
lib/tdb/build_macros.m4 | 14 -
lib/tdb/common/check.c | 12 +-
lib/tdb/common/dump.c | 4 +-
lib/tdb/common/error.c | 4 +-
lib/tdb/common/freelist.c | 4 +-
lib/tdb/common/freelistcheck.c | 2 +-
lib/tdb/common/hash.c | 39 +-
lib/tdb/common/io.c | 152 ++-
lib/tdb/common/lock.c | 56 +-
lib/tdb/common/open.c | 61 +-
lib/tdb/common/summary.c | 201 +++
lib/tdb/common/tdb.c | 99 +-
lib/tdb/common/tdb_private.h | 13 +-
lib/tdb/common/transaction.c | 169 ++-
lib/tdb/common/traverse.c | 8 +-
lib/tdb/config.guess | 1561 ------------------
lib/tdb/config.mk | 66 -
lib/tdb/config.sub | 1686 -------------------
lib/tdb/configure.ac | 44 -
lib/tdb/docs/mainpage.dox | 61 +
lib/tdb/include/tdb.h | 852 +++++++++--
lib/tdb/install-sh | 238 ---
lib/tdb/libtdb.m4 | 66 +-
lib/tdb/pytdb.c | 14 +-
lib/tdb/python.mk | 6 -
lib/tdb/python/tests/simple.py | 70 +-
lib/tdb/rules.mk | 16 -
lib/tdb/script/abi_checks.sh | 91 --
lib/tdb/script/abi_checks_gcc.sh | 35 -
lib/tdb/script/mksigs.pl | 183 ---
lib/tdb/script/mksyms.awk | 76 -
lib/tdb/script/mksyms.sh | 45 -
lib/tdb/script/release-script.sh | 67 -
lib/tdb/tdb.exports | 65 -
lib/tdb/tdb.mk | 92 --
lib/tdb/tdb.signatures | 61 -
lib/tdb/tools/tdbbackup.c | 21 +-
lib/tdb/tools/tdbrestore.c | 10 +-
lib/tdb/tools/tdbtest.c | 31 +-
lib/tdb/tools/tdbtool.c | 44 +-
lib/tdb/tools/tdbtorture.c | 38 +-
.../ABI/{tevent-0.9.9.sigs => tevent-0.9.15.sigs} | 5 +
lib/tevent/Makefile.in | 79 -
lib/tevent/autogen-waf.sh | 1 -
lib/tevent/autogen.sh | 13 -
lib/tevent/build_macros.m4 | 14 -
lib/tevent/config.guess | 1561 ------------------
lib/tevent/config.sub | 1686 -------------------
lib/tevent/configure.ac | 25 -
lib/tevent/doc/mainpage.dox | 2 +-
lib/tevent/install-sh | 238 ---
lib/tevent/libtalloc.m4 | 7 -
lib/tevent/libtevent.m4 | 71 +-
lib/tevent/pkg.m4 | 156 --
lib/tevent/release-script.sh | 48 -
lib/tevent/rules.mk | 18 -
lib/tevent/samba.m4 | 11 -
lib/tevent/script/abi_checks.sh | 91 --
lib/tevent/script/abi_checks_gcc.sh | 31 -
lib/tevent/script/mksigs.pl | 183 ---
lib/tevent/script/mksyms.awk | 75 -
lib/tevent/script/mksyms.sh | 45 -
lib/tevent/testsuite.c | 4 +-
lib/tevent/tevent.c | 23 +-
lib/tevent/tevent.exports | 62 -
lib/tevent/tevent.h | 368 ++++-
lib/tevent/tevent.mk | 46 -
lib/tevent/tevent.signatures | 57 -
lib/tevent/tevent_epoll.c | 26 +-
lib/tevent/tevent_fd.c | 6 +
lib/tevent/tevent_internal.h | 9 +-
lib/tevent/tevent_poll.c | 312 ++++
lib/tevent/tevent_queue.c | 99 ++-
lib/tevent/tevent_req.c | 19 +-
lib/tevent/tevent_select.c | 14 +-
lib/tevent/tevent_signal.c | 42 +-
lib/tevent/tevent_standard.c | 27 +-
lib/tevent/tevent_timed.c | 4 +-
lib/tevent/tevent_util.c | 58 +-
lib/tevent/tevent_util.h | 5 +-
lib/tevent/wscript | 75 -
lib/util/db_wrap.c | 1 -
packaging/RPM/makerpms.sh | 8 +
server/ctdb_banning.c | 1 -
server/ctdb_call.c | 1 -
server/ctdb_control.c | 1 -
server/ctdb_daemon.c | 1 -
server/ctdb_freeze.c | 1 -
server/ctdb_keepalive.c | 1 -
server/ctdb_lockwait.c | 1 -
server/ctdb_logging.c | 1 -
server/ctdb_ltdb_server.c | 1 -
server/ctdb_monitor.c | 1 -
server/ctdb_persistent.c | 1 -
server/ctdb_recover.c | 8 +-
server/ctdb_recoverd.c | 1 -
server/ctdb_server.c | 1 -
server/ctdb_statistics.c | 1 -
server/ctdb_takeover.c | 1 -
server/ctdb_traverse.c | 1 -
server/ctdb_update_record.c | 9 +-
server/ctdb_uptime.c | 1 -
server/ctdb_vacuum.c | 2 -
server/ctdbd.c | 1 -
server/eventscript.c | 1 -
tcp/tcp_connect.c | 1 -
tcp/tcp_init.c | 1 -
tcp/tcp_io.c | 1 -
tests/simple/73_tunable_NoIPTakeover.sh | 83 +
tests/src/ctdb_bench.c | 1 -
tests/src/ctdb_fetch.c | 1 -
tests/src/ctdb_fetch_one.c | 1 -
tests/src/ctdb_fetch_readonly_loop.c | 1 -
tests/src/ctdb_persistent.c | 1 -
tests/src/ctdb_randrec.c | 1 -
tests/src/ctdb_store.c | 1 -
tests/src/ctdb_test.c | 7 -
tests/src/ctdb_tool_stubby.c | 11 -
tests/src/ctdb_trackingdb_test.c | 1 -
tests/src/ctdb_transaction.c | 1 -
tests/src/ctdb_traverse.c | 1 -
tests/src/ctdb_update_record.c | 1 -
tests/src/ctdb_update_record_persistent.c | 1 -
tests/src/ctdbd_test.c | 1 -
tests/src/rb_test.c | 1 -
tools/ctdb.c | 1 -
tools/ctdb_vacuum.c | 1 -
utils/pmda/pmda_ctdb.c | 1 -
168 files changed, 3507 insertions(+), 14893 deletions(-)
create mode 100644 lib/talloc/ABI/talloc-2.0.7.sigs
delete mode 100644 lib/talloc/Makefile.in
delete mode 100644 lib/talloc/aclocal.m4
delete mode 100755 lib/talloc/autogen.sh
delete mode 100755 lib/talloc/config.guess
delete mode 100644 lib/talloc/config.h.in
delete mode 100644 lib/talloc/config.mk
delete mode 100755 lib/talloc/config.sub
delete mode 100644 lib/talloc/configure.ac
delete mode 100644 lib/talloc/talloc.3
delete mode 100644 lib/talloc/talloc.3.html
delete mode 100644 lib/talloc/talloc.pc
create mode 100644 lib/talloc/talloc_testsuite.h
rename lib/tdb/ABI/{tdb-1.2.6.sigs => tdb-1.2.10.sigs} (92%)
delete mode 100644 lib/tdb/Makefile.in
delete mode 100644 lib/tdb/aclocal.m4
delete mode 100755 lib/tdb/autogen.sh
delete mode 100644 lib/tdb/build_macros.m4
create mode 100644 lib/tdb/common/summary.c
delete mode 100755 lib/tdb/config.guess
delete mode 100644 lib/tdb/config.mk
delete mode 100755 lib/tdb/config.sub
delete mode 100644 lib/tdb/configure.ac
create mode 100644 lib/tdb/docs/mainpage.dox
delete mode 100755 lib/tdb/install-sh
delete mode 100644 lib/tdb/python.mk
delete mode 100644 lib/tdb/rules.mk
delete mode 100755 lib/tdb/script/abi_checks.sh
delete mode 100755 lib/tdb/script/abi_checks_gcc.sh
delete mode 100755 lib/tdb/script/mksigs.pl
delete mode 100644 lib/tdb/script/mksyms.awk
delete mode 100755 lib/tdb/script/mksyms.sh
delete mode 100644 lib/tdb/script/release-script.sh
delete mode 100644 lib/tdb/tdb.exports
delete mode 100644 lib/tdb/tdb.mk
delete mode 100644 lib/tdb/tdb.signatures
rename lib/tevent/ABI/{tevent-0.9.9.sigs => tevent-0.9.15.sigs} (91%)
delete mode 100644 lib/tevent/Makefile.in
delete mode 120000 lib/tevent/autogen-waf.sh
delete mode 100755 lib/tevent/autogen.sh
delete mode 100644 lib/tevent/build_macros.m4
delete mode 100755 lib/tevent/config.guess
delete mode 100755 lib/tevent/config.sub
delete mode 100644 lib/tevent/configure.ac
delete mode 100755 lib/tevent/install-sh
delete mode 100644 lib/tevent/libtalloc.m4
delete mode 100644 lib/tevent/pkg.m4
delete mode 100755 lib/tevent/release-script.sh
delete mode 100644 lib/tevent/rules.mk
delete mode 100644 lib/tevent/samba.m4
delete mode 100755 lib/tevent/script/abi_checks.sh
delete mode 100755 lib/tevent/script/abi_checks_gcc.sh
delete mode 100755 lib/tevent/script/mksigs.pl
delete mode 100644 lib/tevent/script/mksyms.awk
delete mode 100755 lib/tevent/script/mksyms.sh
delete mode 100644 lib/tevent/tevent.exports
delete mode 100644 lib/tevent/tevent.mk
delete mode 100644 lib/tevent/tevent.signatures
create mode 100644 lib/tevent/tevent_poll.c
delete mode 100644 lib/tevent/wscript
create mode 100755 tests/simple/73_tunable_NoIPTakeover.sh
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 90d7b08..1794be5 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,18 @@ POPT_LIBS = @POPT_LIBS@
POPT_CFLAGS = @POPT_CFLAGS@
POPT_OBJ = @POPT_OBJ@
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_CFLAGS = @TALLOC_CFLAGS@
+TALLOC_OBJ = @TALLOC_OBJ@
+
+TEVENT_LIBS = @TEVENT_LIBS@
+TEVENT_CFLAGS = @TEVENT_CFLAGS@
+TEVENT_OBJ = @TEVENT_OBJ@
+
+TDB_LIBS = @TDB_LIBS@
+TDB_CFLAGS = @TDB_CFLAGS@
+TDB_OBJ = @TDB_OBJ@
+
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
PMDA_LIBS = -lpcp -lpcp_pmda
@@ -36,7 +48,7 @@ PMDA_INSTALL = @CTDB_PMDA_INSTALL@
PMDA_DEST_DIR = /var/lib/pcp/pmdas
CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
- -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
+ $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I at libreplacedir@ \
-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
-DLOGDIR=\"$(logdir)\" \
-DUSE_MMAP=1 -DTEVENT_DEPRECATED_QUIET=1 @CFLAGS@ -Wno-format-zero-length $(POPT_CFLAGS) \
@@ -46,7 +58,8 @@ LDSHFLAGS=-fPIC -shared
#LDSHFLAGS=-fPIC -shared -Wl,-Bsymbolic -Wl,-z,relo -Wl,-Bsymbolic-funtions -Wl,--as-needed -Wl,-z,defs
SHLD=${CC} ${CFLAGS} ${LDSHFLAGS} -o $@
-LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
+LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TEVENT_LIBS) $(TDB_LIBS) \
+ @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
lib/util/util_time.o lib/util/util_file.o lib/util/fault.o lib/util/substitute.o \
@@ -64,8 +77,8 @@ CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \
CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
CTDB_CLIENT_OBJ = client/ctdb_client.o \
- $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ \
- @LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ)
+ $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) $(TALLOC_OBJ) $(TDB_OBJ) \
+ @LIBREPLACEOBJ@ $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ)
CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
server/ctdb_recoverd.o server/ctdb_recover.o server/ctdb_freeze.o \
@@ -102,7 +115,7 @@ all: showflags dirs doc $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(CTDB_LIB_OBJ) $(
showflags:
@echo 'ctdb will be compiled with flags:'
@echo ' CFLAGS = $(CFLAGS)'
- @echo ' LIBS = $(LIBS)'
+ @echo ' LIBS = $(LIB_FLAGS)'
showlayout::
@echo "ctdb will be installed into:"
@@ -150,9 +163,9 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
-bin/ltdbtool: tools/ltdbtool.o @TDB_OBJ@
+bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ $+
+ @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS)
bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
@echo Linking $@
@@ -198,11 +211,11 @@ tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o
tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@ @POPT_OBJ@ libctdb/libctdb.a $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
tests/bin/ctdb_fetch_readonly_once: libctdb/libctdb.a tests/src/ctdb_fetch_readonly_once.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o @TDB_OBJ@ @POPT_OBJ@ libctdb/libctdb.a $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
tests/bin/ctdb_fetch_readonly_loop: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_readonly_loop.o
@echo Linking $@
@@ -245,8 +258,8 @@ CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c
CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c tests/src/ctdb_test.c
-CTDB_TEST_OBJ = @TALLOC_OBJ@ @TDB_OBJ@ \
- @CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ)
+CTDB_TEST_OBJ = $(TALLOC_OBJ) $(TDB_OBJ) \
+ @CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ)
tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
@@ -258,13 +271,13 @@ tests/src/ctdb_tool_libctdb.o: tests/src/ctdb_tool_libctdb.c tests/src/libctdb_t
tests/bin/ctdb_tool_libctdb: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_libctdb.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) @POPT_OBJ@ $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
tests/src/ctdb_tool_stubby.o: tests/src/ctdb_tool_stubby.c tests/src/libctdb_test.c $(CTDB_TEST_C)
tests/bin/ctdb_tool_stubby: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_stubby.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) @POPT_OBJ@ $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
@echo Linking $@
@@ -357,6 +370,11 @@ test: all
valgrindtest: all
VALGRIND="valgrind -q --trace-children=yes" tests/run_tests.sh
+ctags:
+ find . -name "*.[ch]" | xargs ctags
+
+etags:
+ find . -name "*.[ch]" | xargs etags
realdistclean: distclean
rm -f configure config.h.in ctdb.pc
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index b01e258..69b0a04 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -22,7 +22,6 @@
#include "db_wrap.h"
#include "lib/tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
-#include "lib/tevent/tevent.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/locale.h"
diff --git a/common/cmdline.c b/common/cmdline.c
index 5c00763..59e8722 100644
--- a/common/cmdline.c
+++ b/common/cmdline.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "popt.h"
#include "../include/ctdb_client.h"
diff --git a/common/ctdb_io.c b/common/ctdb_io.c
index 810fd41..3ac1b63 100644
--- a/common/ctdb_io.c
+++ b/common/ctdb_io.c
@@ -22,7 +22,6 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
-#include "lib/tevent/tevent.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
index dee4dfd..e3299d3 100644
--- a/common/ctdb_logging.c
+++ b/common/ctdb_logging.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/time.h"
#include "../include/ctdb_private.h"
diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
index 3a184bb..dab88f3 100644
--- a/common/ctdb_ltdb.c
+++ b/common/ctdb_ltdb.c
@@ -19,7 +19,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/ctdb_message.c b/common/ctdb_message.c
index 03a4b55..5fc7b22 100644
--- a/common/ctdb_message.c
+++ b/common/ctdb_message.c
@@ -21,7 +21,6 @@
protocol design and packet details
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index dadaf18..5584c17 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/system_freebsd.c b/common/system_freebsd.c
index c72b6f8..ed30f8c 100644
--- a/common/system_freebsd.c
+++ b/common/system_freebsd.c
@@ -29,7 +29,6 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
-#include "lib/tevent/tevent.h"
#include <net/ethernet.h>
#include <netinet/ip6.h>
#include <net/if_arp.h>
diff --git a/common/system_gnu.c b/common/system_gnu.c
index 604bb48..7b8af34 100644
--- a/common/system_gnu.c
+++ b/common/system_gnu.c
@@ -28,7 +28,6 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
-#include "lib/tevent/tevent.h"
#include <net/ethernet.h>
#include <netinet/ip6.h>
#include <net/if_arp.h>
diff --git a/common/system_kfreebsd.c b/common/system_kfreebsd.c
index a6cd148..9e2aa07 100644
--- a/common/system_kfreebsd.c
+++ b/common/system_kfreebsd.c
@@ -28,7 +28,6 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
-#include "lib/tevent/tevent.h"
#include <net/ethernet.h>
#include <netinet/ip6.h>
#include <net/if_arp.h>
diff --git a/common/system_linux.c b/common/system_linux.c
index 464daef..21f5d6c 100644
--- a/common/system_linux.c
+++ b/common/system_linux.c
@@ -23,7 +23,6 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
-#include "lib/tevent/tevent.h"
#include <netinet/if_ether.h>
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
diff --git a/ib/ibw_ctdb.c b/ib/ibw_ctdb.c
index 5664c19..2e70d1d 100644
--- a/ib/ibw_ctdb.c
+++ b/ib/ibw_ctdb.c
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include <system/network.h>
#include <assert.h>
#include "ctdb_private.h"
diff --git a/ib/ibw_ctdb_init.c b/ib/ibw_ctdb_init.c
index fed1381..066814d 100644
--- a/ib/ibw_ctdb_init.c
+++ b/ib/ibw_ctdb_init.c
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include <system/network.h>
#include <assert.h>
#include "ctdb_private.h"
diff --git a/ib/ibwrapper_test.c b/ib/ibwrapper_test.c
index eb0d588..ba54286 100644
--- a/ib/ibwrapper_test.c
+++ b/ib/ibwrapper_test.c
@@ -37,7 +37,6 @@
#include <time.h>
#include "includes.h"
-#include "lib/tevent/tevent.h"
#include "ib/ibwrapper.h"
struct ibwtest_ctx {
diff --git a/include/includes.h b/include/includes.h
index b7d1e76..b565533 100644
--- a/include/includes.h
+++ b/include/includes.h
@@ -11,6 +11,13 @@
#include "idtree.h"
#include "ctdb_client.h"
+/* Allow use of deprecated function tevent_loop_allow_nesting() */
+#define TEVENT_DEPRECATED
+/* Saves ctdb from massive churn. */
+#define TEVENT_COMPAT_DEFINES 1
+
+#include "tevent.h"
+
typedef bool BOOL;
#define True 1
diff --git a/lib/talloc/ABI/talloc-2.0.7.sigs b/lib/talloc/ABI/talloc-2.0.7.sigs
new file mode 100644
index 0000000..6e236d5
--- /dev/null
+++ b/lib/talloc/ABI/talloc-2.0.7.sigs
@@ -0,0 +1,62 @@
+_talloc: void *(const void *, size_t)
+_talloc_array: void *(const void *, size_t, unsigned int, const char *)
+_talloc_free: int (void *, const char *)
+_talloc_get_type_abort: void *(const void *, const char *, const char *)
+_talloc_memdup: void *(const void *, const void *, size_t, const char *)
+_talloc_move: void *(const void *, const void *)
+_talloc_realloc: void *(const void *, void *, size_t, const char *)
+_talloc_realloc_array: void *(const void *, void *, size_t, unsigned int, const char *)
+_talloc_reference_loc: void *(const void *, const void *, const char *)
+_talloc_set_destructor: void (const void *, int (*)(void *))
+_talloc_steal_loc: void *(const void *, const void *, const char *)
+_talloc_zero: void *(const void *, size_t, const char *)
+_talloc_zero_array: void *(const void *, size_t, unsigned int, const char *)
+talloc_asprintf: char *(const void *, const char *, ...)
+talloc_asprintf_append: char *(char *, const char *, ...)
+talloc_asprintf_append_buffer: char *(char *, const char *, ...)
+talloc_autofree_context: void *(void)
+talloc_check_name: void *(const void *, const char *)
+talloc_disable_null_tracking: void (void)
+talloc_enable_leak_report: void (void)
+talloc_enable_leak_report_full: void (void)
+talloc_enable_null_tracking: void (void)
+talloc_enable_null_tracking_no_autofree: void (void)
+talloc_find_parent_byname: void *(const void *, const char *)
+talloc_free_children: void (void *)
+talloc_get_name: const char *(const void *)
+talloc_get_size: size_t (const void *)
+talloc_increase_ref_count: int (const void *)
+talloc_init: void *(const char *, ...)
+talloc_is_parent: int (const void *, const void *)
+talloc_named: void *(const void *, size_t, const char *, ...)
+talloc_named_const: void *(const void *, size_t, const char *)
+talloc_parent: void *(const void *)
+talloc_parent_name: const char *(const void *)
+talloc_pool: void *(const void *, size_t)
+talloc_realloc_fn: void *(const void *, void *, size_t)
+talloc_reference_count: size_t (const void *)
+talloc_reparent: void *(const void *, const void *, const void *)
+talloc_report: void (const void *, FILE *)
+talloc_report_depth_cb: void (const void *, int, int, void (*)(const void *, int, int, int, void *), void *)
+talloc_report_depth_file: void (const void *, int, int, FILE *)
+talloc_report_full: void (const void *, FILE *)
+talloc_set_abort_fn: void (void (*)(const char *))
+talloc_set_log_fn: void (void (*)(const char *))
+talloc_set_log_stderr: void (void)
+talloc_set_name: const char *(const void *, const char *, ...)
+talloc_set_name_const: void (const void *, const char *)
+talloc_show_parents: void (const void *, FILE *)
+talloc_strdup: char *(const void *, const char *)
+talloc_strdup_append: char *(char *, const char *)
+talloc_strdup_append_buffer: char *(char *, const char *)
+talloc_strndup: char *(const void *, const char *, size_t)
+talloc_strndup_append: char *(char *, const char *, size_t)
+talloc_strndup_append_buffer: char *(char *, const char *, size_t)
+talloc_total_blocks: size_t (const void *)
+talloc_total_size: size_t (const void *)
+talloc_unlink: int (const void *, void *)
+talloc_vasprintf: char *(const void *, const char *, va_list)
+talloc_vasprintf_append: char *(char *, const char *, va_list)
+talloc_vasprintf_append_buffer: char *(char *, const char *, va_list)
+talloc_version_major: int (void)
+talloc_version_minor: int (void)
diff --git a/lib/talloc/Makefile.in b/lib/talloc/Makefile.in
deleted file mode 100644
index 18b48c3..0000000
--- a/lib/talloc/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#!gmake
-#
-prefix = @prefix@
-datarootdir = @datarootdir@
-exec_prefix = @exec_prefix@
-includedir = @includedir@
-libdir = @libdir@
-mandir = @mandir@
-VPATH = @srcdir@:@libreplacedir@
-srcdir = @srcdir@
-builddir = @builddir@
-XSLTPROC = @XSLTPROC@
-INSTALLCMD = @INSTALL@
-CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
-EXTRA_TARGETS = @DOC_TARGET@
-
-.SUFFIXES: .c .o .3 .3.xml .xml .html
-
-LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
-
-all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
-
-showflags:
- @echo 'talloc will be compiled with flags:'
- @echo ' CFLAGS = $(CFLAGS)'
- @echo ' LIBS = $(LIBS)'
-
-testsuite: $(LIBOBJ) testsuite.o
- $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
-
-libtalloc.a: $(LIBOBJ)
- ar -rv $@ $(LIBOBJ)
- @-ranlib $@
-
-install: all
- ${INSTALLCMD} -d $(DESTDIR)$(libdir)
- ${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
- ${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
- ${INSTALLCMD} -d $(DESTDIR)${includedir}
- ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
- ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
- if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
- if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
-
-doc: talloc.3 talloc.3.html
-
-.3.xml.3:
- -test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-.xml.html:
- -test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
-
-clean:
- rm -f *~ $(LIBOBJ) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
-
-test: testsuite
- ./testsuite
-
-gcov:
- gcov talloc.c
-
-installcheck:
- $(MAKE) test
-
-distclean: clean
- rm -f *~ */*~
- rm -f Makefile
- rm -f config.log config.status config.h config.cache
-
-realdistclean: distclean
- rm -f configure config.h.in
diff --git a/lib/talloc/aclocal.m4 b/lib/talloc/aclocal.m4
deleted file mode 100644
index 5605e47..0000000
--- a/lib/talloc/aclocal.m4
+++ /dev/null
@@ -1 +0,0 @@
-m4_include(libreplace.m4)
diff --git a/lib/talloc/autogen.sh b/lib/talloc/autogen.sh
deleted file mode 100755
index bf84eee..0000000
--- a/lib/talloc/autogen.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-autoconf $IPATHS || exit 1
-autoheader $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/lib/talloc/config.guess b/lib/talloc/config.guess
deleted file mode 100755
index e3a2116..0000000
--- a/lib/talloc/config.guess
+++ /dev/null
@@ -1,1533 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
-
-timestamp='2009-06-10'
-
--
CTDB repository
More information about the samba-cvs
mailing list