On Fri, Feb 24, 2012 at 12:20 PM, Enlightenment SVN
<[email protected]> wrote:
> Log:
> ecore: add Exotic support.
>
>
> Author: cedric
> Date: 2012-02-24 03:20:25 -0800 (Fri, 24 Feb 2012)
> New Revision: 68402
> Trac: http://trac.enlightenment.org/e/changeset/68402
>
> Added:
> trunk/ecore/m4/efl_gettimeofday.m4
> Modified:
> trunk/ecore/configure.ac trunk/ecore/src/lib/ecore/Ecore.h
> trunk/ecore/src/lib/ecore/Makefile.am trunk/ecore/src/lib/ecore/ecore.c
> trunk/ecore/src/lib/ecore/ecore_getopt.c
> trunk/ecore/src/lib/ecore/ecore_main.c trunk/ecore/src/lib/ecore/ecore_pipe.c
> trunk/ecore/src/lib/ecore/ecore_private.h
> trunk/ecore/src/lib/ecore/ecore_time.c
>
> Modified: trunk/ecore/configure.ac
> ===================================================================
> --- trunk/ecore/configure.ac 2012-02-24 11:20:18 UTC (rev 68401)
> +++ trunk/ecore/configure.ac 2012-02-24 11:20:25 UTC (rev 68402)
> @@ -473,6 +473,21 @@
> ;;
> esac
>
> +
> +### Checks for portability layer
> +
> +PKG_CHECK_MODULES([EXOTIC],
> + [exotic],
> + [enable_exotic="yes"],
> + [enable_exotic="no"])
> +
> +if test "x${enable_exotic}" = "xyes"; then
> + requirement_exotic="exotic ${requirement_exotic}"
> +
> + AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.])
> +fi
> +AM_CONDITIONAL([ECORE_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
> +
> AC_SUBST(EFL_ECORE_BUILD)
> AC_SUBST(EFL_ECORE_CON_BUILD)
> AC_SUBST(EFL_ECORE_EVAS_BUILD)
>
> Modified: trunk/ecore/src/lib/ecore/Ecore.h
> ===================================================================
> --- trunk/ecore/src/lib/ecore/Ecore.h 2012-02-24 11:20:18 UTC (rev 68401)
> +++ trunk/ecore/src/lib/ecore/Ecore.h 2012-02-24 11:20:25 UTC (rev 68402)
> @@ -320,7 +320,9 @@
> # include <signal.h>
> #else
> # include <sys/time.h>
> -# include <signal.h>
> +# if !defined (EXOTIC_NO_SIGNAL)
wtf is this ????
Vincent
> +# include <signal.h>
> +# endif
> #endif
>
> #include <sys/types.h>
> @@ -592,7 +594,7 @@
> int number; /**< The signal number. Either 1 or 2 */
> void *ext_data; /**< Extension data - not used */
>
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
> @@ -601,7 +603,7 @@
> {
> void *ext_data; /**< Extension data - not used */
>
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
> @@ -613,7 +615,7 @@
> Eina_Bool terminate : 1; /**< Set if the exit request was a terminate
> singal */
> void *ext_data; /**< Extension data - not used */
>
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
> @@ -622,7 +624,7 @@
> {
> void *ext_data; /**< Extension data - not used */
>
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
> @@ -631,7 +633,7 @@
> {
> int num; /**< The realtime signal's number */
>
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
> @@ -725,7 +727,7 @@
> Eina_Bool exited : 1; /** < set to 1 if the process exited of its own
> accord */
> Eina_Bool signalled : 1; /** < set to 1 id the process exited due to
> uncaught signal */
> void *ext_data; /**< Extension data - not used */
> -#if !defined (_WIN32) && !defined (__lv2ppu__)
> +#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
> siginfo_t data; /**< Signal info */
> #endif
> };
>
> Modified: trunk/ecore/src/lib/ecore/Makefile.am
> ===================================================================
> --- trunk/ecore/src/lib/ecore/Makefile.am 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/Makefile.am 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -47,6 +47,12 @@
>
> else
>
> +if ECORE_HAVE_EXOTIC
> +
> +libecore_la_SOURCES +=
> +
> +else
> +
> libecore_la_SOURCES += ecore_signal.c ecore_exe.c
>
> endif
> @@ -55,6 +61,8 @@
>
> endif
>
> +endif
> +
> libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@
> @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
> libecore_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info
> @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
>
>
> Modified: trunk/ecore/src/lib/ecore/ecore.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore.c 2012-02-24 11:20:18 UTC (rev 68401)
> +++ trunk/ecore/src/lib/ecore/ecore.c 2012-02-24 11:20:25 UTC (rev 68402)
> @@ -163,8 +163,10 @@
> if (!ecore_mempool_init()) goto shutdown_mempool;
> _ecore_main_loop_init();
> _ecore_signal_init();
> +#ifndef HAVE_EXOTIC
> + _ecore_exe_init();
> +#endif
> _ecore_thread_init();
> - _ecore_exe_init();
> _ecore_glib_init();
> _ecore_job_init();
> _ecore_time_init();
> @@ -252,7 +254,9 @@
> _ecore_glib_shutdown();
> _ecore_job_shutdown();
> _ecore_thread_shutdown();
> +#ifndef HAVE_EXOTIC
> _ecore_exe_shutdown();
> +#endif
> _ecore_idle_enterer_shutdown();
> _ecore_idle_exiter_shutdown();
> _ecore_idler_shutdown();
>
> Modified: trunk/ecore/src/lib/ecore/ecore_getopt.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_getopt.c 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/ecore_getopt.c 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -38,6 +38,10 @@
> # include <Evil.h>
> #endif
>
> +#ifdef HAVE_EXOTIC
> +# include <Exotic.h>
> +#endif
> +
> #include "Ecore.h"
> #include "Ecore_Getopt.h"
>
>
> Modified: trunk/ecore/src/lib/ecore/ecore_main.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_main.c 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/ecore_main.c 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -229,10 +229,14 @@
> #ifdef _WIN32
> Ecore_Select_Function main_loop_select = _ecore_main_win32_select;
> #else
> -# ifdef HAVE_SYS_SELECT_H
> -# include <sys/select.h>
> +# if !defined EXOTIC_NO_SELECT
> +# ifdef HAVE_SYS_SELECT_H
> +# include <sys/select.h>
> +# endif
> +Ecore_Select_Function main_loop_select = select;
> +# else
> +Ecore_Select_Function main_loop_select = NULL;
> # endif
> -Ecore_Select_Function main_loop_select = select;
> #endif
>
> #ifndef USE_G_MAIN_LOOP
>
> Modified: trunk/ecore/src/lib/ecore/ecore_pipe.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_pipe.c 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/ecore_pipe.c 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -74,6 +74,9 @@
>
> #endif /* ! _WIN32 */
>
> +#include <Ecore.h>
> +#include "ecore_private.h"
> +
> struct _Ecore_Pipe
> {
> ECORE_MAGIC;
>
> Modified: trunk/ecore/src/lib/ecore/ecore_private.h
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_private.h 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/ecore_private.h 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -174,7 +174,7 @@
>
> void _ecore_main_shutdown(void);
>
> -#if defined (_WIN32) || defined (__lv2ppu__)
> +#if defined (_WIN32) || defined (__lv2ppu__) || defined (HAVE_EXOTIC)
> static inline void _ecore_signal_shutdown(void) { }
>
> static inline void _ecore_signal_init(void) { }
>
> Modified: trunk/ecore/src/lib/ecore/ecore_time.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore/ecore_time.c 2012-02-24 11:20:18 UTC (rev
> 68401)
> +++ trunk/ecore/src/lib/ecore/ecore_time.c 2012-02-24 11:20:25 UTC (rev
> 68402)
> @@ -21,7 +21,7 @@
>
> #include <time.h>
>
> -#ifdef HAVE_CLOCK_GETTIME
> +#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
> static clockid_t _ecore_time_clock_id = -1;
> #elif defined(__APPLE__) && defined(__MACH__)
> static double _ecore_time_clock_conversion = 1e-9;
> @@ -52,7 +52,7 @@
> EAPI double
> ecore_time_get(void)
> {
> -#ifdef HAVE_CLOCK_GETTIME
> +#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
> struct timespec t;
>
> if (EINA_UNLIKELY(_ecore_time_clock_id < 0))
> @@ -86,7 +86,7 @@
> EAPI double
> ecore_time_unix_get(void)
> {
> -#ifdef HAVE_GETTIMEOFDAY
> +#ifdef EFL_HAVE_GETTIMEOFDAY
> struct timeval timev;
>
> gettimeofday(&timev, NULL);
> @@ -136,7 +136,7 @@
> void
> _ecore_time_init(void)
> {
> -#ifdef HAVE_CLOCK_GETTIME
> +#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
> struct timespec t;
>
> if (_ecore_time_clock_id != -1) return;
>
>
> ------------------------------------------------------------------------------
> Virtualization & Cloud Management Using Capacity Planning
> Cloud computing makes use of virtualization - but cloud computing
> also focuses on allowing computing to be delivered as a service.
> http://www.accelacomm.com/jaw/sfnl/114/51521223/
> _______________________________________________
> enlightenment-svn mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
