Merge branch 'tizen_2.4' into tizen_2.4_dev

Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>
Conflicts:
	probe_capi/capi_appfw.c

Change-Id: I624f41975009e38a89b20727f779a78cdfb2441f

diff --cc Makefile
index b4f38896cebe8cf8d048634ad30e703739d2b754,499bac6e4ff8d2ee3312f6226db0e7f1909e9f92..5f6597c204588b8a0e4cc9fd1c0d20861831a748
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -27,8 -34,10 +35,10 @@@ INCLUDE_CPPFLAGS =                          
                -I/usr/include/capi-system-runtime-info \
                -I/usr/include/vconf            \
                -I/usr/lib/dbus-1.0/include     \
+               -I/usr/include/efl-1            \
+               -I/usr/include/eo-1                     \
  
 -WARN_CFLAGS =                                 \
 +WARN_CFLAGS = -g                      \
                -Wall                   \
                -funwind-tables         \
                -fomit-frame-pointer    \

diff --cc custom_chart/da_chart.c
Simple merge

diff --cc helper/common_probe_init.c
Simple merge

diff --cc helper/dacapture.c
Simple merge

diff --cc helper/damaps.c
Simple merge

diff --cc helper/libdaprobe.c
Simple merge

diff --cc packaging/swap-probe.spec
Simple merge

diff --cc probe_capi/capi_appfw.c
index db7fbfdba7192bef2be1af86f6c9bcf43709f213,237f3a0d997c1cd668f9dd126ce9e967b877d6f8..391d945431f3623536c655d5aea30741508e0c4f
--- 1/probe_capi/capi_appfw.c
--- 2/probe_capi/capi_appfw.c
+++ b/probe_capi/capi_appfw.c
@@@ -56,136 -56,6 +56,7 @@@ ui_app_lifecycle_callback_s uiAppCallba
        } while(0);                                                             \
        errno = (newerrno != 0) ? newerrno : olderrno
  
- static bool _dalc_app_create(void *user_data)
- {
-       bool bret = false;
-       DECLARE_ERRNO_VARS;
- //    int blockresult = 1;
- 
-       bret = gAppCallback.create(user_data);
- 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, 'b', bret, "p",
-                                voidp_to_uint64(user_data));
- 
-       return bret;
- }
- 
- static void _dalc_app_terminate(void *user_data)
- {
-       DECLARE_ERRNO_VARS;
- //    int blockresult = 1;
- 
-       gAppCallback.terminate(user_data);
- 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
- }
- 
- static void _dalc_app_pause(void *user_data)
- {
-       DECLARE_ERRNO_VARS;
- //    int blockresult = 1;
- 
-       gAppCallback.pause(user_data);
- 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
- }
- 
- static void _dalc_app_resume(void *user_data)
- {
-       DECLARE_ERRNO_VARS;
- //    int blockresult = 1;
- 
-       gAppCallback.resume(user_data);
- 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
- }
- 
- #ifdef PRIVATE_CAPI_APPFW
- static void _dalc_app_control(app_control_h handle, void *user_data)
- #else /* !PRIVATE_CAPI_APPFW */
- static void _dalc_app_service(service_h handle, void *user_data)
- #endif /* PRIVATE_CAPI_APPFW */
- {
-       DECLARE_ERRNO_VARS;
- //    int blockresult = 1;
- 
- #ifdef PRIVATE_CAPI_APPFW
-       gAppCallback.app_control(handle, user_data);
- #else /* !PRIVATE_CAPI_APPFW */
-       gAppCallback.service(handle, user_data);
- #endif /* PRIVATE_CAPI_APPFW */
- 
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 'v', 0, "dp",
-                                (unsigned int)handle,
-                                voidp_to_uint64(user_data));
- }
- 
- static void _dalc_app_deviceorientationchanged(app_device_orientation_e orientation, void *user_data)
- {
-       on_orientation_changed((int)orientation, true);
- 
-       if (gAppCallback.device_orientation)
-               gAppCallback.device_orientation(orientation, user_data);
- }
- 
- int app_efl_main(int *argc, char ***argv, app_event_callback_s *callback, void *user_data)
- {
-       static int (*app_efl_mainp)(int *argc, char ***argv, app_event_callback_s *callback, void *user_data);
-       Ecore_Event_Handler* handler;
-       int ret;
- 
-       GET_REAL_FUNCP_RTLD_NEXT(app_efl_main, app_efl_mainp);
- 
-       handler = register_orientation_event_listener();
-       gAppCallback.create = callback->create;
-       gAppCallback.terminate = callback->terminate;
-       gAppCallback.pause = callback->pause;
-       gAppCallback.resume = callback->resume;
- #ifdef PRIVATE_CAPI_APPFW
-       gAppCallback.app_control = callback->app_control;
- #else /* !PRIVATE_CAPI_APPFW */
-       gAppCallback.service = callback->service;
- #endif /* PRIVATE_CAPI_APPFW */
-       gAppCallback.device_orientation = callback->device_orientation;
- 
-       if (callback->create)
-               callback->create = _dalc_app_create;
-       if (callback->terminate)
-               callback->terminate = _dalc_app_terminate;
-       if (callback->pause)
-               callback->pause = _dalc_app_pause;
-       if (callback->resume)
-               callback->resume = _dalc_app_resume;
- #ifdef PRIVATE_CAPI_APPFW
-       if (callback->app_control)
-               callback->app_control = _dalc_app_control;
- #else /* !PRIVATE_CAPI_APPFW */
-       if (callback->service)
-               callback->service = _dalc_app_service;
- #endif /* PRIVATE_CAPI_APPFW */
-       callback->device_orientation = _dalc_app_deviceorientationchanged;
- 
-       ret = app_efl_mainp(argc, argv, callback, user_data);
- 
-       unregister_orientation_event_listener(handler);
-       callback->create = gAppCallback.create;
-       callback->terminate = gAppCallback.terminate;
-       callback->pause = gAppCallback.pause;
-       callback->resume = gAppCallback.resume;
- #ifdef PRIVATE_CAPI_APPFW
-       callback->app_control = gAppCallback.app_control;
- #else /* !PRIVATE_CAPI_APPFW */
-       callback->service = gAppCallback.service;
- #endif /* PRIVATE_CAPI_APPFW */
-       callback->device_orientation = gAppCallback.device_orientation;
- 
-       return ret;
- }
- 
 +
  /************************************ UI APP ******************************************/
  static bool _ui_dalc_app_create(void *user_data)
  {

diff --cc probe_event/da_event.c
Simple merge

diff --cc probe_event/keytouch.c
Simple merge

diff --cc probe_file/da_io_posix.c
index 02f4c4f9374e5c83e741ae5eb747a0978a0e6c68,1be30482555005e331b08a5a5da29ae4c53e8ea4..92b5d6cd96c9cccbdfa5f0bb507dc954791edcec
--- 1/probe_file/da_io_posix.c
--- 2/probe_file/da_io_posix.c
+++ b/probe_file/da_io_posix.c
@@@ -51,7 -51,10 +51,8 @@@
  #include <errno.h>
  
  #include "binproto.h"
+ #include "real_functions.h"
  
 -static enum DaOptions _sopt = OPT_FILE;
 -
  static inline char *get_abs_path(int fd, const char *fname,
                                 char *buf, size_t bufsiz)
  {

diff --cc probe_file/da_io_stdc.c
index 186d957f9428c97e2a3ec47cd0dc65e57b8d7aac,35ebd4ff9efa4fb6cbea7862b7d45fdcd46509d2..4c7382299fed6073aad18d1fa907e8f96396e9c9
--- 1/probe_file/da_io_stdc.c
--- 2/probe_file/da_io_stdc.c
+++ b/probe_file/da_io_stdc.c
@@@ -43,7 -43,10 +43,8 @@@
  #include "da_io.h"
  
  #include "binproto.h"
+ #include "real_functions.h"
  
 -static enum DaOptions _sopt = OPT_FILE;
 -
  static inline char *get_abs_path(FILE *file, const char *fname,
                                 char *buf, size_t bufsiz)
  {

diff --cc probe_graphics/da_evas_gl.c
index f99abc5b7771da4d2b5afcf964e573e20821491c,b1facc054c22e35c719f7a5e2ceb109505f76c8a..ac4b7cf6ea47477488490f8ab59043345baa0d67
--- 1/probe_graphics/da_evas_gl.c
--- 2/probe_graphics/da_evas_gl.c
+++ b/probe_graphics/da_evas_gl.c
@@@ -30,7 -30,10 +30,8 @@@
  #include "daprobe.h"
  #include "binproto.h"
  #include "common_probe_init.h"
+ #include "real_functions.h"
  
 -static enum DaOptions _sopt = OPT_GLES;
 -
  /* Evas open gl API functions */
  
  void evas_gl_free(Evas_GL *evas_gl)

diff --cc probe_graphics/da_gles20_native.cpp
Simple merge

diff --cc probe_memory/libdamemmanage.c
index b2bf0c20253eb6c31109f0daa3d6fb628a98d7e6,d0fb3fafdd8fcfaeadb3abb32f79d73dac40397c..948e8faee24660dc5b219aecd24430049ea01e13
--- 1/probe_memory/libdamemmanage.c
--- 2/probe_memory/libdamemmanage.c
+++ b/probe_memory/libdamemmanage.c
@@@ -43,7 -43,9 +43,8 @@@
  #include "da_memory.h"
  #include "binproto.h"
  #include "common_probe_init.h"
+ #include "real_functions.h"
  
 -static enum DaOptions _sopt = OPT_ALLOC;
  
  void *memset(void *memblock, int c, size_t n)
  {

diff --cc probe_socket/libdasocket.c
Simple merge

diff --cc probe_third/libdaemon.c
Simple merge

diff --cc probe_thread/libdasync.c
index b92b3329c44cc189ebe690e197a8b62a477eec91,2823b2ce9b564a3c81defad3e9dc8a136ca91d35..3605005cea28bd3af50868943a11f2a84f5d2d07
--- 1/probe_thread/libdasync.c
--- 2/probe_thread/libdasync.c
+++ b/probe_thread/libdasync.c
@@@ -39,7 -39,9 +39,8 @@@
  #include "da_sync.h"
  
  #include "binproto.h"
+ #include "real_functions.h"
  
 -static enum DaOptions _sopt = OPT_THREAD;
  
  int pthread_mutex_init(pthread_mutex_t *mutex,
                const pthread_mutexattr_t *attr) {

diff --cc probe_thread/libdathread.c
index acfdb6d9fd3530ab51f6ac365d45863fd4dadfd7,018a23ab2fd84748bfdadf78d7ba384a4022c2fe..e628e749bd653e7a948555eea28eedb52990d1ff
--- 1/probe_thread/libdathread.c
--- 2/probe_thread/libdathread.c
+++ b/probe_thread/libdathread.c
@@@ -139,10 -142,12 +140,10 @@@ int pthread_create(pthread_t *thread, c
  
        if(blockresult)
        {
 -              probeBlockStart();
                thread_routine_call *ptrc =
-                       (thread_routine_call *) malloc(sizeof(thread_routine_call));
+                       (thread_routine_call *) real_malloc(sizeof(thread_routine_call));
                ptrc->thread_routine = start_routine;
                ptrc->argument = arg;
 -              probeBlockEnd();
  
                ret = pthread_createp(thread, attr, _da_ThreadProc, (void *) ptrc);
        }