diff --git a/configure.ac b/configure.ac index f3130f8a48..4168b02bee 100644 --- a/configure.ac +++ b/configure.ac @@ -536,11 +536,8 @@ AC_SUBST([EINA_CONFIGURE_ENABLE_LOG]) EFL_CHECK_THREADS -if ! test "x${efl_have_threads}" = "xno" ; then - EINA_CONFIGURE_HAVE_THREADS="#define EINA_HAVE_THREADS" -fi +EINA_CONFIGURE_HAVE_THREADS="#define EINA_HAVE_THREADS" AC_SUBST(EINA_CONFIGURE_HAVE_THREADS) -AM_CONDITIONAL([EINA_HAVE_THREADS], [! test "x${efl_have_threads}" = "xno"]) if test "x${efl_have_debug_threads}" = "xyes"; then EINA_CONFIGURE_HAVE_DEBUG_THREADS="#define EINA_HAVE_DEBUG_THREADS" diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4 index ae296069d8..e3dafa0a06 100644 --- a/m4/efl_threads.m4 +++ b/m4/efl_threads.m4 @@ -145,5 +145,8 @@ if test "x${_efl_have_posix_threads}" = "xyes" && test "x${_efl_enable_debug_thr AC_DEFINE([EFL_DEBUG_THREADS], [1], [Assert when forgot to call eina_threads_init]) fi -AS_IF([test "x$_efl_have_posix_threads" = "xyes" || test "x$_efl_have_win32_threads" = "xyes"], [$1], [$2]) +AS_IF([test "x$_efl_have_posix_threads" = "xyes" || test "x$_efl_have_win32_threads" = "xyes"], + [$1], + [m4_if([$2], [$2], [AC_MSG_ERROR([Threads are required.])])]) + ]) diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am index 0797f89d72..c3eb252f50 100644 --- a/src/lib/eina/Makefile.am +++ b/src/lib/eina/Makefile.am @@ -87,7 +87,6 @@ eina_inline_value.x # eina_model.h # eina_object.h -if EINA_HAVE_THREADS if HAVE_WINCE EINAHEADERS += eina_inline_lock_wince.x else @@ -97,9 +96,6 @@ else EINAHEADERS += eina_inline_lock_posix.x endif endif -else -EINAHEADERS += eina_inline_lock_void.x -endif installed_mainheaderdir = $(includedir)/eina-@VMAJ@ dist_installed_mainheader_DATA = Eina.h eina_config.h diff --git a/src/lib/eina/eina_inline_lock_void.x b/src/lib/eina/eina_inline_lock_void.x deleted file mode 100644 index 1d1b5d4647..0000000000 --- a/src/lib/eina/eina_inline_lock_void.x +++ /dev/null @@ -1,264 +0,0 @@ -/* EINA - EFL data type library - * Copyright (C) 2011 Vincent Torri - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; - * if not, see . - */ - -#ifndef EINA_INLINE_LOCK_VOID_X_ -#define EINA_INLINE_LOCK_VOID_X_ - -/** - * @addtogroup Eina_Lock_Group Lock - * - * @brief These functions provide Mutual Exclusion objects management. - * - * @note On Windows XP, critical sections are used, while on Windows - * CE, standard Mutex objects are used. - * - * @{ - */ - -/** - * @typedef Eina_Lock - * Abtract type for a mutual exclusive object. - */ -typedef void *Eina_Lock; -typedef void *Eina_RWLock; -typedef void *Eina_Condition; -typedef void *Eina_TLS; -typedef void *Eina_Semaphore; - -/** - * @brief Create a new #Eina_Lock. - * - * @param mutex A pointer to the lock object. - * @return #EINA_TRUE on success, #EINA_FALSE otherwise. - * - * This function creates a new #Eina_Lock object and stores it in the - * @p mutex buffer. On success, this function returns #EINA_TRUE - * and #EINA_FALSE otherwise. To free the resources allocated by this - * function, use eina_lock_free(). For performance reasons, no check - * is done on @p mutex. - */ -static inline Eina_Bool -eina_lock_new(Eina_Lock *mutex EINA_UNUSED) -{ - return EINA_TRUE; -} - -/** - * @brief Free the ressources of the given lock object. - * - * @param mutex The lock object to free. - * - * This function frees the resources of @p mutex allocated by - * eina_lock_new(). For performance reasons, no check is done on - * @p mutex. - */ -static inline void -eina_lock_free(Eina_Lock *mutex EINA_UNUSED) -{ -} - -/** - * @brief Lock the given mutual exclusion object. - * - * @param mutex The lock object to lock. - * @return #EINA_TRUE on success, #EINA_FALSE otherwise. - * - * This function locks @p mutex. @p mutex must have been created by - * eina_lock_new(). On success, this function returns #EINA_TRUE - * and #EINA_FALSE otherwise. For performance reasons, no check is done on - * @p mutex. - */ -static inline Eina_Lock_Result -eina_lock_take(Eina_Lock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -/** - * @brief Try to lock the given mutual exclusion object. - * - * @param mutex The lock object to try to lock. - * @return #EINA_TRUE on success, #EINA_FALSE otherwise. - * - * This function tries to lock @p mutex. @p mutex must have been created by - * eina_lock_new(). If @p mutex can be locked, this function returns #EINA_TRUE; - * if @p mutex can not be locked, or is already locked, it - * returns #EINA_FALSE. This function does not block and returns - * immediately. For performance reasons, no check is done on - * @p mutex. - * - * @note On Windows CE, this function is actually eina_lock_take(). - */ -static inline Eina_Lock_Result -eina_lock_take_try(Eina_Lock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -/** - * @brief Unlock the given mutual exclusion object. - * - * @param mutex The lock object to unlock. - * @return #EINA_TRUE on success, #EINA_FALSE otherwise. - * - * This function unlocks @p mutex. @p mutex must have been created by - * eina_lock_new(). On success, this function returns #EINA_TRUE - * and #EINA_FALSE otherwise. For performance reasons, no check is - * done on @p mutex. - */ -static inline Eina_Lock_Result -eina_lock_release(Eina_Lock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline void -eina_lock_debug(const Eina_Lock *mutex EINA_UNUSED) -{ -} - -static inline Eina_Bool -eina_condition_new(Eina_Condition *cond EINA_UNUSED, Eina_Lock *mutex EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline void -eina_condition_free(Eina_Condition *cond EINA_UNUSED) -{ -} - -static inline Eina_Bool -eina_condition_wait(Eina_Condition *cond EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_condition_timedwait(Eina_Condition *cond EINA_UNUSED, double val EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_condition_broadcast(Eina_Condition *cond EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_condition_signal(Eina_Condition *cond EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_rwlock_new(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline void -eina_rwlock_free(Eina_RWLock *mutex EINA_UNUSED) -{ -} - -static inline Eina_Lock_Result -eina_rwlock_read_take(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline Eina_Lock_Result -eina_rwlock_write_take(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline Eina_Lock_Result -eina_rwlock_release(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline Eina_Lock_Result -eina_rwlock_take_read(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline Eina_Lock_Result -eina_rwlock_take_write(Eina_RWLock *mutex EINA_UNUSED) -{ - return EINA_LOCK_SUCCEED; -} - -static inline Eina_Bool -eina_tls_new(Eina_TLS *key EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline void -eina_tls_free(Eina_TLS key EINA_UNUSED) -{ -} - -static inline void * -eina_tls_get(Eina_TLS key EINA_UNUSED) -{ - return NULL; -} - -static inline Eina_Bool -eina_tls_set(Eina_TLS key EINA_UNUSED, const void *data EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_semaphore_new(Eina_Semaphore *sem EINA_UNUSED, - int count_init EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_semaphore_free(Eina_Semaphore *sem EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_semaphore_lock(Eina_Semaphore *sem EINA_UNUSED) -{ - return EINA_TRUE; -} - -static inline Eina_Bool -eina_semaphore_release(Eina_Semaphore *sem EINA_UNUSED, - int count_release EINA_UNUSED) -{ - return EINA_TRUE; -} - -/** - * @} - */ - -#endif diff --git a/src/lib/eina/eina_lock.h b/src/lib/eina/eina_lock.h index f438586a54..5260ed9c4b 100644 --- a/src/lib/eina/eina_lock.h +++ b/src/lib/eina/eina_lock.h @@ -42,16 +42,12 @@ typedef enum EINA_LOCK_DEADLOCK } Eina_Lock_Result; -#ifdef EINA_HAVE_THREADS -# ifdef _WIN32_WCE -# include "eina_inline_lock_wince.x" -# elif defined(_WIN32) -# include "eina_inline_lock_win32.x" -# else -# include "eina_inline_lock_posix.x" -# endif +#ifdef _WIN32_WCE +# include "eina_inline_lock_wince.x" +#elif defined(_WIN32) +# include "eina_inline_lock_win32.x" #else -# include "eina_inline_lock_void.x" +# include "eina_inline_lock_posix.x" #endif EAPI extern Eina_Error EINA_ERROR_NOT_MAIN_LOOP;