From 6fb470a39ef8900b71634333b0a2227dc8b62799 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 26 Aug 2010 14:52:12 +0200 Subject: Add support for creating other build systems (meta-building) Add support for automake, VC++ 9, and VC++ 10. Also add the Win32 and 'NULL' threading model implementations. --- Makefile.am | 12 ++ README | 0 bootstrap | 18 ++ build/bootstrap.make | 24 ++- configure.ac | 113 ++++++++++++ libodb-vc10.sln | 26 +++ libodb-vc9.sln | 26 +++ libodb.pc.in | 16 ++ m4/acx_pthread.m4 | 254 ++++++++++++++++++++++++++ makefile | 41 +++-- odb/Makefile.am | 26 +++ odb/compilers/vc/pre.hxx | 1 + odb/core.hxx | 4 + odb/database.hxx | 10 +- odb/details/buffer.hxx | 8 +- odb/details/condition.hxx | 38 ++++ odb/details/config-vc.h | 17 ++ odb/details/config.h.in | 16 ++ odb/details/config.hxx | 23 +++ odb/details/exception.hxx | 8 +- odb/details/export.hxx | 29 +++ odb/details/lock.hxx | 7 +- odb/details/meta/answer.hxx | 4 + odb/details/meta/class-p.hxx | 4 + odb/details/meta/polymorphic-p.hxx | 4 + odb/details/meta/remove-c.hxx | 4 + odb/details/meta/remove-cv.hxx | 4 + odb/details/meta/remove-p.hxx | 4 + odb/details/meta/remove-v.hxx | 4 + odb/details/mutex.hxx | 37 ++++ odb/details/posix/condition.hxx | 7 +- odb/details/posix/exceptions.hxx | 7 +- odb/details/posix/mutex.hxx | 8 +- odb/details/posix/thread.hxx | 8 +- odb/details/posix/tls.hxx | 16 +- odb/details/shared-ptr.hxx | 4 + odb/details/shared-ptr/base.hxx | 16 +- odb/details/thread.hxx | 14 ++ odb/details/tls.hxx | 98 +++++++++- odb/details/win32/condition.cxx | 57 ++++++ odb/details/win32/condition.hxx | 52 ++++++ odb/details/win32/condition.ixx | 32 ++++ odb/details/win32/exceptions.cxx | 18 ++ odb/details/win32/exceptions.hxx | 39 ++++ odb/details/win32/mutex.hxx | 46 +++++ odb/details/win32/mutex.ixx | 34 ++++ odb/details/win32/thread.cxx | 91 ++++++++++ odb/details/win32/thread.hxx | 62 +++++++ odb/exception.hxx | 8 +- odb/exceptions.hxx | 20 ++- odb/forward.hxx | 4 + odb/libodb-vc10.vcxproj | 172 ++++++++++++++++++ odb/libodb-vc10.vcxproj.filters | 21 +++ odb/libodb-vc9.vcproj | 357 +++++++++++++++++++++++++++++++++++++ odb/makefile | 74 ++++++-- odb/pointer-traits.hxx | 4 + odb/query.hxx | 4 + odb/result.hxx | 4 + odb/traits.hxx | 4 + odb/transaction.hxx | 10 +- odb/version.hxx | 4 + 61 files changed, 2001 insertions(+), 76 deletions(-) create mode 100644 Makefile.am create mode 100644 README create mode 100755 bootstrap create mode 100644 configure.ac create mode 100644 libodb-vc10.sln create mode 100644 libodb-vc9.sln create mode 100644 libodb.pc.in create mode 100644 m4/acx_pthread.m4 create mode 100644 odb/Makefile.am create mode 100644 odb/details/config-vc.h create mode 100644 odb/details/config.h.in create mode 100644 odb/details/config.hxx create mode 100644 odb/details/export.hxx create mode 100644 odb/details/win32/condition.cxx create mode 100644 odb/details/win32/condition.hxx create mode 100644 odb/details/win32/condition.ixx create mode 100644 odb/details/win32/exceptions.cxx create mode 100644 odb/details/win32/exceptions.hxx create mode 100644 odb/details/win32/mutex.hxx create mode 100644 odb/details/win32/mutex.ixx create mode 100644 odb/details/win32/thread.cxx create mode 100644 odb/details/win32/thread.hxx create mode 100644 odb/libodb-vc10.vcxproj create mode 100644 odb/libodb-vc10.vcxproj.filters create mode 100644 odb/libodb-vc9.vcproj diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..7a607bc --- /dev/null +++ b/Makefile.am @@ -0,0 +1,12 @@ +# file : Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +SUBDIRS = __path__(dirs) +dist_doc_DATA = __file__(docs) +EXTRA_DIST = __file__(extra_dist) +ACLOCAL_AMFLAGS = -I m4 + +pkgconfigdir = @pkgconfigdir@ +pkgconfig_DATA= libodb.pc diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..ceb2ea7 --- /dev/null +++ b/bootstrap @@ -0,0 +1,18 @@ +#! /bin/sh + +# file : bootstrap +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +# +# Bootstrap the automake build system. +# + +rm -f config.cache + +if test ! -d m4; then + mkdir m4 +fi + +autoreconf --install diff --git a/build/bootstrap.make b/build/bootstrap.make index ff807a3..716390f 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -19,25 +19,33 @@ endif # Aliases # -.PHONY: $(out_base)/ \ - $(out_base)/.test \ - $(out_base)/.install \ +.PHONY: $(out_base)/ \ + $(out_base)/.test \ + $(out_base)/.dist \ $(out_base)/.clean ifdef %interactive% -.PHONY: test install clean +.PHONY: test dist clean -test: $(out_base)/.test -install: $(out_base)/.install -clean: $(out_base)/.clean +test: $(out_base)/.test +dist: $(out_base)/.dist +clean: $(out_base)/.clean -ifneq ($(filter $(.DEFAULT_GOAL),test install clean),) +ifneq ($(filter $(.DEFAULT_GOAL),test dist clean),) .DEFAULT_GOAL := endif endif +# Make sure the distribution prefix is set if the goal is dist. +# +ifneq ($(filter $(MAKECMDGOALS),dist),) +ifeq ($(dist_prefix),) +$(error dist_prefix is not set) +endif +endif + # Don't include dependency info for certain targets. # define include-dep diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..932b47c --- /dev/null +++ b/configure.ac @@ -0,0 +1,113 @@ +# file : configure.ac +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +AC_PREREQ(2.60) +AC_INIT([libodb], [__value__(version)], [odb-users@codesynthesis.com]) +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([odb/version.hxx]) + +AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-bzip2 dist-zip tar-ustar]) + +LT_INIT([win32-dll]) + +AC_CANONICAL_HOST + +# Check for C++ compiler and use it to compile the tests. +# +AC_PROG_CXX +AC_LANG(C++) + +# Check for threads. +# +AC_ARG_ENABLE( + [threads], + AS_HELP_STRING([--disable-threads], [disable threads (enabled by default)]), + [AS_IF([test x"$enableval" = xno], [threads=none], [threads=check])], + [threads=check]) + +# If thread support is not disabled by the user, figure out what we +# can use. +# +AS_IF( + [test x$threads = xcheck], + [ + case $host_os in + windows* | mingw*) + AC_DEFINE([ODB_THREADS_WIN32], [1], [Have Win32 threads.]) + case $host_os in + mingw*) + CXXFLAGS="$CXXFLAGS -mthreads" + ;; + esac + threads=win32 + ;; + *) + ACX_PTHREAD + AS_IF( + [test x$acx_pthread_ok = xyes], + [ + threads=posix + LIBS="$LIBS $PTHREAD_LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + AC_DEFINE([ODB_THREADS_POSIX], [1], [Have POSIX threads.]) + ]) + ;; + esac + ], + [AC_DEFINE([ODB_THREADS_NONE], [1], [Have no threads.])]) + +AM_CONDITIONAL([ODB_THREADS_NONE], [test x"$threads" = xnone]) +AM_CONDITIONAL([ODB_THREADS_WIN32], [test x"$threads" = xwin32]) +AM_CONDITIONAL([ODB_THREADS_POSIX], [test x"$threads" = xposix]) + +# Check if we should disable rpath. +# +AC_MSG_CHECKING([whether to use rpath]) +AC_ARG_ENABLE( + [rpath], + [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])], + [libtool_rpath="$enable_rpath"], + [libtool_rpath="yes"]) +AC_MSG_RESULT($libtool_rpath) + +# Allow the user to specify the pkgconfig directory. +# +AC_ARG_WITH( + [pkgconfigdir], + [AC_HELP_STRING([--with-pkgconfigdir=DIR],[location of pkgconfig dir (default is libdir/pkgconfig)])], + [pkgconfigdir=${withval}], + [pkgconfigdir='${libdir}/pkgconfig']) +AC_SUBST([pkgconfigdir]) + +# Required by subdir-objects. +# +AM_PROG_CC_C_O + +# Patch libtool to not use rpath if requested. +# +AC_CONFIG_COMMANDS( + [libtool-rpath-patch], + [if test "$libtool_use_rpath" = "no"; then + sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/' + mv libtool-2 libtool + chmod 755 libtool + fi], + [libtool_use_rpath=$libtool_rpath]) + +# Output. +# +AC_CONFIG_HEADERS([config.h odb/details/config.h]) +AC_CONFIG_FILES([ + __path__(config_files) +]) +AC_OUTPUT + +AS_IF( + [test x$threads = xcheck], + [ + AC_MSG_NOTICE + AC_MSG_NOTICE([warning: thread support not available, building single-threaded]) + ]) diff --git a/libodb-vc10.sln b/libodb-vc10.sln new file mode 100644 index 0000000..0a9c5dd --- /dev/null +++ b/libodb-vc10.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc10.vcxproj", "{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.Build.0 = Debug|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.ActiveCfg = Debug|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.Build.0 = Debug|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.ActiveCfg = Release|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.Build.0 = Release|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.ActiveCfg = Release|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libodb-vc9.sln b/libodb-vc9.sln new file mode 100644 index 0000000..ff293ae --- /dev/null +++ b/libodb-vc9.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb/libodb-vc9.vcproj", "{513E5721-D318-46B0-8CFB-054042DF87A7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.Build.0 = Debug|Win32 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.ActiveCfg = Debug|x64 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.Build.0 = Debug|x64 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.ActiveCfg = Release|Win32 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.Build.0 = Release|Win32 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.ActiveCfg = Release|x64 + {513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libodb.pc.in b/libodb.pc.in new file mode 100644 index 0000000..a4bcba5 --- /dev/null +++ b/libodb.pc.in @@ -0,0 +1,16 @@ +# file : libodb.pc.in +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libodb +Description: Object persistence compiler for C++, runtime library +URL: http://www.codesynthesis.com/products/odb/ +Version: @VERSION@ +Libs: -L${libdir} -lodb +Cflags: -I${includedir} diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 new file mode 100644 index 0000000..feeb01d --- /dev/null +++ b/m4/acx_pthread.m4 @@ -0,0 +1,254 @@ +dnl +dnl NOTE: This file was modified. See the comments starting with 'CS:' +dnl for more information. In particular, it was changed to use C++ +dnl instead of C. +dnl +dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl @summary figure out how to build C++ programs using POSIX threads +dnl +dnl This macro figures out how to build C++ programs using POSIX threads. +dnl It sets the PTHREAD_LIBS output variable to the threads library and +dnl linker flags, and the PTHREAD_CXXFLAGS output variable to any special +dnl C++ compiler flags that are needed. (The user can also force certain +dnl compiler flags/libs to be tested by setting these environment +dnl variables.) +dnl +dnl Also sets PTHREAD_CXX to any special C++ compiler that is needed for +dnl multi-threaded programs (defaults to the value of CXX otherwise). +dnl (This is necessary on AIX to use the special xlC_r compiler alias.) +dnl +dnl NOTE: You are assumed to not only compile your program with these +dnl flags, but also link it with them as well. e.g. you should link +dnl with $PTHREAD_CXX $CXXFLAGS $PTHREAD_CXXFLAGS $LDFLAGS ... $PTHREAD_LIBS +dnl $LIBS +dnl +dnl If you are only building threads programs, you may wish to use +dnl these variables in your default LIBS, CXXFLAGS, and CXX: +dnl +dnl LIBS="$PTHREAD_LIBS $LIBS" +dnl CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" +dnl CXX="$PTHREAD_CXX" +dnl +dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute +dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to +dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +dnl +dnl ACTION-IF-FOUND is a list of shell commands to run if a threads +dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to +dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the +dnl default action will define HAVE_PTHREAD. +dnl +dnl Please let the authors know if this macro fails on any platform, or +dnl if you have any other suggestions or comments. This macro was based +dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with +dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros +dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. +dnl We are also grateful for the helpful feedback of numerous users. +dnl +dnl @category InstalledPackages +dnl @author Steven G. Johnson +dnl @version 2006-05-29 +dnl @license GPLWithACException + +AC_DEFUN([ACX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_SAVE +AC_LANG(C++) +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CXXFLAGS" != x; then + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CXXFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_MSG_RESULT($acx_pthread_ok) + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CXXFLAGS="" + fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +# CS: On GNU/Linux with gcc both -pthread and -lpthread are valid. +# However, libtool links libraries with -nostdlib which results in +# -pthread being stripped from the linker command line. To resolve +# this we move pthread from after -mthreads to after pthreads. +# +acx_pthread_flags="pthreads pthread none -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CXXFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CXXFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CXXFLAGS="$CXXFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + # + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0);], + [acx_pthread_ok=yes]) + + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CXXFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + +dnl # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. +dnl AC_MSG_CHECKING([for joinable pthread attribute]) +dnl attr_name=unknown +dnl for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do +dnl AC_TRY_LINK([#include ], [int attr=$attr; return attr;], +dnl [attr_name=$attr; break]) +dnl done +dnl AC_MSG_RESULT($attr_name) +dnl if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then +dnl AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, +dnl [Define to necessary symbol if this constant +dnl uses a non-standard name on your system.]) +dnl fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CXXFLAGS="$flag $PTHREAD_CXXFLAGS" + fi + + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + +dnl # More AIX lossage: must compile with xlC_r +dnl if test x"$GXX" != xyes; then +dnl AC_CHECK_PROGS(PTHREAD_CXX, xlC_r, ${CXX}) +dnl else +dnl PTHREAD_CXX=$CXX +dnl fi + +else + PTHREAD_CXX="$CXX" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CXXFLAGS) +AC_SUBST(PTHREAD_CXX) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + acx_pthread_ok=no + $2 +fi +AC_LANG_RESTORE +])dnl ACX_PTHREAD diff --git a/makefile b/makefile index 811738c..c69fe3d 100644 --- a/makefile +++ b/makefile @@ -5,30 +5,33 @@ include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make +dirs := odb + default := $(out_base)/ -test := $(out_base)/.test -install := $(out_base)/.install +dist := $(out_base)/.dist clean := $(out_base)/.clean -# Build. -# -$(default): $(out_base)/odb/ #$(out_base)/tests/ +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) -# Test. -# -$(test): $(out_base)/tests/.test +$(dist): export dirs := $(dirs) +$(dist): export docs := GPLv2 LICENSE README version +$(dist): export docs := GPLv2 LICENSE README version +$(dist): data_dist := libodb-vc9.sln libodb-vc10.sln +$(dist): exec_dist := bootstrap +$(dist): export extra_dist := $(data_dist) $(exec_dist) +$(dist): export version = $(shell cat $(src_root)/version) -# Install. -# -$(install): $(out_base)/odb/.install - $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/libodb/LICENSE) - $(call install-data,$(src_base)/README,$(install_doc_dir)/libodb/README) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) + $(call dist-data,$(docs) $(data_dist) libodb.pc.in) + $(call dist-exec,$(exec_dist)) + $(call dist-dir,m4) + $(call meta-automake) + $(call meta-autoconf) -# Clean. -# -$(clean): $(out_base)/odb/.clean #$(out_base)/tests/.clean +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs))) -$(call include,$(bld_root)/install.make) +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) +$(call include,$(bld_root)/meta/autoconf.make) -$(call import,$(src_base)/odb/makefile) -#$(call import,$(src_base)/tests/makefile) +$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile)) diff --git a/odb/Makefile.am b/odb/Makefile.am new file mode 100644 index 0000000..cfb0af8 --- /dev/null +++ b/odb/Makefile.am @@ -0,0 +1,26 @@ +# file : odb/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +lib_LTLIBRARIES = libodb.la +libodb_la_SOURCES = __path__(sources) + +odbincludedir = $(includedir)/odb +nobase_odbinclude_HEADERS = __path__(headers) +nobase_nodist_odbinclude_HEADERS = details/config.h + +EXTRA_DIST = __file__(extra_dist) + +if ODB_THREADS_POSIX +libodb_la_SOURCES += __path__(posix_sources) +nobase_odbinclude_HEADERS += __path__(posix_headers) +endif + +if ODB_THREADS_WIN32 +libodb_la_SOURCES += __path__(win32_sources) +nobase_odbinclude_HEADERS += __path__(win32_headers) +endif + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +libodb_la_LDFLAGS = -release __value__(interface_version) diff --git a/odb/compilers/vc/pre.hxx b/odb/compilers/vc/pre.hxx index 7f664fd..cdcb527 100644 --- a/odb/compilers/vc/pre.hxx +++ b/odb/compilers/vc/pre.hxx @@ -18,6 +18,7 @@ // #pragma warning (disable:4355) // passing 'this' to a member #pragma warning (disable:4800) // forcing value to bool +#pragma warning (disable:4290) // exception specification ignored //#pragma warning (disable:4275) // non dll-interface base //#pragma warning (disable:4251) // base needs to have dll-interface //#pragma warning (disable:4224) // nonstandard extension (/Za option) diff --git a/odb/core.hxx b/odb/core.hxx index ea0ed05..53aea04 100644 --- a/odb/core.hxx +++ b/odb/core.hxx @@ -6,6 +6,8 @@ #ifndef ODB_CORE_HXX #define ODB_CORE_HXX +#include + #ifdef ODB_COMPILER # define ODB_PRAGMA_IMPL(x) _Pragma (#x) # define ODB_PRAGMA(x) ODB_PRAGMA_IMPL (odb x) @@ -15,4 +17,6 @@ #include +#include + #endif // ODB_CORE_HXX diff --git a/odb/database.hxx b/odb/database.hxx index 1f08daf..ca0cc4c 100644 --- a/odb/database.hxx +++ b/odb/database.hxx @@ -6,16 +6,22 @@ #ifndef ODB_DATABASE_HXX #define ODB_DATABASE_HXX +#include + +#include + #include #include #include #include +#include + namespace odb { class transaction_impl; - class database + class LIBODB_EXPORT database { public: virtual @@ -100,4 +106,6 @@ namespace odb #include #include +#include + #endif // ODB_DATABASE_HXX diff --git a/odb/details/buffer.hxx b/odb/details/buffer.hxx index 4393114..87ee97f 100644 --- a/odb/details/buffer.hxx +++ b/odb/details/buffer.hxx @@ -6,14 +6,18 @@ #ifndef ODB_BUFFER_DETAILS_HXX #define ODB_BUFFER_DETAILS_HXX +#include + #include #include // std::size_t +#include + namespace odb { namespace details { - class buffer + class LIBODB_EXPORT buffer { public: ~buffer () @@ -56,4 +60,6 @@ namespace odb } } +#include + #endif // ODB_BUFFER_DETAILS_HXX diff --git a/odb/details/condition.hxx b/odb/details/condition.hxx index 9e416d6..127d038 100644 --- a/odb/details/condition.hxx +++ b/odb/details/condition.hxx @@ -6,6 +6,44 @@ #ifndef ODB_DETAILS_CONDITION_HXX #define ODB_DETAILS_CONDITION_HXX +#include + +#include +#include + +#ifdef ODB_THREADS_NONE + +namespace odb +{ + namespace details + { + class mutex; + class LIBODB_EXPORT condition + { + public: + condition (mutex&) {} + + void + signal () {} + + void + wait () {} + + private: + condition (const condition&); + condition& operator= (const condition&); + }; + } +} + +#elif defined(ODB_THREADS_POSIX) #include +#elif defined(ODB_THREADS_WIN32) +#include +#else +# error unknown threading model +#endif + +#include #endif // ODB_DETAILS_CONDITION_HXX diff --git a/odb/details/config-vc.h b/odb/details/config-vc.h new file mode 100644 index 0000000..f90ac4d --- /dev/null +++ b/odb/details/config-vc.h @@ -0,0 +1,17 @@ +/* file : odb/details/config-vc.h + * author : Boris Kolpackov + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++. */ + +#ifndef ODB_DETAILS_CONFIG_VC_H +#define ODB_DETAILS_CONFIG_VC_H + +#define ODB_THREADS_WIN32 +#define ODB_THREADS_TLS_DECLSPEC_POINTER +#define ODB_THREADS_TLS_DECLSPEC_OBJECT + + +#endif /* ODB_DETAILS_CONFIG_VC_H */ diff --git a/odb/details/config.h.in b/odb/details/config.h.in new file mode 100644 index 0000000..aa2417d --- /dev/null +++ b/odb/details/config.h.in @@ -0,0 +1,16 @@ +/* file : odb/details/config.h.in + * author : Boris Kolpackov + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_DETAILS_CONFIG_H +#define ODB_DETAILS_CONFIG_H + +#undef ODB_THREADS_NONE +#undef ODB_THREADS_POSIX +#undef ODB_THREADS_WIN32 + +#endif /* ODB_DETAILS_CONFIG_H */ diff --git a/odb/details/config.hxx b/odb/details/config.hxx new file mode 100644 index 0000000..c5b97df --- /dev/null +++ b/odb/details/config.hxx @@ -0,0 +1,23 @@ +// file : odb/details/config.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_CONFIG_HXX +#define ODB_DETAILS_CONFIG_HXX + +// no pre + +#ifdef _MSC_VER +# include +#else +# ifdef HAVE_CONFIG_H +# include +# else +# define ODB_THREADS_POSIX +# endif +#endif + +// no post + +#endif // ODB_DETAILS_CONFIG_HXX diff --git a/odb/details/exception.hxx b/odb/details/exception.hxx index 2da18ac..cebb8ca 100644 --- a/odb/details/exception.hxx +++ b/odb/details/exception.hxx @@ -6,16 +6,22 @@ #ifndef ODB_DETAILS_EXCEPTION_HXX #define ODB_DETAILS_EXCEPTION_HXX +#include + #include +#include + namespace odb { namespace details { - struct exception: odb::exception + struct LIBODB_EXPORT exception: odb::exception { }; } } +#include + #endif // ODB_DETAILS_EXCEPTION_HXX diff --git a/odb/details/export.hxx b/odb/details/export.hxx new file mode 100644 index 0000000..ef43c6c --- /dev/null +++ b/odb/details/export.hxx @@ -0,0 +1,29 @@ +// file : odb/details/export.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_EXPORT_HXX +#define ODB_DETAILS_EXPORT_HXX + +#include + +#include + +#ifdef LIBODB_STATIC_LIB +# define LIBODB_EXPORT +#else +# ifdef _WIN32 +# ifdef LIBODB_DYNAMIC_LIB +# define LIBODB_EXPORT __declspec(dllexport) +# else +# define LIBODB_EXPORT __declspec(dllimport) +# endif +# else +# define LIBODB_EXPORT +# endif +#endif + +#include + +#endif // ODB_DETAILS_EXPORT_HXX diff --git a/odb/details/lock.hxx b/odb/details/lock.hxx index 0ee5a6d..044dfdb 100644 --- a/odb/details/lock.hxx +++ b/odb/details/lock.hxx @@ -6,13 +6,16 @@ #ifndef ODB_DETAILS_LOCK_HXX #define ODB_DETAILS_LOCK_HXX +#include + +#include #include namespace odb { namespace details { - struct lock + struct LIBODB_EXPORT lock { lock (mutex& m) : mutex_ (m), locked_ (true) @@ -43,4 +46,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_LOCK_HXX diff --git a/odb/details/meta/answer.hxx b/odb/details/meta/answer.hxx index 31387a9..f607c71 100644 --- a/odb/details/meta/answer.hxx +++ b/odb/details/meta/answer.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_ANSWER_HXX #define ODB_DETAILS_META_ANSWER_HXX +#include + namespace odb { namespace details @@ -25,4 +27,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_ANSWER_HXX diff --git a/odb/details/meta/class-p.hxx b/odb/details/meta/class-p.hxx index c680d8e..dcbdda2 100644 --- a/odb/details/meta/class-p.hxx +++ b/odb/details/meta/class-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_CLASS_HXX #define ODB_DETAILS_META_CLASS_HXX +#include + #include namespace odb @@ -28,4 +30,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_CLASS_HXX diff --git a/odb/details/meta/polymorphic-p.hxx b/odb/details/meta/polymorphic-p.hxx index 6e95144..f6f122f 100644 --- a/odb/details/meta/polymorphic-p.hxx +++ b/odb/details/meta/polymorphic-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_POLYMORPHIC_HXX #define ODB_DETAILS_META_POLYMORPHIC_HXX +#include + #include #include @@ -51,4 +53,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_POLYMORPHIC_HXX diff --git a/odb/details/meta/remove-c.hxx b/odb/details/meta/remove-c.hxx index 9d8e0b5..6326e2a 100644 --- a/odb/details/meta/remove-c.hxx +++ b/odb/details/meta/remove-c.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_C_HXX #define ODB_DETAILS_META_REMOVE_C_HXX +#include + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_REMOVE_C_HXX diff --git a/odb/details/meta/remove-cv.hxx b/odb/details/meta/remove-cv.hxx index 958fc08..f5982e1 100644 --- a/odb/details/meta/remove-cv.hxx +++ b/odb/details/meta/remove-cv.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_CV_HXX #define ODB_DETAILS_META_REMOVE_CV_HXX +#include + #include #include @@ -24,4 +26,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_REMOVE_CV_HXX diff --git a/odb/details/meta/remove-p.hxx b/odb/details/meta/remove-p.hxx index c8f6d92..b017399 100644 --- a/odb/details/meta/remove-p.hxx +++ b/odb/details/meta/remove-p.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_P_HXX #define ODB_DETAILS_META_REMOVE_P_HXX +#include + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_REMOVE_P_HXX diff --git a/odb/details/meta/remove-v.hxx b/odb/details/meta/remove-v.hxx index c91b7e4..d77e9d2 100644 --- a/odb/details/meta/remove-v.hxx +++ b/odb/details/meta/remove-v.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_META_REMOVE_V_HXX #define ODB_DETAILS_META_REMOVE_V_HXX +#include + namespace odb { namespace details @@ -27,4 +29,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_META_REMOVE_V_HXX diff --git a/odb/details/mutex.hxx b/odb/details/mutex.hxx index e1121b9..b0d59bb 100644 --- a/odb/details/mutex.hxx +++ b/odb/details/mutex.hxx @@ -6,6 +6,43 @@ #ifndef ODB_DETAILS_MUTEX_HXX #define ODB_DETAILS_MUTEX_HXX +#include + +#include +#include + +#ifdef ODB_THREADS_NONE + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT mutex + { + public: + mutex () {} + + void + lock () {} + + void + unlock () {} + + private: + mutex (const mutex&); + mutex& operator= (const mutex&); + }; + } +} + +#elif defined(ODB_THREADS_POSIX) #include +#elif defined(ODB_THREADS_WIN32) +#include +#else +# error unknown threading model +#endif + +#include #endif // ODB_DETAILS_MUTEX_HXX diff --git a/odb/details/posix/condition.hxx b/odb/details/posix/condition.hxx index 8e8e05c..1358db8 100644 --- a/odb/details/posix/condition.hxx +++ b/odb/details/posix/condition.hxx @@ -6,15 +6,18 @@ #ifndef ODB_DETAILS_POSIX_CONDITION_HXX #define ODB_DETAILS_POSIX_CONDITION_HXX +#include + #include +#include #include namespace odb { namespace details { - class condition + class LIBODB_EXPORT condition { public: ~condition (); @@ -39,4 +42,6 @@ namespace odb #include +#include + #endif // ODB_DETAILS_POSIX_CONDITION_HXX diff --git a/odb/details/posix/exceptions.hxx b/odb/details/posix/exceptions.hxx index f4b4572..76f5763 100644 --- a/odb/details/posix/exceptions.hxx +++ b/odb/details/posix/exceptions.hxx @@ -6,13 +6,16 @@ #ifndef ODB_DETAILS_POSIX_EXCEPTIONS_HXX #define ODB_DETAILS_POSIX_EXCEPTIONS_HXX +#include + +#include #include namespace odb { namespace details { - struct posix_exception: details::exception + struct LIBODB_EXPORT posix_exception: details::exception { posix_exception (int code) : code_ (code) {} @@ -28,4 +31,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_POSIX_EXCEPTIONS_HXX diff --git a/odb/details/posix/mutex.hxx b/odb/details/posix/mutex.hxx index d06a8c3..d62fa24 100644 --- a/odb/details/posix/mutex.hxx +++ b/odb/details/posix/mutex.hxx @@ -6,13 +6,17 @@ #ifndef ODB_DETAILS_POSIX_MUTEX_HXX #define ODB_DETAILS_POSIX_MUTEX_HXX +#include + #include +#include + namespace odb { namespace details { - class mutex + class LIBODB_EXPORT mutex { public: ~mutex (); @@ -37,4 +41,6 @@ namespace odb #include +#include + #endif // ODB_DETAILS_POSIX_MUTEX_HXX diff --git a/odb/details/posix/thread.hxx b/odb/details/posix/thread.hxx index 5036b37..f2e2a75 100644 --- a/odb/details/posix/thread.hxx +++ b/odb/details/posix/thread.hxx @@ -6,13 +6,17 @@ #ifndef ODB_DETAILS_POSIX_THREAD_HXX #define ODB_DETAILS_POSIX_THREAD_HXX +#include + #include +#include + namespace odb { namespace details { - class thread + class LIBODB_EXPORT thread { public: ~thread (); @@ -34,4 +38,6 @@ namespace odb #include +#include + #endif // ODB_DETAILS_POSIX_THREAD_HXX diff --git a/odb/details/posix/tls.hxx b/odb/details/posix/tls.hxx index 6e11a64..92b0f4b 100644 --- a/odb/details/posix/tls.hxx +++ b/odb/details/posix/tls.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_POSIX_TLS_HXX #define ODB_DETAILS_POSIX_TLS_HXX +#include + #include namespace odb @@ -69,23 +71,23 @@ namespace odb template inline T& - tls_get (const tls& s) + tls_get (const tls& t) { - return s.get (); + return t.get (); } template inline T* - tls_get (const tls& s) + tls_get (const tls& t) { - return s.get (); + return t.get (); } template inline void - tls_set (tls& s, T* p) + tls_set (tls& t, T* p) { - return s.set (p); + t.set (p); } } } @@ -93,4 +95,6 @@ namespace odb #include #include +#include + #endif // ODB_DETAILS_POSIX_TLS_HXX diff --git a/odb/details/shared-ptr.hxx b/odb/details/shared-ptr.hxx index 6a9a640..dfa620c 100644 --- a/odb/details/shared-ptr.hxx +++ b/odb/details/shared-ptr.hxx @@ -6,6 +6,8 @@ #ifndef ODB_DETAILS_SHARED_PTR_HXX #define ODB_DETAILS_SHARED_PTR_HXX +#include + #include namespace odb @@ -159,4 +161,6 @@ namespace odb } } +#include + #endif // ODB_DETAILS_SHARED_PTR_HXX diff --git a/odb/details/shared-ptr/base.hxx b/odb/details/shared-ptr/base.hxx index 4fbbc0b..309f7d2 100644 --- a/odb/details/shared-ptr/base.hxx +++ b/odb/details/shared-ptr/base.hxx @@ -6,16 +6,20 @@ #ifndef ODB_DETAILS_SHARED_PTR_BASE_HXX #define ODB_DETAILS_SHARED_PTR_BASE_HXX +#include + #include #include // std::size_t #include +#include + namespace odb { namespace details { - struct share + struct LIBODB_EXPORT share { explicit share (char id); @@ -32,23 +36,23 @@ namespace odb } } -void* +LIBODB_EXPORT void* operator new (std::size_t, odb::details::share) throw (std::bad_alloc); -void +LIBODB_EXPORT void operator delete (void*, odb::details::share) throw (); namespace odb { namespace details { - struct not_shared: exception + struct LIBODB_EXPORT not_shared: exception { virtual const char* what () const throw (); }; - struct shared_base + struct LIBODB_EXPORT shared_base { shared_base (); shared_base (const shared_base&); @@ -105,4 +109,6 @@ namespace odb #include #include +#include + #endif // ODB_DETAILS_SHARED_PTR_BASE_HXX diff --git a/odb/details/thread.hxx b/odb/details/thread.hxx index 4dba45e..f3da490 100644 --- a/odb/details/thread.hxx +++ b/odb/details/thread.hxx @@ -6,6 +6,20 @@ #ifndef ODB_DETAILS_THREAD_HXX #define ODB_DETAILS_THREAD_HXX +#include + +#include + +#ifdef ODB_THREADS_NONE +# error no thread support available +#elif defined(ODB_THREADS_POSIX) #include +#elif defined(ODB_THREADS_WIN32) +#include +#else +# error unknown threading model +#endif + +#include #endif // ODB_DETAILS_THREAD_HXX diff --git a/odb/details/tls.hxx b/odb/details/tls.hxx index 6d38e6b..7ce5c19 100644 --- a/odb/details/tls.hxx +++ b/odb/details/tls.hxx @@ -6,9 +6,101 @@ #ifndef ODB_DETAILS_TLS_HXX #define ODB_DETAILS_TLS_HXX -#include +#include -#define ODB_TLS_POINTER(type) tls -#define ODB_TLS_OBJECT(type) tls +#include + +#ifdef ODB_THREADS_NONE + +# define ODB_TLS_POINTER(type) type* +# define ODB_TLS_OBJECT(type) type + +namespace odb +{ + namespace details + { + template + inline T& + tls_get (T& x) + { + return x; + } + + template + inline T* + tls_get (T* p) + { + return p; + } + + template + inline void + tls_set (T*& rp, T* p) + { + rp = p; + } + } +} + +#elif defined(ODB_THREADS_POSIX) + +# include +# define ODB_TLS_POINTER(type) tls +# define ODB_TLS_OBJECT(type) tls + +#elif defined(ODB_THREADS_WIN32) + +# ifdef ODB_THREADS_TLS_DECLSPEC_POINTER +# define ODB_TLS_POINTER(type) __declspec(thread) type* + +namespace odb +{ + namespace details + { + template + inline T* + tls_get (T* p) + { + return p; + } + + template + inline void + tls_set (T*& rp, T* p) + { + rp = p; + } + } +} + +# else +# error unsupported TLS pointer model +# endif + +# ifdef ODB_THREADS_TLS_DECLSPEC_OBJECT +# define ODB_TLS_OBJECT(type) __declspec(thread) type + +namespace odb +{ + namespace details + { + template + inline T& + tls_get (T& x) + { + return x; + } + } +} + +# else +# error unsupported TLS object model +# endif + +#else +# error unknown threading model +#endif + +#include #endif // ODB_DETAILS_TLS_HXX diff --git a/odb/details/win32/condition.cxx b/odb/details/win32/condition.cxx new file mode 100644 index 0000000..93c396b --- /dev/null +++ b/odb/details/win32/condition.cxx @@ -0,0 +1,57 @@ +// file : odb/details/win32/condition.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include + +#include +#include + +namespace odb +{ + namespace details + { + void condition:: + signal () + { + mutex_.lock (); + + if (waiters_ > signals_) + { + if (signals_++ == 0) + { + if (SetEvent (event_) == 0) + throw win32_exception (); + } + } + + mutex_.unlock (); + } + + void condition:: + wait () + { + // When we enter this functions the mutex is locked. When we + // return from this function the mutex must be locked. + // + waiters_++; + mutex_.unlock (); + + if (WaitForSingleObject (event_, INFINITE) != 0) + throw win32_exception (); + + mutex_.lock (); + waiters_--; + signals_--; + + if (signals_ > 0) + { + // Wake up the next thread. + // + if (SetEvent (event_) == 0) + throw win32_exception (); + } + } + } +} diff --git a/odb/details/win32/condition.hxx b/odb/details/win32/condition.hxx new file mode 100644 index 0000000..3c40f3a --- /dev/null +++ b/odb/details/win32/condition.hxx @@ -0,0 +1,52 @@ +// file : odb/details/win32/condition.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_CONDITION_HXX +#define ODB_DETAILS_WIN32_CONDITION_HXX + +#include + +#include + +#include // std::size_t + +#include +#include + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT condition + { + public: + ~condition (); + condition (mutex&); + + void + signal (); + + void + wait (); + + private: + condition (const condition&); + condition& operator= (const condition&); + + private: + mutex& mutex_; + HANDLE event_; + + std::size_t waiters_; + std::size_t signals_; + }; + } +} + +#include + +#include + +#endif // ODB_DETAILS_WIN32_CONDITION_HXX diff --git a/odb/details/win32/condition.ixx b/odb/details/win32/condition.ixx new file mode 100644 index 0000000..4a6bd1d --- /dev/null +++ b/odb/details/win32/condition.ixx @@ -0,0 +1,32 @@ +// file : odb/details/win32/condition.ixx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include + +namespace odb +{ + namespace details + { + inline condition:: + ~condition () + { + CloseHandle (event_); + } + + inline condition:: + condition (mutex& mutex) + : mutex_ (mutex), waiters_ (0), signals_ (0) + { + // Auto-reset event. Releases one waiting thread and automatically + // resets the event state. If no threads are waiting the event + // remains signalled. + // + event_ = CreateEvent (0, false, false, 0); + + if (event_ == 0) + throw win32_exception (); + } + } +} diff --git a/odb/details/win32/exceptions.cxx b/odb/details/win32/exceptions.cxx new file mode 100644 index 0000000..e8652cd --- /dev/null +++ b/odb/details/win32/exceptions.cxx @@ -0,0 +1,18 @@ +// file : odb/details/win32/exceptions.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include + +namespace odb +{ + namespace details + { + const char* win32_exception:: + what () const throw () + { + return "Win32 API error"; + } + } +} diff --git a/odb/details/win32/exceptions.hxx b/odb/details/win32/exceptions.hxx new file mode 100644 index 0000000..b9ccf50 --- /dev/null +++ b/odb/details/win32/exceptions.hxx @@ -0,0 +1,39 @@ +// file : odb/details/win32/exceptions.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_EXCEPTIONS_HXX +#define ODB_DETAILS_WIN32_EXCEPTIONS_HXX + +#include + +#include + +#include +#include + +namespace odb +{ + namespace details + { + struct LIBODB_EXPORT win32_exception: details::exception + { + win32_exception () : code_ (GetLastError ()) {} + win32_exception (DWORD code) : code_ (code) {} + + DWORD + code () const {return code_;} + + virtual const char* + what () const throw (); + + private: + DWORD code_; + }; + } +} + +#include + +#endif // ODB_DETAILS_WIN32_EXCEPTIONS_HXX diff --git a/odb/details/win32/mutex.hxx b/odb/details/win32/mutex.hxx new file mode 100644 index 0000000..9dbe3a8 --- /dev/null +++ b/odb/details/win32/mutex.hxx @@ -0,0 +1,46 @@ +// file : odb/details/win32/mutex.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_MUTEX_HXX +#define ODB_DETAILS_WIN32_MUTEX_HXX + +#include + +#include + +#include + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT mutex + { + public: + ~mutex (); + mutex (); + + void + lock (); + + void + unlock (); + + private: + mutex (const mutex&); + mutex& operator= (const mutex&); + + private: + friend class condition; + CRITICAL_SECTION cs_; + }; + } +} + +#include + +#include + +#endif // ODB_DETAILS_WIN32_MUTEX_HXX diff --git a/odb/details/win32/mutex.ixx b/odb/details/win32/mutex.ixx new file mode 100644 index 0000000..a2b6d37 --- /dev/null +++ b/odb/details/win32/mutex.ixx @@ -0,0 +1,34 @@ +// file : odb/details/win32/mutex.ixx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +namespace odb +{ + namespace details + { + inline mutex:: + ~mutex () + { + DeleteCriticalSection (&cs_); + } + + inline mutex:: + mutex () + { + InitializeCriticalSection (&cs_); + } + + inline void mutex:: + lock () + { + EnterCriticalSection (&cs_); + } + + inline void mutex:: + unlock () + { + LeaveCriticalSection (&cs_); + } + } +} diff --git a/odb/details/win32/thread.cxx b/odb/details/win32/thread.cxx new file mode 100644 index 0000000..610980d --- /dev/null +++ b/odb/details/win32/thread.cxx @@ -0,0 +1,91 @@ +// file : odb/details/win32/thread.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include +#include // _beginthreadex, _endthreadex + +#include // std::auto_ptr + +#include +#include + +unsigned int __stdcall +odb_thread_thunk (void* arg) +{ + odb::details::thread::thread_thunk (arg); + _endthreadex (0); + return 0; +} + +namespace odb +{ + namespace details + { + void thread:: + thread_thunk (void* arg) + { + data* d (static_cast (arg)); + d->ret = d->func (d->arg); + d->mutex.lock (); + unsigned char count = --d->count; + d->mutex.unlock (); + + if (count == 0) + delete d; + } + + thread:: + ~thread () + { + if (handle_ != 0) + { + CloseHandle (handle_); + + // Win32 mutex implementation does not throw. + // + data_->mutex.lock (); + unsigned char count = --data_->count; + data_->mutex.unlock (); + + if (count == 0) + delete data_; + } + } + + thread:: + thread (void* (*func) (void*), void* arg) + { + std::auto_ptr d (new data); + d->func = func; + d->arg = arg; + d->count = 2; // One for the thread and one for us. + + handle_ = (HANDLE)_beginthreadex ( + 0, 0, &odb_thread_thunk, d.get (), 0, 0); + + if (handle_ == 0) + throw win32_exception (); + + data_ = d.release (); + } + + void* thread:: + join () + { + void* r; + + if (WaitForSingleObject (handle_, INFINITE) != 0) + throw win32_exception (); + + r = data_->ret; + + CloseHandle (handle_); + delete data_; + handle_ = 0; + data_ = 0; + return r; + } + } +} diff --git a/odb/details/win32/thread.hxx b/odb/details/win32/thread.hxx new file mode 100644 index 0000000..d52de48 --- /dev/null +++ b/odb/details/win32/thread.hxx @@ -0,0 +1,62 @@ +// file : odb/details/win32/thread.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_DETAILS_WIN32_THREAD_HXX +#define ODB_DETAILS_WIN32_THREAD_HXX + +#include + +#include + +#include +#include + +namespace odb +{ + namespace details + { + class LIBODB_EXPORT thread + { + public: + ~thread (); + thread (void* (*thread_func) (void*), void* arg = 0); + + void* + join (); + + private: + thread (const thread&); + thread& operator= (const thread&); + + private: + typedef void* (*thread_func) (void*); + + struct data + { + thread_func func; + void* arg; + void* ret; + + // Thread-safe reference counter. + // + details::mutex mutex; + unsigned char count; + }; + + + public: + static void + thread_thunk (void*); + + private: + HANDLE handle_; + data* data_; + }; + } +} + +#include + +#endif // ODB_DETAILS_WIN32_THREAD_HXX diff --git a/odb/exception.hxx b/odb/exception.hxx index c8e2f35..0ab188a 100644 --- a/odb/exception.hxx +++ b/odb/exception.hxx @@ -6,11 +6,15 @@ #ifndef ODB_EXCEPTION_HXX #define ODB_EXCEPTION_HXX +#include + #include +#include + namespace odb { - struct exception: std::exception + struct LIBODB_EXPORT exception: std::exception { // By default return the exception type name ( typeid (*this).name () ). // @@ -19,4 +23,6 @@ namespace odb }; } +#include + #endif // ODB_EXCEPTION_HXX diff --git a/odb/exceptions.hxx b/odb/exceptions.hxx index 13603be..ff97873 100644 --- a/odb/exceptions.hxx +++ b/odb/exceptions.hxx @@ -6,37 +6,43 @@ #ifndef ODB_EXCEPTIONS_HXX #define ODB_EXCEPTIONS_HXX +#include + #include +#include + namespace odb { - struct already_in_transaction: odb::exception + struct LIBODB_EXPORT already_in_transaction: odb::exception { }; - struct not_in_transaction: odb::exception + struct LIBODB_EXPORT not_in_transaction: odb::exception { }; - struct transaction_already_finilized: odb::exception + struct LIBODB_EXPORT transaction_already_finilized: odb::exception { }; - struct deadlock: odb::exception + struct LIBODB_EXPORT deadlock: odb::exception { }; - struct object_not_persistent: odb::exception + struct LIBODB_EXPORT object_not_persistent: odb::exception { }; - struct object_already_persistent: odb::exception + struct LIBODB_EXPORT object_already_persistent: odb::exception { }; - struct database_exception: odb::exception + struct LIBODB_EXPORT database_exception: odb::exception { }; } +#include + #endif // ODB_EXCEPTIONS_HXX diff --git a/odb/forward.hxx b/odb/forward.hxx index 695cef6..38b1415 100644 --- a/odb/forward.hxx +++ b/odb/forward.hxx @@ -6,6 +6,8 @@ #ifndef ODB_FORWARD_HXX #define ODB_FORWARD_HXX +#include + namespace odb { class database; @@ -31,4 +33,6 @@ namespace odb }; } +#include + #endif // ODB_FORWARD_HXX diff --git a/odb/libodb-vc10.vcxproj b/odb/libodb-vc10.vcxproj new file mode 100644 index 0000000..5047a56 --- /dev/null +++ b/odb/libodb-vc10.vcxproj @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E} + Win32Proj + libodb + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\bin\ + odb_d-__value__(interface_version)-vc10 + + + true + ..\bin64\ + odb_d-__value__(interface_version)-vc10 + + + false + ..\bin\ + odb-__value__(interface_version)-vc10 + + + false + ..\bin64\ + odb-__value__(interface_version)-vc10 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;%(DisableSpecificWarnings) + + + Windows + true + $(TargetPath) + ..\lib\odb_d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;%(DisableSpecificWarnings) + + + Windows + true + $(TargetPath) + ..\lib64\odb_d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;%(DisableSpecificWarnings) + + + Windows + true + true + true + $(TargetPath) + ..\lib\odb.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;%(DisableSpecificWarnings) + + + Windows + true + true + true + $(TargetPath) + ..\lib64\odb.lib + + + +__header_entries__(headers) +__header_entry__(details\config-vc.h) + + +__source_entries__(sources) +__source_entries__(win32_sources) + + + + + diff --git a/odb/libodb-vc10.vcxproj.filters b/odb/libodb-vc10.vcxproj.filters new file mode 100644 index 0000000..1663f9d --- /dev/null +++ b/odb/libodb-vc10.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cxx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) +__header_filter_entry__(details\config-vc.h) + + +__source_filter_entries__(sources) +__source_filter_entries__(win32_sources) + + diff --git a/odb/libodb-vc9.vcproj b/odb/libodb-vc9.vcproj new file mode 100644 index 0000000..ac970db --- /dev/null +++ b/odb/libodb-vc9.vcproj @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entries__(sources) +__source_entries__(win32_sources) + + +__file_entries__(headers) +__file_entry__(details\config-vc.h) + + + + + diff --git a/odb/makefile b/odb/makefile index 9b6c094..e058463 100644 --- a/odb/makefile +++ b/odb/makefile @@ -5,27 +5,41 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make -cxx_tun := \ -exception.cxx \ -exceptions.cxx \ -database.cxx \ +cxx := \ +exception.cxx \ +exceptions.cxx \ +database.cxx \ transaction.cxx -cxx_tun += details/buffer.cxx details/shared-ptr/base.cxx +# Implementation details. +# +cxx += \ +details/buffer.cxx \ +details/shared-ptr/base.cxx # POSIX-based implementation details. # -cxx_tun += details/posix/exceptions.cxx details/posix/thread.cxx +posix_cxx := \ +details/posix/exceptions.cxx \ +details/posix/thread.cxx + +# Win32-based implementation details. +# +win32_cxx := \ +details/win32/exceptions.cxx \ +details/win32/condition.cxx \ +details/win32/thread.cxx -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) +cxx_tun := $(cxx) $(posix_cxx) +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) +cxx_od := $(cxx_obj:.o=.o.d) odb.l := $(out_base)/odb.l odb.l.cpp-options := $(out_base)/odb.l.cpp-options -default := $(out_base)/ -install := $(out_base)/.install -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean # Build. @@ -33,7 +47,7 @@ clean := $(out_base)/.clean $(odb.l): $(cxx_obj) -lpthread $(cxx_obj) $(cxx_od): $(odb.l.cpp-options) -$(odb.l.cpp-options): value := -I$(src_root) +$(odb.l.cpp-options): value := -I$(out_root) -I$(src_root) $(call include-dep,$(cxx_od)) @@ -42,12 +56,33 @@ $(call include-dep,$(cxx_od)) # $(out_base)/: $(odb.l) -# Install. +# Dist. # -$(install): $(odb.l) - $(call install-lib,$<,$(install_lib_dir)/$(ld_lib_prefix)odb$(ld_lib_suffix)) - $(call install-dir,$(src_base),$(install_inc_dir)/odb,\ -'(' -name '*.hxx' -o -name '*.ixx' -o -name '*.txx' ')') +$(dist): export sources := $(cxx) +$(dist): export posix_sources := $(posix_cxx) +$(dist): export win32_sources := $(win32_cxx) + +$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ +-path $(src_base)/details/posix -a -prune -a -false -o \ +-path $(src_base)/details/win32 -a -prune -a -false -o \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export posix_headers = $(subst $(src_base)/,,$(shell find \ +$(src_base)/details/posix -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export win32_headers = $(subst $(src_base)/,,$(shell find \ +$(src_base)/details/win32 -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) + +$(dist): data_dist := details/config-vc.h +$(dist): export extra_dist := $(data_dist) libodb-vc9.vcproj \ +libodb-vc10.vcxproj libodb-vc10.vcxproj.filters +$(dist): export interface_version = $(shell sed -e \ +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) + +$(dist): + $(call dist-data,$(sources) $(posix_sources) $(win32_sources) \ +$(headers) $(posix_headers) $(win32_headers) $(data_dist) details/config.h.in) + $(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj) + $(call meta-automake) # Clean. # @@ -59,6 +94,11 @@ $(clean): $(odb.l).o.clean \ # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(bld_root)/cxx/o-l.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/odb/pointer-traits.hxx b/odb/pointer-traits.hxx index 23ec1f8..18162e4 100644 --- a/odb/pointer-traits.hxx +++ b/odb/pointer-traits.hxx @@ -6,6 +6,8 @@ #ifndef ODB_POINTER_TRAITS_HXX #define ODB_POINTER_TRAITS_HXX +#include + #include // operators new/delete #include // std::size_t @@ -157,4 +159,6 @@ namespace odb }; } +#include + #endif // ODB_POINTER_TRAITS_HXX diff --git a/odb/query.hxx b/odb/query.hxx index 56af84b..6c2de0d 100644 --- a/odb/query.hxx +++ b/odb/query.hxx @@ -6,6 +6,8 @@ #ifndef ODB_QUERY_HXX #define ODB_QUERY_HXX +#include + #include namespace odb @@ -15,4 +17,6 @@ namespace odb class query; } +#include + #endif // ODB_QUERY_HXX diff --git a/odb/result.hxx b/odb/result.hxx index 58dd9cb..7501326 100644 --- a/odb/result.hxx +++ b/odb/result.hxx @@ -6,6 +6,8 @@ #ifndef ODB_RESULT_HXX #define ODB_RESULT_HXX +#include + #include // std::ptrdiff_t, std::size_t #include // iterator categories @@ -234,4 +236,6 @@ namespace odb #include +#include + #endif // ODB_RESULT_HXX diff --git a/odb/traits.hxx b/odb/traits.hxx index 5e500bf..bfdcf71 100644 --- a/odb/traits.hxx +++ b/odb/traits.hxx @@ -6,6 +6,8 @@ #ifndef ODB_TRAITS_HXX #define ODB_TRAITS_HXX +#include + #include #include @@ -83,4 +85,6 @@ namespace odb }; } +#include + #endif // ODB_TRAITS_HXX diff --git a/odb/transaction.hxx b/odb/transaction.hxx index 43526d0..71d17eb 100644 --- a/odb/transaction.hxx +++ b/odb/transaction.hxx @@ -6,13 +6,17 @@ #ifndef ODB_TRANSACTION_HXX #define ODB_TRANSACTION_HXX +#include + #include +#include + namespace odb { class transaction_impl; - class transaction + class LIBODB_EXPORT transaction { public: typedef odb::database database_type; @@ -62,7 +66,7 @@ namespace odb transaction_impl* impl_; }; - class transaction_impl + class LIBODB_EXPORT transaction_impl { protected: friend class transaction; @@ -96,4 +100,6 @@ namespace odb #include +#include + #endif // ODB_TRANSACTION_HXX diff --git a/odb/version.hxx b/odb/version.hxx index 7bc1928..e0f9833 100644 --- a/odb/version.hxx +++ b/odb/version.hxx @@ -6,6 +6,8 @@ #ifndef ODB_VERSION_HXX #define ODB_VERSION_HXX +#include + // Version format is AABBCCDD where // // AA - major version number @@ -33,4 +35,6 @@ #define LIBODB_VERSION 999901 #define LIBODB_VERSION_STR "1.0.0.a1" +#include + #endif // ODB_VERSION_HXX -- cgit v1.1