Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
*.pyc

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.

1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
Expand Down
8 changes: 4 additions & 4 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ xiva (0.4.1-3) unstable; urgency=low

* Free list allocator was removed due to its poor performance. All
production general-purpose allocators I am aware of (tc_malloc,
jemalloc and ptmalloc3) perform faster (boost::fast_pool_allocator
jemalloc and ptmalloc3) perform faster (boost::fast_pool_allocator
sucks as well!).

* m4 scripts was improved to work on various platforms
Expand All @@ -135,13 +135,13 @@ xiva (0.4.1-2) unstable; urgency=low
xiva (0.4.1-1) unstable; urgency=low

* Architecture was changed sufficiently: particurarly, levelization of
physical dependencies was performed as well as many minor changes.
physical dependencies was performed as well as many minor changes.

* Python binding was implemented.

* Unit tests are implemented now with boost::test instead of cppunit.

* Notifications when connection opens or closes were implemented and
* Notifications when connection opens or closes were implemented and
tested.

* Node-based STL containers now use single-threaded free-list allocator.
Expand All @@ -150,7 +150,7 @@ xiva (0.4.1-1) unstable; urgency=low

xiva (0.3.1-2) unstable; urgency=low

* Implementation of connection manager was replaced with one based on
* Implementation of connection manager was replaced with one based on
boost::multi_index to support multiple connection from one user.

* Small refactoring was done to ensure that every translation unit
Expand Down
2 changes: 1 addition & 1 deletion TODO
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Replace std::ostream construction in connection_impl with copying to
* Replace std::ostream construction in connection_impl with copying to
streambuf_iterator<char>

* Fix http error response to send text representing error as well http
Expand Down
14 changes: 7 additions & 7 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ else
_version="0.0.0"
fi
$ECHO "Found GNU Automake version $_version"
version_check "$AUTOMAKE_VERSION" "$_version"
version_check "$AUTOMAKE_VERSION" "$_version"
if [ $? -ne 0 ] ; then
_report_error=yes
fi
Expand Down Expand Up @@ -686,7 +686,7 @@ else
_version="0.0.0"
fi
$ECHO "Found GNU Libtool version $_version"
version_check "$LIBTOOL_VERSION" "$_version"
version_check "$LIBTOOL_VERSION" "$_version"
if [ $? -ne 0 ] ; then
_report_error=yes
fi
Expand Down Expand Up @@ -1208,15 +1208,15 @@ manual_autogen ( ) {
libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$libtoolize_output"

if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
else
if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
$VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS"
libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$libtoolize_output"

if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
fi
fi
Expand Down Expand Up @@ -1264,7 +1264,7 @@ manual_autogen ( ) {
macros_to_search=""
ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"

if [ $ac_major -lt 2 ] ; then
macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
else
Expand Down Expand Up @@ -1382,7 +1382,7 @@ EOF
automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$automake_output"

if [ ! $ret = 0 ] ; then

###################
Expand All @@ -1394,7 +1394,7 @@ EOF
automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$automake_output"

if [ ! $ret = 0 ] ; then
# test if libtool is busted
libtool_failure "$automake_output"
Expand Down
4 changes: 2 additions & 2 deletions config/ax_boost_header.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ AC_DEFUN([AX_BOOST_HEADER],
[
ax_header_found="yes"
AC_REQUIRE([AX_BOOST_PREFIX])

ax_boost_header_stored_cppflags="$CPPFLAGS"
CPPFLAGS="$ax_boost_header_stored_cppflags $BOOST_CPPFLAGS"
AC_CHECK_HEADER([boost/$1], [], [ax_header_found="no"])
CPPFLAGS="$ax_boost_header_stored_cppflags"
if test "f$ax_header_found" = "fyes"; then
ifelse([$2], , :, [$2])
else
ifelse([$3], , :, [$3])
ifelse([$3], , :, [$3])
fi
])
4 changes: 2 additions & 2 deletions config/ax_boost_multi_index.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_DEFUN([AX_BOOST_MULTI_INDEX],
ax_boost_multi_index_stored_cppflags="$CPPFLAGS"
AC_REQUIRE([AX_BOOST_PREFIX])
CPPFLAGS="$ax_boost_multi_index_stored_cppflags $BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION"

ax_have_boost_multi_index="yes"
AX_BOOST_HEADER([multi_index_container.hpp], [], [ax_have_boost_multi_index="no"])
AX_BOOST_HEADER([multi_index/hashed_index.hpp], [], [ax_have_boost_multi_index="no"])
Expand All @@ -13,5 +13,5 @@ AC_DEFUN([AX_BOOST_MULTI_INDEX],
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
fi
])
4 changes: 2 additions & 2 deletions config/ax_boost_prefix.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AC_DEFUN([_AX_CHECK_BOOST_IN],
AC_DEFUN([AX_BOOST_PREFIX],
[
ax_boost_prefix=""
AC_ARG_WITH([boost-prefix],
AC_ARG_WITH([boost-prefix],
AS_HELP_STRING(--with-boost-prefix, specifies boost installation),
[
if test "f$withval" != "f"; then
Expand All @@ -34,7 +34,7 @@ AC_DEFUN([AX_BOOST_PREFIX],
_AX_CHECK_BOOST_IN([$i], [ax_boost_prefix="$i"], [])
done;
fi

if test "f$ax_boost_prefix" != "f"; then
AC_SUBST([BOOST_LDFLAGS], ["-I$ax_boost_prefix/lib"])
AC_SUBST([BOOST_CPPFLAGS], ["-I$ax_boost_prefix/include"])
Expand Down
14 changes: 7 additions & 7 deletions config/ax_boost_python.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ AC_DEFUN([AX_BOOST_PYTHON],
[
ax_boost_python_stored_ldflags="$LDFLAGS"
ax_boost_python_stored_cppflags="$CPPFLAGS"

AC_REQUIRE([AX_BOOST_PREFIX])
AC_REQUIRE([AX_PYTHON_DEVEL])
AX_BOOST_LIB([ax_boost_python_lib], [boost_python])

CPPFLAGS="$ax_boost_python_stored_cppflags $PYTHON_CPPFLAGS"
LDFLAGS="$ax_boost_python_stored_ldflags $BOOST_LDFLAGS -l$ax_boost_python_lib $PYTHON_LDFLAGS"

ax_have_boost_python="yes"
AX_BOOST_HEADER([python.hpp], [], [ax_have_boost_python="no"])

AC_MSG_CHECKING([trying to link with boost::python])
AC_LINK_IFELSE(
[ AC_LANG_PROGRAM([#include <boost/python.hpp>], [boost::python::str s;]) ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no); ax_have_boost_python="no" ])

CPPFLAGS="$ax_boost_python_stored_cppflags"
LDFLAGS="$ax_boost_python_stored_ldflags"

if test "f$ax_have_boost_python" = "fyes"; then
ifelse([$1], , :, [$1])
AC_SUBST([BOOST_PYTHON_LDFLAGS], ["-l$ax_boost_python_lib"])
else
ifelse([$2], , :, [$2])
fi
fi
])
4 changes: 2 additions & 2 deletions config/ax_boost_required.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ AC_DEFUN([AX_BOOST_REQUIRED],
[
ax_header_found="yes"
AC_REQUIRE([AX_BOOST_PREFIX])

ax_boost_requeired_stored_cppflags="$CPPFLAGS"
CPPFLAGS="$ax_boost_requeired_stored_cppflags $BOOST_CPPFLAGS"
AC_CHECK_HEADER([boost/$1], [], [ax_header_found="no"])
CPPFLAGS="$ax_boost_requeired_stored_cppflags"

if test "f$ax_header_found" != "fyes"; then
AC_MSG_ERROR([required header boost/$1 is not found in $ax_boost_prefix/include])
fi
Expand Down
14 changes: 7 additions & 7 deletions config/ax_boost_system.m4
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
AC_DEFUN([AX_BOOST_SYSTEM],
[
ax_boost_system_stored_ldflags="$LDFLAGS"

AC_REQUIRE([AX_BOOST_PREFIX])
AX_BOOST_LIB([ax_boost_system_lib], [boost_system])

LDFLAGS="$ax_boost_regex_stored_ldflags $BOOST_LDFLAGS -l$ax_boost_system_lib"

ax_have_boost_system="yes"
AX_BOOST_HEADER([system/config.hpp], [], [ax_have_boost_system="no"])

AC_MSG_CHECKING([trying to link with boost::system])
AC_LINK_IFELSE(
[ AC_LANG_PROGRAM([#include <boost/system/error_code.hpp>], [boost::system::error_code code;]) ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no); ax_have_boost_system="no" ])

LDFLAGS="$ax_boost_system_stored_ldflags"

if test "f$ax_have_boost_system" = "fyes"; then
ifelse([$1], , :, [$1])
AC_SUBST([BOOST_SYSTEM_LDFLAGS], ["-l$ax_boost_system_lib"])
else
ifelse([$2], , :, [$2])
fi
fi
])
14 changes: 7 additions & 7 deletions config/ax_boost_thread.m4
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
AC_DEFUN([AX_BOOST_THREAD],
[
ax_boost_thread_stored_ldflags="$LDFLAGS"

AC_REQUIRE([AX_BOOST_PREFIX])
AX_BOOST_LIB([ax_boost_thread_lib], [boost_thread])

LDFLAGS="$ax_boost_thread_stored_ldflags $BOOST_LDFLAGS -l$ax_boost_thread_lib"

ax_have_boost_thread="yes"
AX_BOOST_HEADER([thread.hpp], [], [ax_have_boost_thread="no"])
AX_BOOST_HEADER([thread/mutex.hpp], [], [ax_have_boost_thread="no"])
AX_BOOST_HEADER([thread/condition.hpp], [], [ax_have_boost_thread="no"])
AX_BOOST_HEADER([thread/thread.hpp], [], [ax_have_boost_thread="no"])

AC_MSG_CHECKING([trying to link with boost::thread])
AC_LINK_IFELSE(
[ AC_LANG_PROGRAM([#include <boost/thread.hpp>], [boost::thread_group g;]) ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no); ax_have_boost_thread="no" ])

LDFLAGS="$ax_boost_thread_stored_ldflags"

if test "f$ax_have_boost_thread" = "fyes"; then
ifelse([$1], , :, [$1])
AC_SUBST([BOOST_THREAD_LDFLAGS], ["-l$ax_boost_thread_lib"])
else
ifelse([$2], , :, [$2])
fi
fi
])
14 changes: 7 additions & 7 deletions config/ax_boost_unit_test.m4
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
AC_DEFUN([AX_BOOST_UNIT_TEST],
[
ax_boost_unit_test_stored_ldflags="$LDFLAGS"

AC_REQUIRE([AX_BOOST_PREFIX])
AX_BOOST_LIB([ax_boost_unit_test_lib], [boost_unit_test_framework])

LDFLAGS="$ax_boost_unit_test_stored_ldflags $BOOST_LDFLAGS -l$ax_boost_unit_test_lib"

ax_have_boost_unit_test="yes"
AX_BOOST_HEADER([test/unit_test.hpp], [], [ax_have_boost_unit_test="no"])
AX_BOOST_HEADER([test/test_case_template.hpp], [], [ax_have_boost_unit_test="no"])

AC_MSG_CHECKING([trying to link with boost::test])
AC_LINK_IFELSE(
[ AC_LANG_PROGRAM([#include <boost/test/unit_test.hpp>], []) ],
[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no); ax_have_boost_unit_test="no" ])

LDFLAGS="$ax_boost_unit_test_stored_ldflags"

if test "f$ax_have_boost_unit_test" = "fyes"; then
ifelse([$1], , :, [$1])
AC_SUBST([BOOST_UNIT_TEST_LDFLAGS], ["-l$ax_boost_unit_test_lib"])
else
ifelse([$2], , :, [$2])
fi
fi
])
10 changes: 5 additions & 5 deletions config/libxml2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
dnl
AC_DEFUN([AM_PATH_XML2],[
AC_DEFUN([AM_PATH_XML2],[
AC_ARG_WITH(xml-prefix,
[ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
xml_config_prefix="$withval", xml_config_prefix="")
Expand Down Expand Up @@ -64,7 +64,7 @@ dnl
#include <string.h>
#include <libxml/xmlversion.h>

int
int
main()
{
int xml_major_version, xml_minor_version, xml_micro_version;
Expand Down Expand Up @@ -100,9 +100,9 @@ main()
printf("*** xml2-config (version %d.%d.%d)\n",
$xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
return 1;
}
}
/* Compare the headers to the library to make sure we match */
/* Less than ideal -- doesn't provide us with return value feedback,
/* Less than ideal -- doesn't provide us with return value feedback,
* only exits if there's a serious mismatch between header and library.
*/
LIBXML_TEST_VERSION;
Expand Down Expand Up @@ -141,7 +141,7 @@ main()

if test "x$no_xml" = x ; then
AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
ifelse([$2], , :, [$2])
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$XML2_CONFIG" = "no" ; then
Expand Down
4 changes: 2 additions & 2 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ AC_SUBST(LIBLTDL)

AC_CHECK_LIB([ssl], [main])

AC_CONFIG_FILES([Makefile include/Makefile include/xiva/Makefile
include/details/Makefile library/Makefile stdext/Makefile
AC_CONFIG_FILES([Makefile include/Makefile include/xiva/Makefile
include/details/Makefile library/Makefile stdext/Makefile
daemon/Makefile python/Makefile tests/Makefile utils/Makefile])

AC_OUTPUT
Loading