config to yaml & null replace map

.gitmodules

@@ -6,3 +6,6 @@
 	path = lib/libslave
 	url = git@gitlab7.lan:cpp/libslave.git
 	branch = mamba
+[submodule "lib/yaml-cpp"]
+	path = lib/yaml-cpp
+	url = https://github.com/jbeder/yaml-cpp.git

CMakeLists.txt

@@ -15,15 +15,7 @@ set(REPLICATOR_SRC
 
 add_subdirectory(lib/tarantool-c)
 add_subdirectory(lib/libslave)
-
-include(ExternalProject)
-ExternalProject_Add(libconfig
-  SOURCE_DIR ${REPLICATOR_ROOT}/lib/libconfig/
-  CONFIGURE_COMMAND ${REPLICATOR_ROOT}/lib/libconfig/configure --prefix=${CMAKE_CURRENT_SOURCE_DIR}/lib/libconfig
-  PREFIX ${REPLICATOR_ROOT}/lib/libconfig
-  BUILD_COMMAND make
-  BUILD_IN_SOURCE 1
-)
+add_subdirectory(lib/yaml-cpp)
 
 include(FindPackageHandleStandardArgs)
 find_path(IMYSQL mysql/mysql.h)
@@ -32,7 +24,7 @@ find_package_handle_standard_args(Mysql DEFAULT_MSG IMYSQL)
 include_directories(
 	"${REPLICATOR_ROOT}"
 	"${REPLICATOR_ROOT}/lib/libslave"
-	"${REPLICATOR_ROOT}/lib/libconfig/include"
+	"${REPLICATOR_ROOT}/lib/yaml-cpp/include"
 	"${REPLICATOR_ROOT}/lib/tarantool-c/include"
 	"${REPLICATOR_ROOT}/lib/tarantool-c/third_party/msgpuck"
 	"${IMYSQL}/mysql"
@@ -47,7 +39,7 @@ find_library(LBOOST_SERIALIZATION_MT boost_serialization)
 add_executable(rp ${REPLICATOR_SRC})
 set_target_properties(rp PROPERTIES COMPILE_FLAGS "${REPLICATOR_CFLAGS}")
 set_target_properties(rp PROPERTIES OUTPUT_NAME ${REPLICATOR_NAME})
-target_link_libraries(rp tnt slave_a ${REPLICATOR_ROOT}/lib/libconfig/lib/.libs/libconfig++.a)
+target_link_libraries(rp tnt slave_a yaml-cpp)
 target_link_libraries(rp ${LMYSQL_CLIENT_R} ${LPTHREAD} ${LZMQ} ${LBOOST_SYSTEM_MT} ${LBOOST_SERIALIZATION_MT} rt dl ssl crypto z)
 
 install(TARGETS rp RUNTIME DESTINATION sbin)

build.sh

 git submodule update --init --recursive
 git submodule update --init --recursive
 cmake -DCMAKE_BUILD_TYPE=Release .
-chmod 755 lib/libconfig/configure
 make
 strip -s replicatord

lib/libconfig/AUTHORS

-
-Mark Lindner - Lead developer & maintainer.
-Daniel Marjamäki - Enhancements & bugfixes.
-Andrew Tytula - Windows port.
-Glenn Herteg - Enhancements, bugfixes, documentation corrections.

lib/libconfig/INSTALL

-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

lib/libconfig/Makefile.am

-
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = lib doc tinytest tests
-
-if BUILDEXAMPLES
-SUBDIRS += examples
-endif
-
-.PHONY: dist-rpm
-
-dist-rpm: distcheck
-	rpmbuild -ta $(distdir).tar.gz
-
-EXTRA_DIST = \
-	m4/*.m4 \
-	*.sln \
-	test.cfg \
-	TODO \
-	debian/changelog \
-	debian/compat \
-	debian/control \
-	debian/copyright \
-	debian/docs \
-	debian/libconfig++9-dev.install \
-	debian/libconfig++9.install \
-	debian/libconfig9-dev.docs \
-	debian/libconfig9-dev.install \
-	debian/libconfig9.info \
-	debian/libconfig9.install \
-	debian/rules \
-	debian/shlibs \
-	debian/watch \
-	libconfig.spec \
-	contrib
-
-dist-hook:
-	rm -rf `find $(distdir)/contrib -name .svn`
-
-test:
-	cd tests && ./libconfig_tests

lib/libconfig/README

-
-To produce a PDF manual, issue the command "make pdf" after running
-`./configure'.
-
-				 -*-
-
-If you do not wish to build the C++ components, use:
-
-./configure --disable-cxx
-
-				 -*-
-
-The `examples' subdirectory contains some examples of using libconfig
-from C and C++.
-
-				 -*-
-
-The config file syntax changed between versions 0.8 and 0.9. In order
-to implement all of the feature/enhancement requests in an elegant and
-self-consistent way, the configuration grammar had to be changed in a
-non-backward-compatible way. In particular, groups are now values, so
-the old syntax:
-
-group
-{
-  ...
-}
-
-must now be written as:
-
-group =
-{
-  ...
-};
-
-Note that the trailing semicolon, which was previously optional, is
-now required. Also note that a colon (':') can be used in place of the
-equals sign.
-
-				 -*-
-
-Flex and Bison are not required in order to build this
-package. However, if you modify the .l or .y files, you must have Flex
-(2.5.31 or better) and Bison (2.1 or better), respectively.
-
-				 -*-
-
-To successfully compile using MinGW (with gcc 4.4.0 or later), it may
-be necessary to modify the file "mingw32\4.4.0\libstdc++.la", changing line 11
-from:
-
-library_names='libstdc++.dll.a'
-
-to:
-
-library_names='libstdc++.a'
-
-(See http://trac.osgeo.org/geos/ticket/282 for more information).

lib/libconfig/TODO

-TO-DOs:
-
-These are features that have been requested, and have been considered,
-but are not yet implemented, because I'm undecided about how or whether they
-should be implemented, and/or because they are difficult and/or time-consuming
-to implement.
-
-Also, some of these features tend to push libconfig toward becoming a
-general-purpose structured-data storage mechanism, which is really not the
-intended purpose of this library. I think something like sqlite is better
-suited for that sort of thing.
-
-
-* Add an option for safe type conversions; that is, report an error
-  rather than silently truncating out-of-range values to 0 (namely int64 ->
-  int).
-
-
-* Add support for copying settings from one configuration to another. Need a
-  recursive function to copy a setting and call itself on all child settings.
-
-
-* Add a += operator, so that additional elements can be appended to a list or
-  array. The issue with this is defining a consistent syntax. For example:
-
-  x = ( 1, 2, 3 );
-  x += ( 4, 5 );
-
-  Should this result in ( 1, 2, 3, 4, 5 ), or ( 1, 2, 3, ( 4, 5 ))? I believe
-  it should be the latter. However, only the former makes sense for arrays.
-
-
-* Add the ability to insert/delete elements at any position in a list or
-  array. A simple implementation would be expensive (shift all the elements
-  by one for every insert/delete), and a more efficient implementation would
-  add a lot of complexity to the library.
-
-
-* Add limited support for preserving comments?
-
-
-* Add support for unicode strings? A bit problematic, since flex doesn't
-  support unicode input, AFAICT. But maybe supply convenience functions to
-  convert between parsed UTF-8 strings and std::wstring.

lib/libconfig/ac_config.h.in

-/* ac_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `freelocale' function. */
-#undef HAVE_FREELOCALE
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `newlocale' function. */
-#undef HAVE_NEWLOCALE
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `uselocale' function. */
-#undef HAVE_USELOCALE
-
-/* Define to 1 if you have the <xlocale.h> header file. */
-#undef HAVE_XLOCALE_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Configured target name. */
-#undef TARGET
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-#undef YYTEXT_POINTER
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const

lib/libconfig/aux-build/compile

-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2009-10-06.20; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.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, 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, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.