diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..292c981 --- /dev/null +++ b/bootstrap @@ -0,0 +1,75 @@ +#!/bin/sh +# Run this to bootstrap the files + +PACKAGE=dbus-c++ + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +# check if configure.ac is there +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level package directory" + exit 1 +} + +# check for autoconf +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`autoconf' installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +# check for libtool +(libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +# check for automake +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`automake' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing \`aclocal'. The version of \`automake'" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +echo "Running libtoolize..." +libtoolize --force --copy + +aclocalinclude="$ACLOCAL_FLAGS -I config" +echo "Running aclocal $aclocalinclude ..." +aclocal $aclocalinclude + +echo "Running autoheader..." +autoheader + +echo "Running automake..." +automake --add-missing --foreign $am_opt + +echo "Running autoconf ..." +autoconf + +echo "You could now exec ./configure --help to see available options" + diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4 new file mode 100644 index 0000000..eb09f5a --- /dev/null +++ b/config/acx_pthread.m4 @@ -0,0 +1,275 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/acx_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. e.g. you should link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threads programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. +# +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Steven G. Johnson +# +# 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 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Macro Archive. When you make and +# distribute a modified version of the Autoconf Macro, you may extend this +# special exception to the GPL to apply to your modified version as well. + +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_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + 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_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +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. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --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_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`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_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # 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" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_TRY_LINK([#include ], [int attr=$attr; return attr;], + [attr_name=$attr; break]) + done + AC_MSG_RESULT($attr_name) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + 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_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_CC) + +# 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/config/ax_config_header.m4 b/config/ax_config_header.m4 new file mode 100644 index 0000000..39c6e16 --- /dev/null +++ b/config/ax_config_header.m4 @@ -0,0 +1,63 @@ +dnl AX_CONFIG_PRIVATE_HEADER(OUTPUT_HEADER_FILE[,LIBRARY_NAME[,INCLUDE_DEFINE]]) +dnl +dnl Parameter 1: Output file for private config header (Default: config-private.h) +dnl Parameter 2: Library name +dnl Parameter 3: define for header include (Default: HAVE_capitalize(Library name)_CONFIG_H +dnl needs to be redefined if library name containes a char that isn't allowed in #define +dnl +AC_DEFUN([AX_CONFIG_PRIVATE_HEADER], +[ + +if test x$# = x0; then + dnl define a fallback output if nothing given + CONFIG_HEADER="config-private.h" +else + CONFIG_HEADER=$1 +fi + +CF_NAME=`basename $1` +DATE=`date` + +dnl Create new file or empty it +echo "/* File: $CF_NAME generated on $DATE */" > $CONFIG_HEADER + +if test x$# = x2; then + echo "" >> $CONFIG_HEADER + echo "/* Build configuration for $2 */" >> $CONFIG_HEADER +fi + +echo "" >> $CONFIG_HEADER + +if test x$# = x3; then + PRIVATE_CFLAGS="-D$3" +else + PRIVATE_CFLAGS="-DHAVE_$2_CONFIG_H" +fi + +AC_SUBST(PRIVATE_CFLAGS) + +])dnl + +dnl AX_DEFINE_PRIVATE(DEFINE_NAME[,DEFINE_VALUE[,DEFINE_COMENT]]) +dnl +dnl Parameter 1: Define name +dnl Parameter 2: Define value (optional) +dnl Parameter 3: Define coment (optional) +dnl +AC_DEFUN([AX_DEFINE_PRIVATE], +[ + +if test x$# = x1; then + echo "#define $1" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +elif test x$# = x2; then + echo "#define $1 $2" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +elif test x$# = x3; then + echo "/* $3 */" >> $CONFIG_HEADER + echo "#define $1 $2" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +fi + +])dnl + diff --git a/config/ax_config_header.m4~ b/config/ax_config_header.m4~ new file mode 100644 index 0000000..ab7d050 --- /dev/null +++ b/config/ax_config_header.m4~ @@ -0,0 +1,63 @@ +dnl AX_CONFIG_PRIVATE_HEADER +dnl +dnl Parameter 1: Output file for private config header (Default: config-private.h) +dnl Parameter 2: Library name +dnl Parameter 3: define for header include (Default: HAVE_capitalize(Library name)_CONFIG_H +dnl needs to be redefined if library name containes a char that isn't allowed in #define +dnl +AC_DEFUN([AX_CONFIG_PRIVATE_HEADER], +[ + +if test x$# = x0; then + dnl define a fallback output if nothing given + CONFIG_HEADER="config-private.h" +else + CONFIG_HEADER=$1 +fi + +CF_NAME=`basename $1` +DATE=`date` + +dnl Create new file or empty it +echo "/* File: $CF_NAME generated on $DATE */" > $CONFIG_HEADER + +if test x$# = x2; then + echo "" >> $CONFIG_HEADER + echo "/* Build configuration for $2 */" >> $CONFIG_HEADER +fi + +echo "" >> $CONFIG_HEADER + +if test x$# = x3; then + PRIVATE_CFLAGS="-D$3" +else + PRIVATE_CFLAGS="-DHAVE_$2_CONFIG_H" +fi + +AC_SUBST(PRIVATE_CFLAGS) + +])dnl + +dnl AX_DEFINE_PRIVATE +dnl +dnl +dnl +dnl +dnl +AC_DEFUN([AX_DEFINE_PRIVATE], +[ + +if test x$# = x1; then + echo "#define $1" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +elif test x$# = x2; then + echo "#define $1 $2" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +elif test x$# = x3; then + echo "/* $3 */" >> $CONFIG_HEADER + echo "#define $1 $2" >> $CONFIG_HEADER + echo "" >> $CONFIG_HEADER +fi + +])dnl + diff --git a/dbus-c++-1-uninstalled.pc.in b/dbus-c++-1-uninstalled.pc.in new file mode 100644 index 0000000..839fa86 --- /dev/null +++ b/dbus-c++-1-uninstalled.pc.in @@ -0,0 +1,13 @@ +prefix= +exec_prefix= +libdir=src +includedir=include + +Name: @PACKAGE@ +Description: Native C++ bindings for D-Bus, Not Installed +Version: @VERSION@ +Requires: +Conflicts: +Libs: ${pcfiledir}/${libdir}/libdbus-c++-1.la +Cflags: -I${pcfiledir}/${includedir} + diff --git a/dbus-c++.anjuta b/dbus-c++.anjuta new file mode 100644 index 0000000..51ddd65 --- /dev/null +++ b/dbus-c++.anjuta @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/include/dbus-c++/Ecore_Dispatcher.h b/include/dbus-c++/Ecore_Dispatcher.h new file mode 100644 index 0000000..332dc4e --- /dev/null +++ b/include/dbus-c++/Ecore_Dispatcher.h @@ -0,0 +1,49 @@ +#ifndef ECORE_DISPATCHER_H +#define ECORE_DISPATCHER_H + +#include +#include +#include +#include +#include +#include + +#ifdef _WIN32 + +# include + +# define e_write(fd, buffer, count) \ + send((fd), (char *)(buffer), count, 0) + +# define e_read(fd, buffer, count) \ + recv((fd), (char *)(buffer), count, 0) + +#else + +# include +# include + +# define e_write(fd, buffer, count) \ + write((fd), (buffer), count) + +# define e_read(fd, buffer, count) \ + read((fd), (buffer), count) + +#endif /* _WIN32 */ + +struct _Ecore_Dispatcher +{ + int m_fd_read; + int m_fd_write; + size_t m_count; + void (*m_update_func) (void*/*, size_t*/); +}; + +typedef struct _Ecore_Dispatcher Ecore_Dispatcher; + +void ecore_dispatcher_init (Ecore_Dispatcher *dp, void (update) (void*/*, size_t*/)); +void ecore_dispatcher_signal (Ecore_Dispatcher *dp, void *data, size_t count); +void ecore_dispatcher_close (Ecore_Dispatcher *dp); + +#endif // ECORE_DISPATCHER_H + diff --git a/src/Ecore_Dispatcher.cpp b/src/Ecore_Dispatcher.cpp new file mode 100644 index 0000000..35d5523 --- /dev/null +++ b/src/Ecore_Dispatcher.cpp @@ -0,0 +1,76 @@ +#include "../include/dbus-c++/Ecore_Dispatcher.h" + +#include +#include // TODO: port and protect for other systems + +// TODO: add deinit method to close handler + +#define BUFFER_GLOBAL_SIZE PIPE_BUF // defined in linux/limits.h + +int ecore_dispatcher_async_handler (void *data, Ecore_Fd_Handler *fdh) +{ + int fd; + Ecore_Dispatcher *dp_local = (Ecore_Dispatcher*) data; + char buf[dp_local->m_count]; + + fd = ecore_main_fd_handler_fd_get(fdh); + + int recBytes = 0; + + recBytes = e_read (fd, buf, dp_local->m_count); + + if (recBytes <= 0) + { + fprintf (stderr, "Error while reading pipe!\n"); + exit (1); + } + + assert (recBytes == (signed) dp_local->m_count); + + dp_local->m_update_func (buf/*, recBytes*/); + + return 1; +} + +void ecore_dispatcher_init (Ecore_Dispatcher *dp, void (update) (void*/*, size_t*/)) +{ + int fd[2]; + Ecore_Fd_Handler *fd_handler; + + dp->m_update_func = update; + + /* Create the file descriptors */ + if (pipe(fd) == 0) + { + dp->m_fd_read = fd[0]; + dp->m_fd_write = fd[1]; + + fcntl(dp->m_fd_read, F_SETFL, O_NONBLOCK); + fd_handler = ecore_main_fd_handler_add (dp->m_fd_read, + ECORE_FD_READ, + ecore_dispatcher_async_handler, + dp, + NULL, NULL); + + ecore_main_fd_handler_active_set(fd_handler, ECORE_FD_READ); + } + else + { + fprintf (stderr, "pipe() failed\n"); + exit (1); + } +} + +void ecore_dispatcher_close (Ecore_Dispatcher *dp) +{ + close (dp->m_fd_read); + close (dp->m_fd_write); +} + +void ecore_dispatcher_signal (Ecore_Dispatcher *dp, void *data, size_t count) +{ + dp->m_count = count; + + e_write (dp->m_fd_write, data, count); +} +