[REFACTOR] renaming : tizen -> capi, osp -> tizen
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Fri, 20 Sep 2013 15:17:13 +0000 (19:17 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Fri, 20 Sep 2013 15:17:13 +0000 (19:17 +0400)
merge dynamic-analysis-probe
(commit 64df7f4b5e5b1ff8c810c765e647161ef6f46924)
- change terms appropriately : tizen -> capi, osp -> tizen
- change directory name, file name, variable/flag name inside source
code

Change-Id: I18c738ec741151e4cb80dfe303b2e0f2ae7522be
Signed-off-by: Vitaliy Cherepanov <v.cherepanov@samsung.com>
20 files changed:
Makefile
helper/libdaprobe.c
include/binproto.h
include/probeinfo.h
include/tizen_probe.h [moved from include/osp_probe.h with 92% similarity]
packaging/swap-probe.spec
probe_capi/capi_appfw.c [moved from probe_tizenapi/tizen_appfw.c with 100% similarity]
probe_event/gesture.cpp
probe_tizenapi/tizen_constructor.cpp [moved from probe_badaapi/osp_constructor.cpp with 76% similarity]
probe_tizenapi/tizen_controls.cpp [moved from probe_badaapi/osp_controls.cpp with 89% similarity]
probe_tizenapi/tizen_file.cpp [moved from probe_badaapi/bada_file.cpp with 100% similarity]
probe_tizenapi/tizen_lifecycle.cpp [moved from probe_badaapi/bada_lifecycle.cpp with 88% similarity]
probe_tizenapi/tizen_sync.cpp [moved from probe_badaapi/bada_sync.cpp with 93% similarity]
probe_tizenapi/tizen_thread.cpp [moved from probe_badaapi/bada_thread.cpp with 94% similarity]
probe_ui/capi_capture.c [moved from probe_ui/tizen_capture.c with 100% similarity]
probe_ui/tizen_capture.cpp [moved from probe_ui/osp_capture.cpp with 94% similarity]
probe_ui/tizen_display.cpp [moved from probe_ui/osp_display.cpp with 76% similarity]
probe_ui/tizen_frameani.cpp [moved from probe_ui/osp_frameani.cpp with 98% similarity]
probe_ui/tizen_frameani.h [moved from probe_ui/osp_frameani.h with 95% similarity]
probe_ui/tizen_scenemanager.cpp [moved from probe_ui/osp_scenemanager.cpp with 96% similarity]

index 61ede45..fba8fc1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ INC_COMMON = -I./include \
                         -I/usr/include/e_dbus-1 \
                         -I/usr/include/dbus-1.0 \
                         -I/usr/lib/dbus-1.0/include
-INC_TIZEN = $(INC_COMMON) #-I/usr/include/vconf -I/usr/include/pixman-1
-INC_OSP = $(INC_COMMON) -I/usr/include/osp
+INC_CAPI = $(INC_COMMON) #-I/usr/include/vconf -I/usr/include/pixman-1
+INC_TIZEN = $(INC_COMMON) -I/usr/include/osp
 
 COMMON_SRCS =  ./helper/libdaprobe.c \
                                ./helper/dahelper.c \
@@ -41,68 +41,67 @@ COMMON_SRCS =       ./helper/libdaprobe.c \
                                ./probe_file/da_io_posix.c \
                                ./probe_file/da_io_stdc.c
 
-TIZEN_SRCS =$(COMMON_SRCS) \
+CAPI_SRCS =$(COMMON_SRCS) \
                        ./helper/addr-capi.c \
-                       ./probe_tizenapi/tizen_appfw.c \
-                       ./probe_ui/tizen_capture.c
+                       ./probe_capi/capi_appfw.c \
+                       ./probe_ui/capi_capture.c
 
-OSP_SRCS =     $(COMMON_SRCS) \
+TIZEN_SRCS =   $(COMMON_SRCS) \
                        ./helper/addr-tizen.c \
                        ./probe_memory/libdanew.cpp \
-                       ./probe_badaapi/bada_file.cpp \
-                       ./probe_badaapi/bada_thread.cpp \
-                       ./probe_badaapi/bada_lifecycle.cpp \
-                       ./probe_badaapi/bada_sync.cpp \
-                       ./probe_badaapi/osp_controls.cpp \
-                       ./probe_badaapi/osp_constructor.cpp \
+                       ./probe_tizenapi/tizen_file.cpp \
+                       ./probe_tizenapi/tizen_thread.cpp \
+                       ./probe_tizenapi/tizen_lifecycle.cpp \
+                       ./probe_tizenapi/tizen_sync.cpp \
+                       ./probe_tizenapi/tizen_controls.cpp \
+                       ./probe_tizenapi/tizen_constructor.cpp \
                        ./probe_event/gesture.cpp \
-                       ./probe_ui/osp_capture.cpp \
-                       ./probe_ui/osp_scenemanager.cpp \
-                       ./probe_ui/osp_frameani.cpp \
-                       ./probe_ui/osp_display.cpp \
-                       ./probe_graphics/da_gles20.cpp
+                       ./probe_graphics/da_gles20.cpp \
+                       ./probe_ui/tizen_capture.cpp \
+                       ./probe_ui/tizen_scenemanager.cpp \
+                       ./probe_ui/tizen_frameani.cpp \
+                       ./probe_ui/tizen_display.cpp 
 
 DUMMY_SRCS = ./custom_chart/da_chart_dummy.c
 
+CAPI_TARGET = da_probe_osp.so
 TIZEN_TARGET = da_probe_tizen.so
-OSP_TARGET = da_probe_osp.so
 DUMMY_TARGET = libdaprobe.so
 
 COMMON_FLAGS = -D_GNU_SOURCE -fPIC -shared -Wall -funwind-tables -fomit-frame-pointer -Xlinker --no-undefined
-TIZEN_FLAGS = $(COMMON_FLAGS)
-OSP_FLAGS = $(COMMON_FLAGS) -DOSPAPP
+CAPI_FLAGS = $(COMMON_FLAGS)
+TIZEN_FLAGS = $(COMMON_FLAGS) -DOSPAPP
 
 LIBDIR_COMMON = 
-LIBDIR_TIZEN = $(LIBDIR_COMMON) 
-LIBDIR_OSP = $(LIBDIR_COMMON) -L/usr/lib/osp
+LIBDIR_CAPI = $(LIBDIR_COMMON) 
+LIBDIR_TIZEN = $(LIBDIR_COMMON) -L/usr/lib/osp
 
 COMMON_LDFLAGS = -ldl -lpthread -lrt -lecore -levas -lecore_input -leina -lecore_x -lcapi-system-runtime-info -lcapi-appfw-application -lX11 -lXext
-TIZEN_LDFLAGS = $(COMMON_LDFLAGS)
-OSP_LDFLAGS = $(COMMON_LDFLAGS) -lstdc++ -losp-uifw -losp-appfw
+CAPI_LDFLAGS = $(COMMON_LDFLAGS)
+TIZEN_LDFLAGS = $(COMMON_LDFLAGS) -lstdc++ -losp-uifw -losp-appfw
 DUMMY_LDFLAGS =
 
-all:   $(TIZEN_TARGET) $(OSP_TARGET) $(DUMMY_TARGET)
+all:   $(CAPI_TARGET) $(TIZEN_TARGET) $(DUMMY_TARGET)
+capi:  $(CAPI_TARGET)
 tizen: $(TIZEN_TARGET)
-osp:   $(OSP_TARGET)
 dummy: $(DUMMY_TARGET)
 
 headers:
        cat ./scripts/api_names.txt | awk -f ./scripts/gen_api_id_mapping_header.awk > include/api_id_mapping.h
        cat ./scripts/api_names.txt | awk -f ./scripts/gen_api_id_mapping_header_list.awk > include/api_id_list.h
 
+$(CAPI_TARGET): $(CAPI_SRCS)
+       $(CC) $(INC_CAPI) $(CAPI_FLAGS) $(LIBDIR_CAPI) -o $@ $(CAPI_SRCS) $(CAPI_LDFLAGS)
+
 $(TIZEN_TARGET): $(TIZEN_SRCS)
        $(CC) $(INC_TIZEN) $(TIZEN_FLAGS) $(LIBDIR_TIZEN) -o $@ $(TIZEN_SRCS) $(TIZEN_LDFLAGS)
 
-$(OSP_TARGET): $(OSP_SRCS)
-       $(CC) $(INC_OSP) $(OSP_FLAGS) $(LIBDIR_OSP) -o $@ $(OSP_SRCS) $(OSP_LDFLAGS)
-
 $(DUMMY_TARGET): $(DUMMY_SRCS)
-       $(CC) $(INC_OSP) $(COMMON_FLAGS) -o $@ $(DUMMY_SRCS) $(DUMMY_LDFLAGS)
-
+       $(CC) $(INC_TIZEN) $(COMMON_FLAGS) -o $@ $(DUMMY_SRCS) $(DUMMY_LDFLAGS)
 
 install:
        [ -d "$(DESTDIR)/$(INSTALLDIR)" ] || mkdir -p $(DESTDIR)/$(INSTALLDIR)
-       install $(OSP_TARGET) $(DUMMY_TARGET) $(DESTDIR)/$(INSTALLDIR)/
+       install $(TIZEN_TARGET) $(DUMMY_TARGET) $(DESTDIR)/$(INSTALLDIR)/
 
 clean:
        rm -f *.so *.o
index d4620c6..69a20e5 100755 (executable)
@@ -60,7 +60,7 @@
 #include "binproto.h"
 
 #define APP_INSTALL_PATH               "/opt/apps"
-#define OSP_APP_POSTFIX                        ".exe"
+#define TISEN_APP_POSTFIX                      ".exe"
 #define UDS_NAME                               "/tmp/da.socket"
 #define TIMERFD_INTERVAL               100000000               // 0.1 sec
 
@@ -183,8 +183,8 @@ static int determineCaller(char* tracestring)
        }
        else                            // user binary
        {
-#ifdef OSPAPP
-               substr = strstr(tracestring, OSP_APP_POSTFIX);
+#ifdef TISENAPP
+               substr = strstr(tracestring, TISEN_APP_POSTFIX);
                if(substr == NULL)
                        return 1;
 #endif
index 8a94cc0..0b5609f 100644 (file)
@@ -314,8 +314,8 @@ static inline char *pack_args(char *to, const char *fmt, ...)
        if(thread_type == THREAD_PTHREAD) {                             \
            BUF_PTR = pack_int64(BUF_PTR, thread_id);                   \
            BUF_PTR = pack_int64(BUF_PTR, 0);                           \
-       } else if(thread_type == THREAD_OSPTHREAD_WORKER                \
-                   || thread_type == THREAD_OSPTHREAD_EVENTDRIVEN) {   \
+       } else if(thread_type == THREAD_TIZENTHREAD_WORKER              \
+                   || thread_type == THREAD_TIZENTHREAD_EVENTDRIVEN) {   \
            BUF_PTR = pack_int64(BUF_PTR, 0);                           \
            BUF_PTR = pack_int64(BUF_PTR, thread_id);                   \
        } else {                                                        \
index 27e28a4..5b448d6 100755 (executable)
@@ -131,8 +131,8 @@ extern "C"{
 #define                USERFUNC_EXIT           1
 
 #define                THREAD_PTHREAD                  0
-#define                THREAD_OSPTHREAD_WORKER         1
-#define                THREAD_OSPTHREAD_EVENTDRIVEN    2
+#define                THREAD_TIZENTHREAD_WORKER               1
+#define                THREAD_TIZENTHREAD_EVENTDRIVEN  2
 
 #define                THREAD_API_NEW                          0
 #define                THREAD_API_START                        1
@@ -144,9 +144,9 @@ extern "C"{
 #define                THREAD_API_INTERNAL_STOP                7
 #define                THREAD_API_OTHER                        8
 
-#define        SYNC_OSP_MUTEX                          0
-#define                SYNC_OSP_MONITOR                        1
-#define                SYNC_OSP_SEMAPHORE                      2
+#define        SYNC_TIZEN_MUTEX                                0
+#define                SYNC_TIZEN_MONITOR                      1
+#define                SYNC_TIZEN_SEMAPHORE                    2
 #define                SYNC_PTHREAD_MUTEX                      3
 #define                SYNC_PTHREAD_COND_VARIABLE              4
 #define                SYNC_PTHREAD_RWLOCK                     5
similarity index 92%
rename from include/osp_probe.h
rename to include/tizen_probe.h
index 3c0c12a..f9fec97 100755 (executable)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#define GET_REAL_FUNC_OSP(FUNCNAME, LIBNAME, FUNCTIONPOINTER)                                          \
+#define GET_REAL_FUNC_TISEN(FUNCNAME, LIBNAME, FUNCTIONPOINTER)                                                \
        do {                                                                                            \
                if(!FUNCTIONPOINTER) {                                                                  \
                        probeBlockStart();                                                              \
@@ -61,9 +61,9 @@ extern "C" {
                }                                                                                       \
        } while(0)
 
-#define GET_REAL_FUNC_TIZEN(FUNCNAME, LIBNAME, FUNCTIONPOINTER) GET_REAL_FUNC_OSP(FUNCNAME, LIBNAME, FUNCTIONPOINTER)  \
+#define GET_REAL_FUNC_TIZEN(FUNCNAME, LIBNAME, FUNCTIONPOINTER) GET_REAL_FUNC_TISEN(FUNCNAME, LIBNAME, FUNCTIONPOINTER)        \
 
-#define PRE_PROBEBLOCK_OSP(FILTER)                                                                                             \
+#define PRE_PROBEBLOCK_TISEN(FILTER)                                                                                           \
        do {                                                                                                                                            \
                if((blockresult = preBlockBegin(CALLER_ADDRESS, FILTER, _sopt)) != 0) { \
                        setProbePoint(&probeInfo);                                      \
index e7ee558..8b9b941 100644 (file)
@@ -33,7 +33,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %manifest swap-probe.manifest
 %defattr(-,root,root,-)
-%{_prefix}/lib/da_probe_osp.so
+%{_prefix}/lib/da_probe_tizen.so
 %{_prefix}/lib/libdaprobe.so
 
 
index 4da7a3c..c5cc4a2 100755 (executable)
@@ -33,7 +33,7 @@
 #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"
@@ -485,7 +485,7 @@ result TouchFlickGestureDetector::AddFlickGestureEventListener(ITouchFlickGestur
        static methodType addflickgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui25TouchFlickGestureDetector28AddFlickGestureEventListenerERNS0_31ITouchFlickGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui25TouchFlickGestureDetector28AddFlickGestureEventListenerERNS0_31ITouchFlickGestureEventListenerE,
                        LIBOSP_UIFW, addflickgestureeventlistenerp);
 
        probeBlockStart();
@@ -513,7 +513,7 @@ result TouchLongPressGestureDetector::AddLongPressGestureEventListener(ITouchLon
        static methodType addlongpressgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui29TouchLongPressGestureDetector32AddLongPressGestureEventListenerERNS0_35ITouchLongPressGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui29TouchLongPressGestureDetector32AddLongPressGestureEventListenerERNS0_35ITouchLongPressGestureEventListenerE,
                        LIBOSP_UIFW, addlongpressgestureeventlistenerp);
 
        probeBlockStart();
@@ -541,7 +541,7 @@ result TouchPanningGestureDetector::AddPanningGestureEventListener(ITouchPanning
        static methodType addpanninggestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui27TouchPanningGestureDetector30AddPanningGestureEventListenerERNS0_33ITouchPanningGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui27TouchPanningGestureDetector30AddPanningGestureEventListenerERNS0_33ITouchPanningGestureEventListenerE,
                        LIBOSP_UIFW, addpanninggestureeventlistenerp);
 
        probeBlockStart();
@@ -569,7 +569,7 @@ result TouchPinchGestureDetector::AddPinchGestureEventListener(ITouchPinchGestur
        static methodType addpinchgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui25TouchPinchGestureDetector28AddPinchGestureEventListenerERNS0_31ITouchPinchGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui25TouchPinchGestureDetector28AddPinchGestureEventListenerERNS0_31ITouchPinchGestureEventListenerE,
                        LIBOSP_UIFW, addpinchgestureeventlistenerp);
 
        probeBlockStart();
@@ -597,7 +597,7 @@ result TouchRotationGestureDetector::AddRotationGestureEventListener(ITouchRotat
        static methodType addrotationgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui28TouchRotationGestureDetector31AddRotationGestureEventListenerERNS0_34ITouchRotationGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui28TouchRotationGestureDetector31AddRotationGestureEventListenerERNS0_34ITouchRotationGestureEventListenerE,
                        LIBOSP_UIFW, addrotationgestureeventlistenerp);
 
        probeBlockStart();
@@ -625,7 +625,7 @@ result TouchTapGestureDetector::AddTapGestureEventListener(ITouchTapGestureEvent
        static methodType addtapgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui23TouchTapGestureDetector26AddTapGestureEventListenerERNS0_29ITouchTapGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui23TouchTapGestureDetector26AddTapGestureEventListenerERNS0_29ITouchTapGestureEventListenerE,
                        LIBOSP_UIFW, addtapgestureeventlistenerp);
 
        probeBlockStart();
@@ -653,7 +653,7 @@ result TouchGestureDetector::AddGestureEventListener(ITouchGestureEventListener&
        static methodType addgestureeventlistenerp;
        result iret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui20TouchGestureDetector23AddGestureEventListenerERNS0_26ITouchGestureEventListenerE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui20TouchGestureDetector23AddGestureEventListenerERNS0_26ITouchGestureEventListenerE,
                        LIBOSP_UIFW, addgestureeventlistenerp);
 
        probeBlockStart();
similarity index 76%
rename from probe_badaapi/osp_constructor.cpp
rename to probe_tizenapi/tizen_constructor.cpp
index 371bfca..efbea65 100755 (executable)
@@ -31,7 +31,7 @@
 #include "daprobe.h"
 #include "dahelper.h"
 #include "dacollection.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 namespace Tizen { namespace Ui {
 
@@ -61,7 +61,7 @@ Control::Control(void)
        typedef void (Control::*methodType)(void);
        static methodType control_controlp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui7ControlC2Ev, LIBOSP_UIFW, control_controlp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui7ControlC2Ev, LIBOSP_UIFW, control_controlp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Control");
@@ -75,7 +75,7 @@ Control::~Control(void)
        typedef void (Control::*methodType)(void);
        static methodType control__controlvoidp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui7ControlD2Ev, LIBOSP_UIFW, control__controlvoidp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui7ControlD2Ev, LIBOSP_UIFW, control__controlvoidp);
 
        probeBlockStart();
        del_object_hash(static_cast<void*>(this));
@@ -89,7 +89,7 @@ CustomControlBase::CustomControlBase(void)
        typedef void (CustomControlBase::*methodType)(void);
        static methodType customcontrolbase_customcontrolbasep;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui17CustomControlBaseC2Ev, LIBOSP_UIFW, customcontrolbase_customcontrolbasep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui17CustomControlBaseC2Ev, LIBOSP_UIFW, customcontrolbase_customcontrolbasep);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "CustomControlBase");
@@ -103,7 +103,7 @@ Container::Container(void)
        typedef void (Container::*methodType)(void);
        static methodType container_containerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9ContainerC2Ev, LIBOSP_UIFW, container_containerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9ContainerC2Ev, LIBOSP_UIFW, container_containerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Container");
@@ -117,7 +117,7 @@ Window::Window(void)
        typedef void (Window::*methodType)(void);
        static methodType window_windowp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui6WindowC2Ev, LIBOSP_UIFW, window_windowp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui6WindowC2Ev, LIBOSP_UIFW, window_windowp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Window");
@@ -398,7 +398,7 @@ Animation::Animation(void)
        typedef void (Animation::*methodType)(void);
        static methodType animation_animationp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls9AnimationC2Ev, LIBOSP_UIFW, animation_animationp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls9AnimationC2Ev, LIBOSP_UIFW, animation_animationp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Animation");
@@ -412,7 +412,7 @@ Button::Button(void)
        typedef void (Button::*methodType)(void);
        static methodType button_buttonp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6ButtonC2Ev, LIBOSP_UIFW, button_buttonp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6ButtonC2Ev, LIBOSP_UIFW, button_buttonp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Button");
@@ -426,7 +426,7 @@ CheckButton::CheckButton(void)
        typedef void (CheckButton::*methodType)(void);
        static methodType checkbutton_checkbuttonp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls11CheckButtonC2Ev, LIBOSP_UIFW, checkbutton_checkbuttonp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls11CheckButtonC2Ev, LIBOSP_UIFW, checkbutton_checkbuttonp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "CheckButton");
@@ -440,7 +440,7 @@ ColorPicker::ColorPicker(void)
        typedef void (ColorPicker::*methodType)(void);
        static methodType colorpicker_colorpickerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls11ColorPickerC2Ev, LIBOSP_UIFW, colorpicker_colorpickerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls11ColorPickerC2Ev, LIBOSP_UIFW, colorpicker_colorpickerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ColorPicker");
@@ -454,7 +454,7 @@ CustomList::CustomList(void)
        typedef void (CustomList::*methodType)(void);
        static methodType customlist_customlistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10CustomListC2Ev, LIBOSP_UIFW, customlist_customlistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10CustomListC2Ev, LIBOSP_UIFW, customlist_customlistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "CustomList");
@@ -468,7 +468,7 @@ EditArea::EditArea(void)
        typedef void (EditArea::*methodType)(void);
        static methodType editarea_editareap;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8EditAreaC2Ev, LIBOSP_UIFW, editarea_editareap);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8EditAreaC2Ev, LIBOSP_UIFW, editarea_editareap);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "EditArea");
@@ -482,7 +482,7 @@ EditDate::EditDate(void)
        typedef void (EditDate::*methodType)(void);
        static methodType editdate_editdatep;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8EditDateC2Ev, LIBOSP_UIFW, editdate_editdatep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8EditDateC2Ev, LIBOSP_UIFW, editdate_editdatep);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "EditDate");
@@ -496,7 +496,7 @@ EditField::EditField(void)
        typedef void (EditField::*methodType)(void);
        static methodType editfield_editfieldp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls9EditFieldC2Ev, LIBOSP_UIFW, editfield_editfieldp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls9EditFieldC2Ev, LIBOSP_UIFW, editfield_editfieldp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "EditField");
@@ -510,7 +510,7 @@ EditTime::EditTime(void)
        typedef void (EditTime::*methodType)(void);
        static methodType edittime_edittimep;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8EditTimeC2Ev, LIBOSP_UIFW, edittime_edittimep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8EditTimeC2Ev, LIBOSP_UIFW, edittime_edittimep);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "EditTime");
@@ -524,7 +524,7 @@ ExpandableEditArea::ExpandableEditArea(void)
        typedef void (ExpandableEditArea::*methodType)(void);
        static methodType expandableeditarea_expandableeditareap;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls18ExpandableEditAreaC2Ev, LIBOSP_UIFW, expandableeditarea_expandableeditareap);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls18ExpandableEditAreaC2Ev, LIBOSP_UIFW, expandableeditarea_expandableeditareap);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ExpandableEditArea");
@@ -538,7 +538,7 @@ ExpandableList::ExpandableList(void)
        typedef void (ExpandableList::*methodType)(void);
        static methodType expandablelist_expandablelistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls14ExpandableListC2Ev, LIBOSP_UIFW, expandablelist_expandablelistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls14ExpandableListC2Ev, LIBOSP_UIFW, expandablelist_expandablelistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ExpandableList");
@@ -552,7 +552,7 @@ Footer::Footer(void)
        typedef void (Footer::*methodType)(void);
        static methodType footer_footerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6FooterC2Ev, LIBOSP_UIFW, footer_footerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6FooterC2Ev, LIBOSP_UIFW, footer_footerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Footer");
@@ -566,7 +566,7 @@ Gallery::Gallery(void)
        typedef void (Gallery::*methodType)(void);
        static methodType gallery_galleryp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls7GalleryC2Ev, LIBOSP_UIFW, gallery_galleryp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls7GalleryC2Ev, LIBOSP_UIFW, gallery_galleryp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Gallery");
@@ -580,7 +580,7 @@ GroupedList::GroupedList(void)
        typedef void (GroupedList::*methodType)(void);
        static methodType groupedlist_groupedlistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls11GroupedListC2Ev, LIBOSP_UIFW, groupedlist_groupedlistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls11GroupedListC2Ev, LIBOSP_UIFW, groupedlist_groupedlistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "GroupedList");
@@ -594,7 +594,7 @@ GroupedListView::GroupedListView(void)
        typedef void (GroupedListView::*methodType)(void);
        static methodType groupedlistview_groupedlistviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls15GroupedListViewC2Ev, LIBOSP_UIFW, groupedlistview_groupedlistviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls15GroupedListViewC2Ev, LIBOSP_UIFW, groupedlistview_groupedlistviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "GroupedListView");
@@ -608,7 +608,7 @@ Header::Header(void)
        typedef void (Header::*methodType)(void);
        static methodType header_headerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6HeaderC2Ev, LIBOSP_UIFW, header_headerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6HeaderC2Ev, LIBOSP_UIFW, header_headerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Header");
@@ -622,7 +622,7 @@ IconList::IconList(void)
        typedef void (IconList::*methodType)(void);
        static methodType iconlist_iconlistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8IconListC2Ev, LIBOSP_UIFW, iconlist_iconlistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8IconListC2Ev, LIBOSP_UIFW, iconlist_iconlistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "IconList");
@@ -636,7 +636,7 @@ IconListView::IconListView(void)
        typedef void (IconListView::*methodType)(void);
        static methodType iconlistview_iconlistviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls12IconListViewC2Ev, LIBOSP_UIFW, iconlistview_iconlistviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls12IconListViewC2Ev, LIBOSP_UIFW, iconlistview_iconlistviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "IconListView");
@@ -650,7 +650,7 @@ Label::Label(void)
        typedef void (Label::*methodType)(void);
        static methodType label_labelp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5LabelC2Ev, LIBOSP_UIFW, label_labelp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5LabelC2Ev, LIBOSP_UIFW, label_labelp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Label");
@@ -664,7 +664,7 @@ List::List(void)
        typedef void (List::*methodType)(void);
        static methodType list_listp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls4ListC2Ev, LIBOSP_UIFW, list_listp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls4ListC2Ev, LIBOSP_UIFW, list_listp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "List");
@@ -678,7 +678,7 @@ ListView::ListView(void)
        typedef void (ListView::*methodType)(void);
        static methodType listview_listviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8ListViewC2Ev, LIBOSP_UIFW, listview_listviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8ListViewC2Ev, LIBOSP_UIFW, listview_listviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ListView");
@@ -692,7 +692,7 @@ Progress::Progress(void)
        typedef void (Progress::*methodType)(void);
        static methodType progress_progressp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls8ProgressC2Ev, LIBOSP_UIFW, progress_progressp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls8ProgressC2Ev, LIBOSP_UIFW, progress_progressp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Progress");
@@ -706,7 +706,7 @@ RadioGroup::RadioGroup(void)
        typedef void (RadioGroup::*methodType)(void);
        static methodType radiogroup_radiogroupp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10RadioGroupC2Ev, LIBOSP_UIFW, radiogroup_radiogroupp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10RadioGroupC2Ev, LIBOSP_UIFW, radiogroup_radiogroupp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "RadioGroup");
@@ -720,7 +720,7 @@ SearchBar::SearchBar(void)
        typedef void (SearchBar::*methodType)(void);
        static methodType searchbar_searchbarp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls9SearchBarC2Ev, LIBOSP_UIFW, searchbar_searchbarp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls9SearchBarC2Ev, LIBOSP_UIFW, searchbar_searchbarp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "SearchBar");
@@ -734,7 +734,7 @@ SlidableGroupedList::SlidableGroupedList(void)
        typedef void (SlidableGroupedList::*methodType)(void);
        static methodType slidablegroupedlist_slidablegroupedlistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls19SlidableGroupedListC2Ev, LIBOSP_UIFW, slidablegroupedlist_slidablegroupedlistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls19SlidableGroupedListC2Ev, LIBOSP_UIFW, slidablegroupedlist_slidablegroupedlistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "SlidableGroupedList");
@@ -748,7 +748,7 @@ SlidableList::SlidableList(void)
        typedef void (SlidableList::*methodType)(void);
        static methodType slidablelist_slidablelistp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls12SlidableListC2Ev, LIBOSP_UIFW, slidablelist_slidablelistp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls12SlidableListC2Ev, LIBOSP_UIFW, slidablelist_slidablelistp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "SlidableList");
@@ -762,7 +762,7 @@ Slider::Slider(void)
        typedef void (Slider::*methodType)(void);
        static methodType slider_sliderp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6SliderC2Ev, LIBOSP_UIFW, slider_sliderp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6SliderC2Ev, LIBOSP_UIFW, slider_sliderp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Slider");
@@ -776,7 +776,7 @@ SplitPanel::SplitPanel(void)
        typedef void (SplitPanel::*methodType)(void);
        static methodType splitpanel_splitpanelp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10SplitPanelC2Ev, LIBOSP_UIFW, splitpanel_splitpanelp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10SplitPanelC2Ev, LIBOSP_UIFW, splitpanel_splitpanelp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "SplitPanel");
@@ -790,7 +790,7 @@ Tab::Tab(void)
        typedef void (Tab::*methodType)(void);
        static methodType tab_tabp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls3TabC2Ev, LIBOSP_UIFW, tab_tabp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls3TabC2Ev, LIBOSP_UIFW, tab_tabp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Tab");
@@ -804,7 +804,7 @@ TabBar::TabBar(void)
        typedef void (TabBar::*methodType)(void);
        static methodType tabbar_tabbarp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6TabBarC2Ev, LIBOSP_UIFW, tabbar_tabbarp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6TabBarC2Ev, LIBOSP_UIFW, tabbar_tabbarp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TabBar");
@@ -818,7 +818,7 @@ TextBox::TextBox(void)
        typedef void (TextBox::*methodType)(void);
        static methodType textbox_textboxp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls7TextBoxC2Ev, LIBOSP_UIFW, textbox_textboxp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls7TextBoxC2Ev, LIBOSP_UIFW, textbox_textboxp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TextBox");
@@ -832,7 +832,7 @@ Form::Form(void)
        typedef void (Form::*methodType)(void);
        static methodType form_formp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls4FormC2Ev, LIBOSP_UIFW, form_formp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls4FormC2Ev, LIBOSP_UIFW, form_formp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Form");
@@ -846,7 +846,7 @@ GroupedTableView::GroupedTableView(void)
        typedef void (GroupedTableView::*methodType)(void);
        static methodType groupedtableview_groupedtableviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls16GroupedTableViewC2Ev, LIBOSP_UIFW, groupedtableview_groupedtableviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls16GroupedTableViewC2Ev, LIBOSP_UIFW, groupedtableview_groupedtableviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "GroupedTableView");
@@ -860,7 +860,7 @@ Panel::Panel(void)
        typedef void (Panel::*methodType)(void);
        static methodType panel_panelp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5PanelC2Ev, LIBOSP_UIFW, panel_panelp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5PanelC2Ev, LIBOSP_UIFW, panel_panelp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Panel");
@@ -874,7 +874,7 @@ OverlayPanel::OverlayPanel(void)
        typedef void (OverlayPanel::*methodType)(void);
        static methodType overlaypanel_overlaypanelp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls12OverlayPanelC2Ev, LIBOSP_UIFW, overlaypanel_overlaypanelp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls12OverlayPanelC2Ev, LIBOSP_UIFW, overlaypanel_overlaypanelp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "OverlayPanel");
@@ -888,7 +888,7 @@ ScrollPanel::ScrollPanel(void)
        typedef void (ScrollPanel::*methodType)(void);
        static methodType scrollpanel_scrollpanelp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls11ScrollPanelC2Ev, LIBOSP_UIFW, scrollpanel_scrollpanelp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls11ScrollPanelC2Ev, LIBOSP_UIFW, scrollpanel_scrollpanelp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ScrollPanel");
@@ -902,7 +902,7 @@ SectionTableView::SectionTableView(void)
        typedef void (SectionTableView::*methodType)(void);
        static methodType sectiontableview_sectiontableviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls16SectionTableViewC2Ev, LIBOSP_UIFW, sectiontableview_sectiontableviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls16SectionTableViewC2Ev, LIBOSP_UIFW, sectiontableview_sectiontableviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "SectionTableView");
@@ -916,7 +916,7 @@ TableView::TableView(void)
        typedef void (TableView::*methodType)(void);
        static methodType tableview_tableviewp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls9TableViewC2Ev, LIBOSP_UIFW, tableview_tableviewp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls9TableViewC2Ev, LIBOSP_UIFW, tableview_tableviewp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableView");
@@ -930,7 +930,7 @@ TableViewItemBase::TableViewItemBase(void)
        typedef void (TableViewItemBase::*methodType)(void);
        static methodType tableviewitembase_tableviewitembasep;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls17TableViewItemBaseC2Ev, LIBOSP_UIFW, tableviewitembase_tableviewitembasep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls17TableViewItemBaseC2Ev, LIBOSP_UIFW, tableviewitembase_tableviewitembasep);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewItemBase");
@@ -944,7 +944,7 @@ TableViewContextItem::TableViewContextItem(void)
        typedef void (TableViewContextItem::*methodType)(void);
        static methodType tableviewcontextitem_tableviewcontextitemp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls20TableViewContextItemC2Ev, LIBOSP_UIFW, tableviewcontextitem_tableviewcontextitemp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls20TableViewContextItemC2Ev, LIBOSP_UIFW, tableviewcontextitem_tableviewcontextitemp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewContextItem");
@@ -958,7 +958,7 @@ TableViewGroupItem::TableViewGroupItem(void)
        typedef void (TableViewGroupItem::*methodType)(void);
        static methodType tableviewgroupitem_tableviewgroupitemp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls18TableViewGroupItemC2Ev, LIBOSP_UIFW, tableviewgroupitem_tableviewgroupitemp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls18TableViewGroupItemC2Ev, LIBOSP_UIFW, tableviewgroupitem_tableviewgroupitemp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewGroupItem");
@@ -972,7 +972,7 @@ TableViewItem::TableViewItem(void)
        typedef void (TableViewItem::*methodType)(void);
        static methodType tableviewitem_tableviewitemp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls13TableViewItemC2Ev, LIBOSP_UIFW, tableviewitem_tableviewitemp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls13TableViewItemC2Ev, LIBOSP_UIFW, tableviewitem_tableviewitemp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewItem");
@@ -986,7 +986,7 @@ TableViewSimpleGroupItem::TableViewSimpleGroupItem(void)
        typedef void (TableViewSimpleGroupItem::*methodType)(void);
        static methodType tableviewsimplegroupitem_tableviewsimplegroupitemp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls24TableViewSimpleGroupItemC2Ev, LIBOSP_UIFW, tableviewsimplegroupitem_tableviewsimplegroupitemp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls24TableViewSimpleGroupItemC2Ev, LIBOSP_UIFW, tableviewsimplegroupitem_tableviewsimplegroupitemp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewSimpleGroupItem");
@@ -1000,7 +1000,7 @@ TableViewSimpleItem::TableViewSimpleItem(void)
        typedef void (TableViewSimpleItem::*methodType)(void);
        static methodType tableviewsimpleitem_tableviewsimpleitemp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls19TableViewSimpleItemC2Ev, LIBOSP_UIFW, tableviewsimpleitem_tableviewsimpleitemp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls19TableViewSimpleItemC2Ev, LIBOSP_UIFW, tableviewsimpleitem_tableviewsimpleitemp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TableViewSimpleItem");
@@ -1014,7 +1014,7 @@ ContextMenu::ContextMenu(void)
        typedef void (ContextMenu::*methodType)(void);
        static methodType contextmenu_contextmenup;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls11ContextMenuC2Ev, LIBOSP_UIFW, contextmenu_contextmenup);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls11ContextMenuC2Ev, LIBOSP_UIFW, contextmenu_contextmenup);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "ContextMenu");
@@ -1028,7 +1028,7 @@ DatePicker::DatePicker(void)
        typedef void (DatePicker::*methodType)(void);
        static methodType datepicker_datepickerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10DatePickerC2Ev, LIBOSP_UIFW, datepicker_datepickerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10DatePickerC2Ev, LIBOSP_UIFW, datepicker_datepickerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "DatePicker");
@@ -1042,7 +1042,7 @@ DateTimePicker::DateTimePicker(void)
        typedef void (DateTimePicker::*methodType)(void);
        static methodType datetimepicker_datetimepickerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls14DateTimePickerC2Ev, LIBOSP_UIFW, datetimepicker_datetimepickerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls14DateTimePickerC2Ev, LIBOSP_UIFW, datetimepicker_datetimepickerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "DateTimePicker");
@@ -1056,7 +1056,7 @@ Frame::Frame(void)
        typedef void (Frame::*methodType)(void);
        static methodType frame_framep;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5FrameC2Ev, LIBOSP_UIFW, frame_framep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5FrameC2Ev, LIBOSP_UIFW, frame_framep);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Frame");
@@ -1070,7 +1070,7 @@ Keypad::Keypad(void)
        typedef void (Keypad::*methodType)(void);
        static methodType keypad_keypadp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls6KeypadC2Ev, LIBOSP_UIFW, keypad_keypadp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls6KeypadC2Ev, LIBOSP_UIFW, keypad_keypadp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Keypad");
@@ -1084,7 +1084,7 @@ MessageBox::MessageBox(void)
        typedef void (MessageBox::*methodType)(void);
        static methodType messagebox_messageboxp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10MessageBoxC2Ev, LIBOSP_UIFW, messagebox_messageboxp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10MessageBoxC2Ev, LIBOSP_UIFW, messagebox_messageboxp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "MessageBox");
@@ -1098,7 +1098,7 @@ OptionMenu::OptionMenu(void)
        typedef void (OptionMenu::*methodType)(void);
        static methodType optionmenu_optionmenup;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10OptionMenuC2Ev, LIBOSP_UIFW, optionmenu_optionmenup);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10OptionMenuC2Ev, LIBOSP_UIFW, optionmenu_optionmenup);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "OptionMenu");
@@ -1112,7 +1112,7 @@ Popup::Popup(void)
        typedef void (Popup::*methodType)(void);
        static methodType popup_popupp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5PopupC2Ev, LIBOSP_UIFW, popup_popupp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5PopupC2Ev, LIBOSP_UIFW, popup_popupp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Popup");
@@ -1126,7 +1126,7 @@ TimePicker::TimePicker(void)
        typedef void (TimePicker::*methodType)(void);
        static methodType timepicker_timepickerp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls10TimePickerC2Ev, LIBOSP_UIFW, timepicker_timepickerp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls10TimePickerC2Ev, LIBOSP_UIFW, timepicker_timepickerp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "TimePicker");
@@ -1152,7 +1152,7 @@ Web::Web(void)
        typedef void (Web::*methodType)(void);
        static methodType web_webp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3Web8Controls3WebC2Ev, LIBOSP_WEB, web_webp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3Web8Controls3WebC2Ev, LIBOSP_WEB, web_webp);
 
        probeBlockStart();
        add_object_hash_type((void*)this, "Web");
similarity index 89%
rename from probe_badaapi/osp_controls.cpp
rename to probe_tizenapi/tizen_controls.cpp
index 41a8661..9e0b987 100755 (executable)
@@ -37,7 +37,7 @@
 #include "daprobe.h"
 #include "dacollection.h"
 #include "dahelper.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 #include "binproto.h"
 
@@ -58,7 +58,7 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame)
        probeInfo_t     probeInfo;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App5UiApp8AddFrameERKNS_2Ui8Controls5FrameE, LIBOSP_UIFW, uiapp_addframep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App5UiApp8AddFrameERKNS_2Ui8Controls5FrameE, LIBOSP_UIFW, uiapp_addframep);
 
        ret = (this->*uiapp_addframep)(frame);
 
@@ -95,7 +95,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame)
        result ret;
        bool bOption;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App5UiApp11RemoveFrameERKNS_2Ui8Controls5FrameE, LIBOSP_UIFW, uiapp_removeframep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App5UiApp11RemoveFrameERKNS_2Ui8Controls5FrameE, LIBOSP_UIFW, uiapp_removeframep);
 
        probeBlockStart();
        
@@ -143,7 +143,7 @@ bool Control::IsInTouchMode(void) const
        typedef bool (Control::*methodType)(void) const;
        static methodType control_isintouchmodep;
 
-       GET_REAL_FUNC_OSP(_ZNK5Tizen2Ui7Control13IsInTouchModeEv, LIBOSP_UIFW, control_isintouchmodep);
+       GET_REAL_FUNC_TIZEN(_ZNK5Tizen2Ui7Control13IsInTouchModeEv, LIBOSP_UIFW, control_isintouchmodep);
 
        probeBlockStart();
        add_object_hash_class((void*)(this), typeid(*this).name());
@@ -158,7 +158,7 @@ void Control::SetName(const Tizen::Base::String &name)
        static methodType control_setnamep;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui7Control7SetNameERKNS_4Base6StringE, LIBOSP_UIFW, control_setnamep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui7Control7SetNameERKNS_4Base6StringE, LIBOSP_UIFW, control_setnamep);
 
        (this->*control_setnamep)(name);
 
@@ -189,7 +189,7 @@ result Container::AddControl(const Control &control)
        probeInfo_t     probeInfo;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container10AddControlERKNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container10AddControlERKNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp);
 
        probeBlockStart();
        if(unlikely(IsRegisteredFrameAnimatorEventListener == false))
@@ -247,7 +247,7 @@ result Container::AddControl(Control* control)
        probeInfo_t     probeInfo;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container10AddControlEPNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container10AddControlEPNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp);
 
        probeBlockStart();
        if(unlikely(IsRegisteredFrameAnimatorEventListener == false))
@@ -306,7 +306,7 @@ result Container::RemoveControl(const Control &control)
        result ret;
        bool bOption;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container13RemoveControlERKNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlERKNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp);
 
        probeBlockStart();
 
@@ -351,7 +351,7 @@ result Container::RemoveControl(Control* control)
        result ret;
        bool bOption;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container13RemoveControlEPNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEPNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp);
 
        probeBlockStart();
 
@@ -396,7 +396,7 @@ result Container::RemoveControl(int index)
        result ret;
        bool bOption;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container13RemoveControlEi, LIBOSP_UIFW, container_removecontrolip);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEi, LIBOSP_UIFW, container_removecontrolip);
 
        probeBlockStart();
 
@@ -440,7 +440,7 @@ void Container::RemoveAllControls(void)
        static methodType container_removeallcontrolp;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container17RemoveAllControlsEv, LIBOSP_UIFW, container_removeallcontrolp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container17RemoveAllControlsEv, LIBOSP_UIFW, container_removeallcontrolp);
 
        probeBlockStart();
        if(isOptionEnabled(OPT_UI))
similarity index 88%
rename from probe_badaapi/bada_lifecycle.cpp
rename to probe_tizenapi/tizen_lifecycle.cpp
index c493fe4..d82e095 100755 (executable)
@@ -38,7 +38,7 @@
 #include "daprobe.h"
 #include "dahelper.h"
 #include "probeinfo.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 #include "binproto.h"
 extern "C"
@@ -87,7 +87,7 @@ result UiApp::Execute(UiAppInstanceFactory pUiAppFactory,
        int __attribute__((unused)) ret;
        Ecore_Event_Handler* handler;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App5UiApp7ExecuteEPFPS1_vEPKNS_4Base10Collection5IListE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App5UiApp7ExecuteEPFPS1_vEPKNS_4Base10Collection5IListE,
                LIBOSP_UIFW, uiapp_executep);
 
        probeBlockStart();
@@ -123,7 +123,7 @@ void _AppImpl::OnTerminate(void* user_data)
        static methodType appimpl_onterminatep;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App8_AppImpl11OnTerminateEPv, LIBOSP_APPFW, appimpl_onterminatep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App8_AppImpl11OnTerminateEPv, LIBOSP_APPFW, appimpl_onterminatep);
 
        probeBlockStart();
        setProbePoint(&probeInfo);
@@ -145,7 +145,7 @@ void _AppImpl::OnDeviceOrientationChanged(app_device_orientation_e orientation,
        typedef void (*methodType)(app_device_orientation_e, void*);
        static methodType appimpl_ondeviceorientationchangedp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App8_AppImpl26OnDeviceOrientationChangedE24app_device_orientation_ePv,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App8_AppImpl26OnDeviceOrientationChangedE24app_device_orientation_ePv,
                        LIBOSP_APPFW, appimpl_ondeviceorientationchangedp);
 
        probeBlockStart();
@@ -161,7 +161,7 @@ void _AppInfo::SetAppState(AppState appState)
        static methodType appinfo_setappstatep;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App8_AppInfo11SetAppStateENS0_8AppStateE, LIBOSP_APPFW, appinfo_setappstatep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App8_AppInfo11SetAppStateENS0_8AppStateE, LIBOSP_APPFW, appinfo_setappstatep);
 
        probeBlockStart();
        if(appState == RUNNING)
@@ -186,7 +186,7 @@ void _UiAppImpl::OnBackground(void)
        static methodType uiappimpl_onbackgroundp;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App10_UiAppImpl12OnBackgroundEv, LIBOSP_UIFW, uiappimpl_onbackgroundp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App10_UiAppImpl12OnBackgroundEv, LIBOSP_UIFW, uiappimpl_onbackgroundp);
 
        probeBlockStart();
        SCREENSHOT_LOCK();
@@ -210,7 +210,7 @@ void _UiAppImpl::OnForeground(void)
        static methodType uiappimpl_onforegroundp;
        probeInfo_t     probeInfo;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen3App10_UiAppImpl12OnForegroundEv, LIBOSP_UIFW, uiappimpl_onforegroundp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen3App10_UiAppImpl12OnForegroundEv, LIBOSP_UIFW, uiappimpl_onforegroundp);
 
        probeBlockStart();
        setProbePoint(&probeInfo);
@@ -235,7 +235,7 @@ void _UiAppImpl::OnDeviceOrientationChanged(app_device_orientation_e orientation
        typedef void (*methodType)(_UiAppImpl* th, app_device_orientation_e orientation);
        static methodType uiappimpl_ondeviceorientationchangedp;
 
-       GET_REAL_FUNC_OSP(_ZThn4_N5Tizen3App10_UiAppImpl26OnDeviceOrientationChangedE24app_device_orientation_e,
+       GET_REAL_FUNC_TIZEN(_ZThn4_N5Tizen3App10_UiAppImpl26OnDeviceOrientationChangedE24app_device_orientation_e,
                        LIBOSP_UIFW, uiappimpl_ondeviceorientationchangedp);
 
        probeBlockStart();
similarity index 93%
rename from probe_badaapi/bada_sync.cpp
rename to probe_tizenapi/tizen_sync.cpp
index c339002..1f111bf 100755 (executable)
@@ -89,7 +89,7 @@ result Mutex::Create(void) {
                                  API_ID_result_Mutex__Create_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_NEW);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -145,7 +145,7 @@ result Mutex::Create(const Tizen::Base::String& name) {
                                  API_ID_result_Mutex__Create_const_Tizen__Base__String__name_,
                                  "s", temp);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_NEW);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -198,7 +198,7 @@ result Mutex::Release(void) {
                                  API_ID_result_Mutex__Release_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_RELEASE);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -245,7 +245,7 @@ result Mutex::Acquire(void) {
                                  API_ID_result_Mutex__Acquire_void_,
                                  "", 0);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -261,7 +261,7 @@ result Mutex::Acquire(void) {
                                  API_ID_result_Mutex__Acquire_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -314,7 +314,7 @@ result Mutex::TryToAcquire(void) {
                                  API_ID_result_Mutex__TryToAcquire_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_TRY_ACQUIRE);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_TRY_ACQUIRE);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -368,7 +368,7 @@ result Semaphore::Create(int count) {
                                  API_ID_result_Semaphore__Create_int_count_,
                                  "d", count);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_NEW);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -424,7 +424,7 @@ result Semaphore::Create(const Tizen::Base::String& name, int count) {
                                  API_ID_result_Semaphore__Create_const_Tizen__Base__String__name__int_count_,
                                  "sd", temp, count);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_NEW);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -472,7 +472,7 @@ result Semaphore::Acquire(long timeout) {
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
                                  "x", timeout);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -488,7 +488,7 @@ result Semaphore::Acquire(long timeout) {
                                  API_ID_result_Semaphore__Acquire_long_timeout_,
                                  "x", timeout);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -541,7 +541,7 @@ result Semaphore::TryToAcquire(void) {
                                  API_ID_result_Semaphore__TryToAcquire_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_TRY_ACQUIRE);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_TRY_ACQUIRE);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -594,7 +594,7 @@ result Semaphore::Release(void) {
                                  API_ID_result_Semaphore__Release_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_RELEASE);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -647,7 +647,7 @@ result Monitor::Construct(void) {
                                  API_ID_result_Monitor__Construct_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NEW);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -694,7 +694,7 @@ result Monitor::Enter(void) {
                                  API_ID_result_Monitor__Enter_void_,
                                  "", 0);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_ACQUIRE_WAIT_START);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -710,7 +710,7 @@ result Monitor::Enter(void) {
                                  API_ID_result_Monitor__Enter_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_ACQUIRE_WAIT_END);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -763,7 +763,7 @@ result Monitor::Exit(void) {
                                   API_ID_result_Monitor__Exit_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_RELEASE);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_RELEASE);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -810,7 +810,7 @@ result Monitor::Wait(void) {
                                  API_ID_result_Monitor__Wait_void_,
                                  "", 0);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_COND_WAIT_START);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -826,7 +826,7 @@ result Monitor::Wait(void) {
                                  API_ID_result_Monitor__Wait_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_COND_WAIT_END);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -879,7 +879,7 @@ result Monitor::Notify(void) {
                                  API_ID_result_Monitor__Notify_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NOTIFY);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -932,7 +932,7 @@ result Monitor::NotifyAll(void) {
                                  API_ID_result_Monitor__NotifyAll_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_SYNC((unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NOTIFY_ALL);
+               PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY_ALL);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
similarity index 94%
rename from probe_badaapi/bada_thread.cpp
rename to probe_tizenapi/tizen_thread.cpp
index d237838..6361846 100755 (executable)
@@ -107,7 +107,7 @@ private:
 //             //PCAddr,errno,InternalCall,size,FD,FDType,FDApiType,FileSize,FilePath
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,%ld`,%d`,0`,%u`,0x%x`,%d`,%d`,`,", res,blockresult,
-//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -164,7 +164,7 @@ _ThreadImpl::ThreadProc(void* params) {
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
                                  "p", params);
                PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
-               PACK_THREAD((unsigned int)pThread, THREAD_OSPTHREAD_WORKER, THREAD_API_INTERNAL_START);
+               PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -188,7 +188,7 @@ _ThreadImpl::ThreadProc(void* params) {
                                  API_ID_void___ThreadImpl__ThreadProc_void__params_,
                                  "p", params);
                PACK_COMMON_END((unsigned int)pSelf, 0, blockresult);
-               PACK_THREAD((unsigned int)pThread, THREAD_OSPTHREAD_WORKER, THREAD_API_INTERNAL_STOP);
+               PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_STOP);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -243,7 +243,7 @@ _ThreadImpl::ThreadProc(void* params) {
 //             //PCAddr,errno,InternalCall,size,FD,FDType,FDApiType,FileSize,FilePath
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,%ld`,%d`,0`,%u`,0x%x`,%d`,%d`,`,", ret, blockresult,
-//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_CLOSE);
+//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_CLOSE);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -302,7 +302,7 @@ _ThreadImpl::ThreadProc(void* params) {
 //             //PCAddr,errno,InternalCall,size,FD,FDType,FDApiType,FileSize,FilePath
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,%ld`,%d`,0`,%u`,0x%x`,%d`,%d`,`,", ret, blockresult,
-//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_CLOSE);
+//                             (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_CLOSE);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -361,7 +361,7 @@ _ThreadImpl::ThreadProc(void* params) {
 //
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,0`,%d`,0`,0x%x`,%d`,%d`,`,", blockresult,
-//                             (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_OPEN);
+//                             (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OPEN);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -420,7 +420,7 @@ _ThreadImpl::ThreadProc(void* params) {
 //
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,0`,%d`,0`,0x%x`,%d`,%d`,`,", blockresult,
-//                             (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_CLOSE);
+//                             (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_CLOSE);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -471,7 +471,7 @@ result Thread::Sleep(long milliSeconds) {
                                  API_ID_result_Thread__Sleep_long_milliSeconds_,
                                  "x", milliSeconds);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_THREAD((unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_START);
+               PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -490,7 +490,7 @@ result Thread::Sleep(long milliSeconds) {
                                  API_ID_result_Thread__Yield_void_,
                                  "x", milliSeconds);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_END);
+               PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -543,7 +543,7 @@ Thread* Thread::GetCurrentThread(void) {
                                  API_ID_Thread__Thread__GetCurrentThread_void_,
                                  "", 0);
                PACK_COMMON_END((unsigned int)currentThread, res, blockresult);
-               PACK_THREAD((unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+               PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -597,7 +597,7 @@ result Thread::Yield(void) {
                                  API_ID_result_Thread__Yield_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+               PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -646,7 +646,7 @@ result Thread::Exit(int exitCode) {
                                  API_ID_result_Thread__Exit_int_exitCode_,
                                  "d", exitCode);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_THREAD((unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_EXIT);
+               PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_EXIT);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -706,7 +706,7 @@ result Thread::Construct(ThreadType threadType, long stackSize,
                                  API_ID_result_Thread__Construct_ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
                                  "dxd", threadType, stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -757,7 +757,7 @@ result Thread::Construct(long stackSize, ThreadPriority priority) {
                                  API_ID_result_Thread__Construct_long_stackSize__ThreadPriority_priority_,
                                  "xd", stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -814,7 +814,7 @@ result Thread::Construct(const Tizen::Base::String &name, long stackSize,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
                                  "sxd", temp, stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -873,7 +873,7 @@ result Thread::Construct(const Tizen::Base::String &name, ThreadType threadType,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__ThreadType_threadType__long_stackSize__ThreadPriority_priority_,
                                  "sdxd", temp, threadType, stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -929,7 +929,7 @@ result Thread::Construct(IRunnable &target, long stackSize,
                                  API_ID_result_Thread__Construct_IRunnable__target__long_stackSize__ThreadPriority_priority_,
                                  "xxd", (unsigned int) &target, stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -988,7 +988,7 @@ result Thread::Construct(const Tizen::Base::String &name, IRunnable &target,
                                  API_ID_result_Thread__Construct_const_Tizen__Base__String__name__IRunnable__target__long_stackSize__ThreadPriority_priority_,
                                  "sxxd", temp, (unsigned int) &target, stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1042,7 +1042,7 @@ result Thread::GetExitCode(int &exitCode) const {
                                  API_ID_result_Thread__GetExitCode_int__exitCode__const,
                                  "d", exitCode);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1097,7 +1097,7 @@ const Tizen::Base::String & Thread::GetName(void) const {
                                  API_ID_const_Tizen__Base__String___Thread__GetName_void__const,
                                  "", 0);
                PACK_COMMON_END(ret.GetPointer(), res, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1143,7 +1143,7 @@ result Thread::Join(void) {
                                  API_ID_result_Thread__Join_void_,
                                  "", 0);
                PACK_COMMON_END(0, 0, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_START);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START);
                FLUSH_LOCAL_BUF();
 
                preBlockEnd();
@@ -1159,7 +1159,7 @@ result Thread::Join(void) {
                                  API_ID_result_Thread__Join_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_END);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1233,7 +1233,7 @@ result Thread::Join(void) {
 //
 //             log.length += sprintf(log.data + log.length,
 //                             "`,0`,0`,%d`,0`,0x%x`,%d`,%d`,`,", blockresult,
-//                             (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER);
+//                             (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER);
 //             //callstack
 //             log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,");
 //             getBacktraceString(&log, 4096 - log.length - 17);
@@ -1288,7 +1288,7 @@ result Thread::Start(void) {
                                  API_ID_result_Thread__Start_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_START);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_START);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1338,7 +1338,7 @@ result Thread::Stop(void) {
                                  API_ID_result_Thread__Stop_void_,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_STOP);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_STOP);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1390,7 +1390,7 @@ result EventDrivenThread::Construct(long stackSize, ThreadPriority priority) {
                                  API_ID_result_EventDrivenThread__Construct_long_stackSize__ThreadPriority_priority_,
                                  "xd", stackSize, priority);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1450,7 +1450,7 @@ result EventDrivenThread::Construct(const Tizen::Base::String &name, long stackS
                                  API_ID_result_EventDrivenThread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_,
                                  "sx", temp, stackSize);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_NEW);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
@@ -1502,7 +1502,7 @@ result EventDrivenThread::Quit() {
                                  API_ID_result_EventDrivenThread__Quit__,
                                  "", 0);
                PACK_COMMON_END(ret, ret, blockresult);
-               PACK_THREAD((unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_STOP);
+               PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_STOP);
                FLUSH_LOCAL_BUF();
 
                postBlockEnd();
similarity index 94%
rename from probe_ui/osp_capture.cpp
rename to probe_ui/tizen_capture.cpp
index f120e0c..3ad6bfc 100755 (executable)
@@ -40,7 +40,7 @@
 #include "dacollection.h"
 #include "daerror.h"
 //#include "da_ui.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Ui;
@@ -237,7 +237,7 @@ void _EcoreEvasMgr::SetEcoreEvas(const _EcoreEvas& ecoreevas)
        typedef void (_EcoreEvasMgr::*methodType)(const _EcoreEvas& ecoreevas);
        static methodType _ecoreevasmgr_setecoreevasp;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui13_EcoreEvasMgr12SetEcoreEvasERKNS0_10_EcoreEvasE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui13_EcoreEvasMgr12SetEcoreEvasERKNS0_10_EcoreEvasE,
                        LIBOSP_UIFW, _ecoreevasmgr_setecoreevasp);
 
        probeBlockStart();
@@ -255,7 +255,7 @@ result Control::SetShowState(bool state)
        static methodType control_setshowstatep;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui7Control12SetShowStateEb,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui7Control12SetShowStateEb,
                        LIBOSP_UIFW, control_setshowstatep);
 
        ret = (this->*control_setshowstatep)(state);
@@ -293,7 +293,7 @@ result Frame::SetCurrentForm(const Form& form)
        static methodType frame_setcurrentformp;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5Frame14SetCurrentFormERKNS1_4FormE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5Frame14SetCurrentFormERKNS1_4FormE,
                        LIBOSP_UIFW, frame_setcurrentformp);
 
        ret = (this->*frame_setcurrentformp)(form);
@@ -312,7 +312,7 @@ result Frame::SetCurrentForm(Form* pForm)
        static methodType frame_setcurrentformp;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui8Controls5Frame14SetCurrentFormEPNS1_4FormE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui8Controls5Frame14SetCurrentFormEPNS1_4FormE,
                        LIBOSP_UIFW, frame_setcurrentformp);
 
        ret = (this->*frame_setcurrentformp)(pForm);
@@ -336,7 +336,7 @@ result FrameAnimator::SetCurrentForm(const Tizen::Ui::Controls::Form& form)
        static methodType frameanimator_setcurrentformp;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations13FrameAnimator14SetCurrentFormERKNS0_8Controls4FormE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations13FrameAnimator14SetCurrentFormERKNS0_8Controls4FormE,
                        LIBOSP_UIFW, frameanimator_setcurrentformp);
 
        ret = (this->*frameanimator_setcurrentformp)(form);
@@ -355,7 +355,7 @@ result FrameAnimator::SetCurrentForm(Tizen::Ui::Controls::Form* pForm)
        static methodType frameanimator_setcurrentformp;
        result ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations13FrameAnimator14SetCurrentFormEPNS0_8Controls4FormE,
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations13FrameAnimator14SetCurrentFormEPNS0_8Controls4FormE,
                        LIBOSP_UIFW, frameanimator_setcurrentformp);
 
        ret = (this->*frameanimator_setcurrentformp)(pForm);
similarity index 76%
rename from probe_ui/osp_display.cpp
rename to probe_ui/tizen_display.cpp
index 5eed0a9..aa0e695 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "daprobe.h"
 #include "dahelper.h"
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 namespace Tizen { namespace Ui { namespace Animations {
 
@@ -25,7 +25,7 @@ bool _DisplayManager::RenderAll(bool check)
        static methodtype mp;
        bool ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations15_DisplayManager9RenderAllEb, LIBOSP_UIFW, mp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations15_DisplayManager9RenderAllEb, LIBOSP_UIFW, mp);
        probeBlockStart();
        probeBlockEnd();
 
@@ -43,7 +43,7 @@ bool _DisplayManager::Render(_RootVisualElement& root, bool check)
        static methodtype mp;
        bool ret;
        
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations15_DisplayManager6RenderERNS1_18_RootVisualElementEb, LIBOSP_UIFW, mp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations15_DisplayManager6RenderERNS1_18_RootVisualElementEb, LIBOSP_UIFW, mp);
        probeBlockStart();
        probeBlockEnd();
        ret = (this->*mp)(root, check);
@@ -59,7 +59,7 @@ result _DisplayManager::PostRender(_RootVisualElement& root)
        static methodtype mp;
        result ret;
        
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations15_DisplayManager10PostRenderERNS1_18_RootVisualElementE, LIBOSP_UIFW, mp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations15_DisplayManager10PostRenderERNS1_18_RootVisualElementE, LIBOSP_UIFW, mp);
        probeBlockStart();
        probeBlockEnd();
 
@@ -78,7 +78,7 @@ result _DisplayManager::Flush(void)
        static methodtype mp;
        result ret;
        
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations15_DisplayManager5FlushEv, LIBOSP_UIFW, mp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations15_DisplayManager5FlushEv, LIBOSP_UIFW, mp);
        probeBlockStart();
        probeBlockEnd();
        ret = (this->*mp)();
@@ -94,7 +94,7 @@ bool _DisplayManager::UpdateScene(bool force)
        static methodtype mp;
        bool ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui10Animations15_DisplayManager11UpdateSceneEb, LIBOSP_UIFW, mp);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui10Animations15_DisplayManager11UpdateSceneEb, LIBOSP_UIFW, mp);
        probeBlockStart();
        probeBlockEnd();
        ret = (this->*mp)(force);
similarity index 98%
rename from probe_ui/osp_frameani.cpp
rename to probe_ui/tizen_frameani.cpp
index 74d8b3c..3e9bfdf 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "daprobe.h"
 #include "dahelper.h"
-#include "osp_frameani.h"
+#include "tizen_frameani.h"
 
 DAFrameAnimationEventListener DAFrameAnimationEventListener::rInstance;
 
similarity index 95%
rename from probe_ui/osp_frameani.h
rename to probe_ui/tizen_frameani.h
index e8001a6..07beba6 100644 (file)
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef __OSP_FRAMEANI_H__
-#define __OSP_FRAMEANI_H__
+#ifndef __TIZEN_FRAMEANI_H__
+#define __TIZEN_FRAMEANI_H__
 
 #include <FUi.h>
 
@@ -54,5 +54,5 @@ private:
 };
 
 
-#endif // __OSP_FRAMEANI_H__
+#endif // __TIZEN_FRAMEANI_H__
 
similarity index 96%
rename from probe_ui/osp_scenemanager.cpp
rename to probe_ui/tizen_scenemanager.cpp
index 2c80cbe..cfbe326 100755 (executable)
@@ -37,7 +37,7 @@
 #include "daprobe.h"
 #include "dacollection.h"      // for find_object_hash
 #include "dahelper.h"          // for captureScreen
-#include "osp_probe.h"
+#include "tizen_probe.h"
 
 #include "binproto.h"
 
@@ -137,7 +137,7 @@ SceneManager* SceneManager::GetInstance(void)
        static int initialized = 0;
        SceneManager* ret;
 
-       GET_REAL_FUNC_OSP(_ZN5Tizen2Ui6Scenes12SceneManager11GetInstanceEv, LIBOSP_UIFW, scenemanager_getinstancep);
+       GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui6Scenes12SceneManager11GetInstanceEv, LIBOSP_UIFW, scenemanager_getinstancep);
 
        ret = scenemanager_getinstancep();