[FIX] dastout license
[platform/core/system/swap-probe.git] / probe_event / gesture.cpp
index 63611c3..72820bd 100755 (executable)
@@ -1,19 +1,20 @@
 /*
  *  DA probe
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: 
+ * Contact:
  *
  * Jaewon Lim <jaewon81.lim@samsung.com>
  * Woojin Jung <woojin2.jung@samsung.com>
  * Juyoung Kim <j0.kim@samsung.com>
- * 
+ * Anastasia Lyupa <a.lyupa@samsung.com>
+ *
  * 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
  *
  * Contributors:
  * - S-Core Co., Ltd
- * 
+ * - Samsung RnD Institute Russia
+ *
  */
 
 #include "daprobe.h"
 #include "dahelper.h"
 #include "probeinfo.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 #include "dacollection.h"
 #include "da_event.h"
 #include "gesture.h"
 #include "binproto.h"
 
-#define GESTURE_EVENT_LOG(_FUNCNAME, _GESTURETYPE, _X, _Y, _INFO1, _INFO2)             \
-       setProbePoint(&probeInfo);                                                                                                      \
-       INIT_LOG;                                                                                                                                       \
-       APPEND_LOG_BASIC_NAME(LC_UIEVENT, _FUNCNAME);                                                           \
-       APPEND_LOG_COMMON_NONE(0);                                                                                                      \
-       log.length += sprintf(log.data + log.length, "`,%d`,%d`,%d`,%d`,%d`,%d",        \
-                       _EVENT_GESTURE, _GESTURETYPE, _X, _Y, _INFO1, _INFO2);                          \
-       printLog(&log, MSG_LOG)
-
-#define PACK_GESTURE_EVENT(_GESTURETYPE, _X, _Y, _INFO1, _INFO2, _ARGDETECTOR) \
+#define PACK_GESTURE_EVENT(API_ID, _GESTURETYPE, _X, _Y, _INFO1, _INFO2, _ARGDETECTOR) \
        do {                                                                                                                                            \
-               char info1_str[16];                                                                                                     \
+               char info1_str[16];                                                                                                             \
+               setProbePoint(&probeInfo);                                                                                              \
                PREPARE_LOCAL_BUF();                                                                                                    \
-               PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, LC_UIEVENT, "p", _ARGDETECTOR);    \
-               PACK_COMMON_END(0, 0, 0);                                                                                               \
+               PACK_COMMON_BEGIN(MSG_PROBE_UIEVENT, API_ID, "p", voidp_to_uint64(_ARGDETECTOR));       \
+               PACK_COMMON_END('v', 0, 0, 0);                                                                                          \
                sprintf(info1_str, "%d", _INFO1);                                                                               \
                PACK_UIEVENT(_EVENT_GESTURE, _GESTURETYPE, _X, _Y, info1_str, _INFO2);  \
                FLUSH_LOCAL_BUF();                                                                                                              \
@@ -71,59 +65,59 @@ GestureEventListener::~GestureEventListener()
 
 void GestureEventListener::OnCustomGestureCanceled (TouchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
                probeBlockStart();
-               GESTURE_EVENT_LOG("canceled", _GESTURE_CUSTOM, 0, 0, 0, 0);
-               PACK_GESTURE_EVENT(_GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
+               PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnCustomGestureCanceled__TouchGestureDetector__gestureDetector_,
+                                  _GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
                probeBlockEnd();
        }
 }
 
 void GestureEventListener::OnCustomGestureChanged (TouchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
                probeBlockStart();
-               GESTURE_EVENT_LOG("changed", _GESTURE_CUSTOM, 0, 0, 0, 0);
-               PACK_GESTURE_EVENT(_GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
+               PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnCustomGestureChanged__TouchGestureDetector__gestureDetector_,
+                                  _GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
                probeBlockEnd();
        }
 }
 
 void GestureEventListener::OnCustomGestureFinished (TouchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
                probeBlockStart();
-               GESTURE_EVENT_LOG("finished", _GESTURE_CUSTOM, 0, 0, 0, 0);
-               PACK_GESTURE_EVENT(_GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
+               PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnCustomGestureFinished__TouchGestureDetector__gestureDetector_,
+                                  _GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
                probeBlockEnd();
        }
 }
 
 void GestureEventListener::OnCustomGestureStarted (TouchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
                probeBlockStart();
-               GESTURE_EVENT_LOG("started", _GESTURE_CUSTOM, 0, 0, 0, 0);
-               PACK_GESTURE_EVENT(_GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
+               PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnCustomGestureStarted__TouchGestureDetector__gestureDetector_,
+                                  _GESTURE_CUSTOM, 0, 0, 0, 0, &gestureDetector);
                probeBlockEnd();
        }
 }
 
 void GestureEventListener::OnFlickGestureCanceled (TouchFlickGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -135,8 +129,8 @@ void GestureEventListener::OnFlickGestureCanceled (TouchFlickGestureDetector &ge
                        gestureDetector.GetDistance(x, y);
                        dur = gestureDetector.GetDuration();
                        direction = gestureDetector.GetDirection();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_FLICK, x, y, dur, (int)direction);
-                       PACK_GESTURE_EVENT(_GESTURE_FLICK, x, y, dur, (int)direction, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnFlickGestureCanceled__TouchFlickGestureDetector__gestureDetector_,
+                                          _GESTURE_FLICK, x, y, dur, (int)direction, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -144,7 +138,7 @@ void GestureEventListener::OnFlickGestureCanceled (TouchFlickGestureDetector &ge
 
 void GestureEventListener::OnFlickGestureDetected (TouchFlickGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -156,8 +150,8 @@ void GestureEventListener::OnFlickGestureDetected (TouchFlickGestureDetector &ge
                        gestureDetector.GetDistance(x, y);
                        dur = gestureDetector.GetDuration();
                        direction = gestureDetector.GetDirection();
-                       GESTURE_EVENT_LOG("detected", _GESTURE_FLICK, x, y, dur, (int)direction);
-                       PACK_GESTURE_EVENT(_GESTURE_FLICK, x, y, dur, (int)direction, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnFlickGestureDetected__TouchFlickGestureDetector__gestureDetector_,
+                                          _GESTURE_FLICK, x, y, dur, (int)direction, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -165,7 +159,7 @@ void GestureEventListener::OnFlickGestureDetected (TouchFlickGestureDetector &ge
 
 void GestureEventListener::OnLongPressGestureCanceled (TouchLongPressGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -176,8 +170,8 @@ void GestureEventListener::OnLongPressGestureCanceled (TouchLongPressGestureDete
                        moveallow = gestureDetector.GetMoveAllowance();
                        dur = gestureDetector.GetDuration();
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_LONGPRESS, moveallow, 0, dur, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_LONGPRESS, moveallow, 0, dur, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnLongPressGestureCanceled__TouchLongPressGestureDetector__gestureDetector_,
+                                          _GESTURE_LONGPRESS, moveallow, 0, dur, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -185,7 +179,7 @@ void GestureEventListener::OnLongPressGestureCanceled (TouchLongPressGestureDete
 
 void GestureEventListener::OnLongPressGestureDetected (TouchLongPressGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -196,8 +190,8 @@ void GestureEventListener::OnLongPressGestureDetected (TouchLongPressGestureDete
                        moveallow = gestureDetector.GetMoveAllowance();
                        dur = gestureDetector.GetDuration();
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("detected", _GESTURE_LONGPRESS, moveallow, 0, dur, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_LONGPRESS, moveallow, 0, dur, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnLongPressGestureDetected__TouchLongPressGestureDetector__gestureDetector_,
+                                          _GESTURE_LONGPRESS, moveallow, 0, dur, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -205,7 +199,7 @@ void GestureEventListener::OnLongPressGestureDetected (TouchLongPressGestureDete
 
 void GestureEventListener::OnPanningGestureCanceled (TouchPanningGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -214,8 +208,8 @@ void GestureEventListener::OnPanningGestureCanceled (TouchPanningGestureDetector
                        int tcount = 0;
 
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_PANNING, 0, 0, 0, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPanningGestureCanceled__TouchPanningGestureDetector__gestureDetector_,
+                                          _GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -223,7 +217,7 @@ void GestureEventListener::OnPanningGestureCanceled (TouchPanningGestureDetector
 
 void GestureEventListener::OnPanningGestureChanged (TouchPanningGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -232,8 +226,8 @@ void GestureEventListener::OnPanningGestureChanged (TouchPanningGestureDetector
                        int tcount = 0;
 
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("changed", _GESTURE_PANNING, 0, 0, 0, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPanningGestureChanged__TouchPanningGestureDetector__gestureDetector_,
+                                          _GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -241,7 +235,7 @@ void GestureEventListener::OnPanningGestureChanged (TouchPanningGestureDetector
 
 void GestureEventListener::OnPanningGestureFinished (TouchPanningGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -250,8 +244,8 @@ void GestureEventListener::OnPanningGestureFinished (TouchPanningGestureDetector
                        int tcount = 0;
 
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("finished", _GESTURE_PANNING, 0, 0, 0, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPanningGestureFinished__TouchPanningGestureDetector__gestureDetector_,
+                                          _GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -259,7 +253,7 @@ void GestureEventListener::OnPanningGestureFinished (TouchPanningGestureDetector
 
 void GestureEventListener::OnPanningGestureStarted (TouchPanningGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -268,8 +262,8 @@ void GestureEventListener::OnPanningGestureStarted (TouchPanningGestureDetector
                        int tcount = 0;
 
                        tcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("started", _GESTURE_PANNING, 0, 0, 0, tcount);
-                       PACK_GESTURE_EVENT(_GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPanningGestureStarted__TouchPanningGestureDetector__gestureDetector_,
+                                          _GESTURE_PANNING, 0, 0, 0, tcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -277,7 +271,7 @@ void GestureEventListener::OnPanningGestureStarted (TouchPanningGestureDetector
 
 void GestureEventListener::OnPinchGestureCanceled (TouchPinchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -288,8 +282,8 @@ void GestureEventListener::OnPinchGestureCanceled (TouchPinchGestureDetector &ge
 
                        point = gestureDetector.GetCenterPoint();
                        scale = gestureDetector.GetScale();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_PINCH, point.x, point.y, scale, 0);
-                       PACK_GESTURE_EVENT(_GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPinchGestureCanceled__TouchPinchGestureDetector__gestureDetector_,
+                                          _GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -297,7 +291,7 @@ void GestureEventListener::OnPinchGestureCanceled (TouchPinchGestureDetector &ge
 
 void GestureEventListener::OnPinchGestureChanged (TouchPinchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -308,8 +302,8 @@ void GestureEventListener::OnPinchGestureChanged (TouchPinchGestureDetector &ges
 
                        point = gestureDetector.GetCenterPoint();
                        scale = gestureDetector.GetScale();
-                       GESTURE_EVENT_LOG("changed", _GESTURE_PINCH, point.x, point.y, scale, 0);
-                       PACK_GESTURE_EVENT(_GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPinchGestureChanged__TouchPinchGestureDetector__gestureDetector_,
+                                          _GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -317,7 +311,7 @@ void GestureEventListener::OnPinchGestureChanged (TouchPinchGestureDetector &ges
 
 void GestureEventListener::OnPinchGestureFinished (TouchPinchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -328,8 +322,8 @@ void GestureEventListener::OnPinchGestureFinished (TouchPinchGestureDetector &ge
 
                        point = gestureDetector.GetCenterPoint();
                        scale = gestureDetector.GetScale();
-                       GESTURE_EVENT_LOG("finished", _GESTURE_PINCH, point.x, point.y, scale, 0);
-                       PACK_GESTURE_EVENT(_GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPinchGestureFinished__TouchPinchGestureDetector__gestureDetector_,
+                                          _GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -337,7 +331,7 @@ void GestureEventListener::OnPinchGestureFinished (TouchPinchGestureDetector &ge
 
 void GestureEventListener::OnPinchGestureStarted (TouchPinchGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -348,8 +342,8 @@ void GestureEventListener::OnPinchGestureStarted (TouchPinchGestureDetector &ges
 
                        point = gestureDetector.GetCenterPoint();
                        scale = gestureDetector.GetScale();
-                       GESTURE_EVENT_LOG("started", _GESTURE_PINCH, point.x, point.y, scale, 0);
-                       PACK_GESTURE_EVENT(_GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnPinchGestureStarted__TouchPinchGestureDetector__gestureDetector_,
+                                          _GESTURE_PINCH, point.x, point.y, scale, 0, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -357,7 +351,7 @@ void GestureEventListener::OnPinchGestureStarted (TouchPinchGestureDetector &ges
 
 void GestureEventListener::OnRotationGestureCanceled (TouchRotationGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -368,8 +362,8 @@ void GestureEventListener::OnRotationGestureCanceled (TouchRotationGestureDetect
 
                        distance = gestureDetector.GetDistance();
                        angle = gestureDetector.GetAngle();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle));
-                       PACK_GESTURE_EVENT(_GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnRotationGestureCanceled__TouchRotationGestureDetector__gestureDetector_,
+                                          _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -377,7 +371,7 @@ void GestureEventListener::OnRotationGestureCanceled (TouchRotationGestureDetect
 
 void GestureEventListener::OnRotationGestureChanged (TouchRotationGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -388,8 +382,8 @@ void GestureEventListener::OnRotationGestureChanged (TouchRotationGestureDetecto
 
                        distance = gestureDetector.GetDistance();
                        angle = gestureDetector.GetAngle();
-                       GESTURE_EVENT_LOG("changed", _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle));
-                       PACK_GESTURE_EVENT(_GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnRotationGestureChanged__TouchRotationGestureDetector__gestureDetector_,
+                                          _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -397,7 +391,7 @@ void GestureEventListener::OnRotationGestureChanged (TouchRotationGestureDetecto
 
 void GestureEventListener::OnRotationGestureFinished (TouchRotationGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -408,8 +402,8 @@ void GestureEventListener::OnRotationGestureFinished (TouchRotationGestureDetect
 
                        distance = gestureDetector.GetDistance();
                        angle = gestureDetector.GetAngle();
-                       GESTURE_EVENT_LOG("finished", _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle));
-                       PACK_GESTURE_EVENT(_GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnRotationGestureFinished__TouchRotationGestureDetector__gestureDetector_,
+                                          _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -417,7 +411,7 @@ void GestureEventListener::OnRotationGestureFinished (TouchRotationGestureDetect
 
 void GestureEventListener::OnRotationGestureStarted (TouchRotationGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -428,8 +422,8 @@ void GestureEventListener::OnRotationGestureStarted (TouchRotationGestureDetecto
 
                        distance = gestureDetector.GetDistance();
                        angle = gestureDetector.GetAngle();
-                       GESTURE_EVENT_LOG("started", _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle));
-                       PACK_GESTURE_EVENT(_GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnRotationGestureStarted__TouchRotationGestureDetector__gestureDetector_,
+                                          _GESTURE_ROTATION, 0, 0, distance, static_cast<int>(angle), &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -437,7 +431,7 @@ void GestureEventListener::OnRotationGestureStarted (TouchRotationGestureDetecto
 
 void GestureEventListener::OnTapGestureCanceled (TouchTapGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -449,8 +443,8 @@ void GestureEventListener::OnTapGestureCanceled (TouchTapGestureDetector &gestur
                        tapcount = gestureDetector.GetTapCount();
                        interval = gestureDetector.GetTapInterval();
                        touchcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("canceled", _GESTURE_TAP, move, tapcount, interval, touchcount);
-                       PACK_GESTURE_EVENT(_GESTURE_TAP, move, tapcount, interval, touchcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnTapGestureCanceled__TouchTapGestureDetector__gestureDetector_,
+                                          _GESTURE_TAP, move, tapcount, interval, touchcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -458,7 +452,7 @@ void GestureEventListener::OnTapGestureCanceled (TouchTapGestureDetector &gestur
 
 void GestureEventListener::OnTapGestureDetected (TouchTapGestureDetector &gestureDetector)
 {
-       DECLARE_COMMON_VARIABLE;
+       probeInfo_t     probeInfo;
 
        if(isOptionEnabled(OPT_EVENT))
        {
@@ -470,8 +464,8 @@ void GestureEventListener::OnTapGestureDetected (TouchTapGestureDetector &gestur
                        tapcount = gestureDetector.GetTapCount();
                        interval = gestureDetector.GetTapInterval();
                        touchcount = gestureDetector.GetTouchCount();
-                       GESTURE_EVENT_LOG("detected", _GESTURE_TAP, move, tapcount, interval, touchcount);
-                       PACK_GESTURE_EVENT(_GESTURE_TAP, move, tapcount, interval, touchcount, &gestureDetector);
+                       PACK_GESTURE_EVENT(API_ID_void_GestureEventListener__OnTapGestureDetected__TouchTapGestureDetector__gestureDetector_,
+                                          _GESTURE_TAP, move, tapcount, interval, touchcount, &gestureDetector);
                }
                probeBlockEnd();
        }
@@ -481,208 +475,3 @@ GestureEventListener& GestureEventListener::GetInstance()
 {
        return rInstance;
 }
-
-
-namespace Tizen { namespace Ui {
-
-result TouchFlickGestureDetector::AddFlickGestureEventListener(ITouchFlickGestureEventListener& listener)
-{
-       typedef result (TouchFlickGestureDetector::*methodType)(ITouchFlickGestureEventListener& listener);
-       static methodType addflickgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui25TouchFlickGestureDetector28AddFlickGestureEventListenerERNS0_31ITouchFlickGestureEventListenerE,
-                       LIBOSP_UIFW, addflickgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addflickgestureeventlistenerp)(static_cast<ITouchFlickGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addflickgestureeventlistenerp)(listener);
-}
-
-result TouchLongPressGestureDetector::AddLongPressGestureEventListener(ITouchLongPressGestureEventListener& listener)
-{
-       typedef result (TouchLongPressGestureDetector::*methodType)(ITouchLongPressGestureEventListener& listener);
-       static methodType addlongpressgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui29TouchLongPressGestureDetector32AddLongPressGestureEventListenerERNS0_35ITouchLongPressGestureEventListenerE,
-                       LIBOSP_UIFW, addlongpressgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addlongpressgestureeventlistenerp)(static_cast<ITouchLongPressGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addlongpressgestureeventlistenerp)(listener);
-}
-
-result TouchPanningGestureDetector::AddPanningGestureEventListener(ITouchPanningGestureEventListener& listener)
-{
-       typedef result (TouchPanningGestureDetector::*methodType)(ITouchPanningGestureEventListener& listener);
-       static methodType addpanninggestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui27TouchPanningGestureDetector30AddPanningGestureEventListenerERNS0_33ITouchPanningGestureEventListenerE,
-                       LIBOSP_UIFW, addpanninggestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addpanninggestureeventlistenerp)(static_cast<ITouchPanningGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addpanninggestureeventlistenerp)(listener);
-}
-
-result TouchPinchGestureDetector::AddPinchGestureEventListener(ITouchPinchGestureEventListener& listener)
-{
-       typedef result (TouchPinchGestureDetector::*methodType)(ITouchPinchGestureEventListener& listener);
-       static methodType addpinchgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui25TouchPinchGestureDetector28AddPinchGestureEventListenerERNS0_31ITouchPinchGestureEventListenerE,
-                       LIBOSP_UIFW, addpinchgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addpinchgestureeventlistenerp)(static_cast<ITouchPinchGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addpinchgestureeventlistenerp)(listener);
-}
-
-result TouchRotationGestureDetector::AddRotationGestureEventListener(ITouchRotationGestureEventListener& listener)
-{
-       typedef result (TouchRotationGestureDetector::*methodType)(ITouchRotationGestureEventListener& listener);
-       static methodType addrotationgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui28TouchRotationGestureDetector31AddRotationGestureEventListenerERNS0_34ITouchRotationGestureEventListenerE,
-                       LIBOSP_UIFW, addrotationgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addrotationgestureeventlistenerp)(static_cast<ITouchRotationGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addrotationgestureeventlistenerp)(listener);
-}
-
-result TouchTapGestureDetector::AddTapGestureEventListener(ITouchTapGestureEventListener& listener)
-{
-       typedef result (TouchTapGestureDetector::*methodType)(ITouchTapGestureEventListener& listener);
-       static methodType addtapgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui23TouchTapGestureDetector26AddTapGestureEventListenerERNS0_29ITouchTapGestureEventListenerE,
-                       LIBOSP_UIFW, addtapgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addtapgestureeventlistenerp)(static_cast<ITouchTapGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addtapgestureeventlistenerp)(listener);
-}
-
-result TouchGestureDetector::AddGestureEventListener(ITouchGestureEventListener& listener)
-{
-       typedef result (TouchGestureDetector::*methodType)(ITouchGestureEventListener& listener);
-       static methodType addgestureeventlistenerp;
-       result iret;
-
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui20TouchGestureDetector23AddGestureEventListenerERNS0_26ITouchGestureEventListenerE,
-                       LIBOSP_UIFW, addgestureeventlistenerp);
-
-       probeBlockStart();
-       GestureEventListener& mylistener = GestureEventListener::GetInstance();
-       if(add_detector_hash(static_cast<void*>(this), static_cast<void*>(&mylistener)) <= 0)
-       {
-               iret = (this->*addgestureeventlistenerp)(static_cast<ITouchGestureEventListener&>(mylistener));
-               if(likely(iret == E_SUCCESS))
-               {
-                       // do nothing
-               }
-               else
-               {
-                       del_detector_hash(static_cast<void*>(this));
-               }
-       }
-       probeBlockEnd();
-
-       return (this->*addgestureeventlistenerp)(listener);
-}
-
-
-} }    // end of namespace
-
-
-