From 64df7f4b5e5b1ff8c810c765e647161ef6f46924 Mon Sep 17 00:00:00 2001 From: woojin Date: Thu, 22 Aug 2013 20:46:15 +0900 Subject: [PATCH] renaming : tizen -> capi, osp -> tizen Change-Id: I52c1c44dbaa5d7606eff4fbd9d889891fb5d531d --- Makefile | 60 +++++------ helper/libdaprobe.c | 6 +- include/probeinfo.h | 10 +- include/{osp_probe.h => tizen_probe.h} | 4 +- packaging/dynamic-analysis-probe.spec | 2 +- .../tizen_appfw.c => probe_capi/capi_appfw.c | 0 probe_event/gesture.cpp | 16 +-- .../tizen_constructor.cpp | 120 ++++++++++----------- .../tizen_controls.cpp | 60 +++++------ .../bada_file.cpp => probe_tizenapi/tizen_file.cpp | 0 .../tizen_lifecycle.cpp | 16 +-- .../bada_sync.cpp => probe_tizenapi/tizen_sync.cpp | 40 +++---- .../tizen_thread.cpp | 100 ++++++++--------- probe_ui/{tizen_capture.c => capi_capture.c} | 0 probe_ui/{osp_capture.cpp => tizen_capture.cpp} | 14 +-- probe_ui/{osp_display.cpp => tizen_display.cpp} | 12 +-- probe_ui/{osp_frameani.cpp => tizen_frameani.cpp} | 2 +- probe_ui/{osp_frameani.h => tizen_frameani.h} | 6 +- ...osp_scenemanager.cpp => tizen_scenemanager.cpp} | 4 +- 19 files changed, 236 insertions(+), 236 deletions(-) rename include/{osp_probe.h => tizen_probe.h} (94%) rename probe_tizenapi/tizen_appfw.c => probe_capi/capi_appfw.c (100%) rename probe_badaapi/osp_constructor.cpp => probe_tizenapi/tizen_constructor.cpp (76%) rename probe_badaapi/osp_controls.cpp => probe_tizenapi/tizen_controls.cpp (83%) rename probe_badaapi/bada_file.cpp => probe_tizenapi/tizen_file.cpp (100%) rename probe_badaapi/bada_lifecycle.cpp => probe_tizenapi/tizen_lifecycle.cpp (87%) rename probe_badaapi/bada_sync.cpp => probe_tizenapi/tizen_sync.cpp (94%) rename probe_badaapi/bada_thread.cpp => probe_tizenapi/tizen_thread.cpp (92%) rename probe_ui/{tizen_capture.c => capi_capture.c} (100%) rename probe_ui/{osp_capture.cpp => tizen_capture.cpp} (94%) rename probe_ui/{osp_display.cpp => tizen_display.cpp} (76%) rename probe_ui/{osp_frameani.cpp => tizen_frameani.cpp} (98%) rename probe_ui/{osp_frameani.h => tizen_frameani.h} (95%) rename probe_ui/{osp_scenemanager.cpp => tizen_scenemanager.cpp} (97%) diff --git a/Makefile b/Makefile index b5913e4..5eb5adf 100644 --- 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,63 +41,63 @@ 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_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_capi.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) -DTIZENAPP 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) +$(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 diff --git a/helper/libdaprobe.c b/helper/libdaprobe.c index 0e3148e..906ff4b 100755 --- a/helper/libdaprobe.c +++ b/helper/libdaprobe.c @@ -53,7 +53,7 @@ #include "da_sync.h" #define APP_INSTALL_PATH "/opt/apps" -#define OSP_APP_POSTFIX ".exe" +#define TIZEN_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 TIZENAPP + substr = strstr(tracestring, TIZEN_APP_POSTFIX); if(substr == NULL) return 1; #endif diff --git a/include/probeinfo.h b/include/probeinfo.h index da01d48..0fe5e8b 100755 --- a/include/probeinfo.h +++ b/include/probeinfo.h @@ -102,8 +102,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 @@ -115,9 +115,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 diff --git a/include/osp_probe.h b/include/tizen_probe.h similarity index 94% rename from include/osp_probe.h rename to include/tizen_probe.h index baeb3f2..7dd32bc 100755 --- a/include/osp_probe.h +++ b/include/tizen_probe.h @@ -38,7 +38,7 @@ extern "C" { #endif -#define GET_REAL_FUNC_OSP(FUNCNAME, LIBNAME, FUNCTIONPOINTER) \ +#define GET_REAL_FUNC_TIZEN(FUNCNAME, LIBNAME, FUNCTIONPOINTER) \ do { \ if(!FUNCTIONPOINTER) { \ probeBlockStart(); \ @@ -61,7 +61,7 @@ extern "C" { } \ } while(0) -#define PRE_PROBEBLOCK_OSP(FILTER) \ +#define PRE_PROBEBLOCK_TIZEN(FILTER) \ do { \ if((blockresult = preBlockBegin(CALLER_ADDRESS, FILTER, _sopt)) != 0) { \ setProbePoint(&probeInfo); \ diff --git a/packaging/dynamic-analysis-probe.spec b/packaging/dynamic-analysis-probe.spec index f0e57a9..803f4b8 100644 --- a/packaging/dynamic-analysis-probe.spec +++ b/packaging/dynamic-analysis-probe.spec @@ -33,7 +33,7 @@ rm -rf ${RPM_BUILD_ROOT} %files %manifest dynamic-analysis-probe.manifest %defattr(-,root,root,-) -%{_prefix}/lib/da_probe_osp.so +%{_prefix}/lib/da_probe_tizen.so %{_prefix}/lib/libdaprobe.so diff --git a/probe_tizenapi/tizen_appfw.c b/probe_capi/capi_appfw.c similarity index 100% rename from probe_tizenapi/tizen_appfw.c rename to probe_capi/capi_appfw.c diff --git a/probe_event/gesture.cpp b/probe_event/gesture.cpp index 103e27e..371a8d6 100755 --- a/probe_event/gesture.cpp +++ b/probe_event/gesture.cpp @@ -31,7 +31,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" @@ -457,7 +457,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(); @@ -485,7 +485,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(); @@ -513,7 +513,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(); @@ -541,7 +541,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(); @@ -569,7 +569,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(); @@ -597,7 +597,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(); @@ -625,7 +625,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(); diff --git a/probe_badaapi/osp_constructor.cpp b/probe_tizenapi/tizen_constructor.cpp similarity index 76% rename from probe_badaapi/osp_constructor.cpp rename to probe_tizenapi/tizen_constructor.cpp index 1d7de3f..c22f536 100755 --- a/probe_badaapi/osp_constructor.cpp +++ b/probe_tizenapi/tizen_constructor.cpp @@ -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(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"); diff --git a/probe_badaapi/osp_controls.cpp b/probe_tizenapi/tizen_controls.cpp similarity index 83% rename from probe_badaapi/osp_controls.cpp rename to probe_tizenapi/tizen_controls.cpp index 5261060..076511b 100755 --- a/probe_badaapi/osp_controls.cpp +++ b/probe_tizenapi/tizen_controls.cpp @@ -35,13 +35,13 @@ #include "daprobe.h" #include "dacollection.h" #include "dahelper.h" -#include "osp_probe.h" +#include "tizen_probe.h" using namespace Tizen::Ui; using namespace Tizen::Ui::Controls; using namespace Tizen::Ui::Animations; -#define APPEND_LOG_CONTROL_OSP(CONTROL) \ +#define APPEND_LOG_CONTROL_TIZEN(CONTROL) \ do { \ if(unlikely(CONTROL == NULL)) { \ log.length += sprintf(log.data + log.length, "`,`,`,"); \ @@ -70,7 +70,7 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame) DECLARE_COMMON_VARIABLE; 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); @@ -86,8 +86,8 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddFrame"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(parent); - APPEND_LOG_CONTROL_OSP(&frame); + APPEND_LOG_CONTROL_TIZEN(parent); + APPEND_LOG_CONTROL_TIZEN(&frame); printLog(&log, MSG_LOG); } } @@ -104,7 +104,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(); frame.IsInTouchMode(); @@ -116,8 +116,8 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveFrame"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(parent); - APPEND_LOG_CONTROL_OSP(&frame); + APPEND_LOG_CONTROL_TIZEN(parent); + APPEND_LOG_CONTROL_TIZEN(&frame); } probeBlockEnd(); @@ -144,7 +144,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()); @@ -159,7 +159,7 @@ void Control::SetName(const Tizen::Base::String &name) static methodType control_setnamep; DECLARE_COMMON_VARIABLE; - GET_REAL_FUNC_OSP(_ZN5Tizen2Ui7Control7SetNameERKNS_4Base6StringE, LIBOSP_UIFW, control_setnamep); + GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui7Control7SetNameERKNS_4Base6StringE, LIBOSP_UIFW, control_setnamep); (this->*control_setnamep)(name); @@ -173,8 +173,8 @@ void Control::SetName(const Tizen::Base::String &name) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "SetName"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(parent); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(parent); printLog(&log, MSG_LOG); } probeBlockEnd(); @@ -187,7 +187,7 @@ result Container::AddControl(const Control &control) DECLARE_COMMON_VARIABLE; 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)) @@ -225,8 +225,8 @@ result Container::AddControl(const Control &control) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(&control); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(&control); printLog(&log, MSG_LOG); } } @@ -242,7 +242,7 @@ result Container::AddControl(Control* control) DECLARE_COMMON_VARIABLE; 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)) @@ -280,8 +280,8 @@ result Container::AddControl(Control* control) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(control); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(control); printLog(&log, MSG_LOG); } } @@ -298,7 +298,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(); control.IsInTouchMode(); @@ -309,8 +309,8 @@ result Container::RemoveControl(const Control &control) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(&control); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(&control); } probeBlockEnd(); @@ -335,7 +335,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(); control->IsInTouchMode(); @@ -346,8 +346,8 @@ result Container::RemoveControl(Control* control) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(control); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(control); } probeBlockEnd(); @@ -372,7 +372,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(); Control* pcontrol = GetControl(index); @@ -384,8 +384,8 @@ result Container::RemoveControl(int index) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(pcontrol); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(pcontrol); } probeBlockEnd(); @@ -408,7 +408,7 @@ void Container::RemoveAllControls(void) static methodType container_removeallcontrolp; DECLARE_COMMON_VARIABLE; - GET_REAL_FUNC_OSP(_ZN5Tizen2Ui9Container17RemoveAllControlsEv, LIBOSP_UIFW, container_removeallcontrolp); + GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container17RemoveAllControlsEv, LIBOSP_UIFW, container_removeallcontrolp); probeBlockStart(); if(isOptionEnabled(OPT_UI)) @@ -418,8 +418,8 @@ void Container::RemoveAllControls(void) INIT_LOG; APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveAllControl"); APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_OSP(this); - APPEND_LOG_CONTROL_OSP(pcontrol); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(pcontrol); printLog(&log, MSG_LOG); } probeBlockEnd(); diff --git a/probe_badaapi/bada_file.cpp b/probe_tizenapi/tizen_file.cpp similarity index 100% rename from probe_badaapi/bada_file.cpp rename to probe_tizenapi/tizen_file.cpp diff --git a/probe_badaapi/bada_lifecycle.cpp b/probe_tizenapi/tizen_lifecycle.cpp similarity index 87% rename from probe_badaapi/bada_lifecycle.cpp rename to probe_tizenapi/tizen_lifecycle.cpp index 73f285a..8e7dae4 100755 --- a/probe_badaapi/bada_lifecycle.cpp +++ b/probe_tizenapi/tizen_lifecycle.cpp @@ -36,7 +36,7 @@ #include "daprobe.h" #include "dahelper.h" #include "probeinfo.h" -#include "osp_probe.h" +#include "tizen_probe.h" extern "C" { @@ -91,7 +91,7 @@ result UiApp::Execute(UiAppInstanceFactory pUiAppFactory, Ecore_Event_Handler* handler; result ret; - GET_REAL_FUNC_OSP(_ZN5Tizen3App5UiApp7ExecuteEPFPS1_vEPKNS_4Base10Collection5IListE, + GET_REAL_FUNC_TIZEN(_ZN5Tizen3App5UiApp7ExecuteEPFPS1_vEPKNS_4Base10Collection5IListE, LIBOSP_UIFW, uiapp_executep); probeBlockStart(); @@ -119,7 +119,7 @@ void _AppImpl::OnTerminate(void* user_data) static methodType appimpl_onterminatep; DECLARE_COMMON_VARIABLE; - GET_REAL_FUNC_OSP(_ZN5Tizen3App8_AppImpl11OnTerminateEPv, LIBOSP_APPFW, appimpl_onterminatep); + GET_REAL_FUNC_TIZEN(_ZN5Tizen3App8_AppImpl11OnTerminateEPv, LIBOSP_APPFW, appimpl_onterminatep); probeBlockStart(); LIFECYCLE_PROBE_BLOCK("TERMINATING"); @@ -133,7 +133,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(); @@ -149,7 +149,7 @@ void _AppInfo::SetAppState(AppState appState) static methodType appinfo_setappstatep; DECLARE_COMMON_VARIABLE; - 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) @@ -167,7 +167,7 @@ void _UiAppImpl::OnBackground(void) static methodType uiappimpl_onbackgroundp; DECLARE_COMMON_VARIABLE; - GET_REAL_FUNC_OSP(_ZN5Tizen3App10_UiAppImpl12OnBackgroundEv, LIBOSP_UIFW, uiappimpl_onbackgroundp); + GET_REAL_FUNC_TIZEN(_ZN5Tizen3App10_UiAppImpl12OnBackgroundEv, LIBOSP_UIFW, uiappimpl_onbackgroundp); probeBlockStart(); SCREENSHOT_LOCK(); @@ -183,7 +183,7 @@ void _UiAppImpl::OnForeground(void) static methodType uiappimpl_onforegroundp; DECLARE_COMMON_VARIABLE; - GET_REAL_FUNC_OSP(_ZN5Tizen3App10_UiAppImpl12OnForegroundEv, LIBOSP_UIFW, uiappimpl_onforegroundp); + GET_REAL_FUNC_TIZEN(_ZN5Tizen3App10_UiAppImpl12OnForegroundEv, LIBOSP_UIFW, uiappimpl_onforegroundp); probeBlockStart(); LIFECYCLE_PROBE_BLOCK("RUNNING"); @@ -200,7 +200,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(); diff --git a/probe_badaapi/bada_sync.cpp b/probe_tizenapi/tizen_sync.cpp similarity index 94% rename from probe_badaapi/bada_sync.cpp rename to probe_tizenapi/tizen_sync.cpp index 76ece73..2acae4a 100755 --- a/probe_badaapi/bada_sync.cpp +++ b/probe_tizenapi/tizen_sync.cpp @@ -91,7 +91,7 @@ result Mutex::Create(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -156,7 +156,7 @@ result Mutex::Create(const Tizen::Base::String& name) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -219,7 +219,7 @@ result Mutex::Release(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_RELEASE); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_RELEASE); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -276,7 +276,7 @@ result Mutex::Acquire(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_ACQUIRE_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -301,7 +301,7 @@ result Mutex::Acquire(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_ACQUIRE_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -364,7 +364,7 @@ result Mutex::TryToAcquire(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MUTEX, SYNC_API_TRY_ACQUIRE); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_TRY_ACQUIRE); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -428,7 +428,7 @@ result Semaphore::Create(int count) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -493,7 +493,7 @@ result Semaphore::Create(const Tizen::Base::String& name, int count) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -551,7 +551,7 @@ result Semaphore::Acquire(long timeout) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -576,7 +576,7 @@ result Semaphore::Acquire(long timeout) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -639,7 +639,7 @@ result Semaphore::TryToAcquire(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_TRY_ACQUIRE); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_TRY_ACQUIRE); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -702,7 +702,7 @@ result Semaphore::Release(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_SEMAPHORE, SYNC_API_RELEASE); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_RELEASE); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -765,7 +765,7 @@ result Monitor::Construct(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -822,7 +822,7 @@ result Monitor::Enter(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_ACQUIRE_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -847,7 +847,7 @@ result Monitor::Enter(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_ACQUIRE_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -910,7 +910,7 @@ result Monitor::Exit(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_RELEASE); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_RELEASE); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -967,7 +967,7 @@ result Monitor::Wait(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_COND_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -992,7 +992,7 @@ result Monitor::Wait(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_COND_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1055,7 +1055,7 @@ result Monitor::Notify(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NOTIFY); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1118,7 +1118,7 @@ result Monitor::NotifyAll(void) { //PCAddr,errno,InternalCall,CallerPCAddr,SyncVal,SyncType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_OSP_MONITOR, SYNC_API_NOTIFY_ALL); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY_ALL); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); diff --git a/probe_badaapi/bada_thread.cpp b/probe_tizenapi/tizen_thread.cpp similarity index 92% rename from probe_badaapi/bada_thread.cpp rename to probe_tizenapi/tizen_thread.cpp index eca8dfa..cb9fdb3 100755 --- a/probe_badaapi/bada_thread.cpp +++ b/probe_tizenapi/tizen_thread.cpp @@ -103,7 +103,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); @@ -163,10 +163,10 @@ _ThreadImpl::ThreadProc(void* params) { } //Input,ret log.length += sprintf(log.data + log.length, "`,0x%x`,",(unsigned int)pSelf); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,`,0x%x`,%d`,%d", blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)pThread, THREAD_OSPTHREAD_WORKER, THREAD_API_INTERNAL_START); + (unsigned int)CALLER_ADDRESS, (unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); log.length += sprintf(log.data + log.length, "`,callstack_end"); @@ -195,10 +195,10 @@ _ThreadImpl::ThreadProc(void* params) { } //Input,ret log.length += sprintf(log.data + log.length, "`,0x%x`,",(unsigned int)pSelf); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,`,0x%x`,%d`,%d", blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)pThread, THREAD_OSPTHREAD_WORKER, THREAD_API_INTERNAL_STOP); + (unsigned int)CALLER_ADDRESS, (unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_STOP); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); log.length += sprintf(log.data + log.length, "`,callstack_end"); @@ -256,7 +256,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); @@ -315,7 +315,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); @@ -374,7 +374,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); @@ -433,7 +433,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); @@ -488,10 +488,10 @@ result Thread::Sleep(long milliSeconds) { //Input,ret log.length += sprintf(log.data + log.length, "`,%ld`,",milliSeconds); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); log.length += sprintf(log.data + log.length, "`,callstack_end"); @@ -516,10 +516,10 @@ result Thread::Sleep(long milliSeconds) { //Input,ret log.length += sprintf(log.data + log.length, "`,%ld`,%ld",milliSeconds,ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret,blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -580,10 +580,10 @@ Thread* Thread::GetCurrentThread(void) { //Input,ret log.length += sprintf(log.data + log.length, "`,`,0x%x",(unsigned int)currentThread); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", res,blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER); + (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -646,10 +646,10 @@ result Thread::Yield(void) { //Input,ret log.length += sprintf(log.data + log.length, "`,`,%ld",ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret,blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_OTHER); + (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -706,10 +706,10 @@ result Thread::Exit(int exitCode) { //Input,ret log.length += sprintf(log.data + log.length, "`,%d`,",exitCode); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_OSPTHREAD_WORKER, THREAD_API_EXIT); + (unsigned int)CALLER_ADDRESS, (unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_EXIT); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -777,10 +777,10 @@ result Thread::Construct(ThreadType threadType, long stackSize, //Input,ret log.length += sprintf(log.data + log.length, "`,%d, %ld, %d`,%ld", threadType, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -839,10 +839,10 @@ result Thread::Construct(long stackSize, ThreadPriority priority) { //Input,ret log.length += sprintf(log.data + log.length, "`,%ld, %d`,%ld", stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -908,10 +908,10 @@ result Thread::Construct(const Tizen::Base::String &name, long stackSize, WcharToChar(temp, name.GetPointer()); log.length += sprintf(log.data + log.length, "`,%s, %ld, %d`,%ld", temp, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -977,10 +977,10 @@ result Thread::Construct(const Tizen::Base::String &name, ThreadType threadType, WcharToChar(temp, name.GetPointer()); log.length += sprintf(log.data + log.length, "`,%s, %d, %ld, %d`,%ld", temp, threadType, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1044,10 +1044,10 @@ result Thread::Construct(IRunnable &target, long stackSize, //Input,ret log.length += sprintf(log.data + log.length, "`,0x%x, %ld, %d`,%ld", (unsigned int) &target, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1113,10 +1113,10 @@ result Thread::Construct(const Tizen::Base::String &name, IRunnable &target, WcharToChar(temp, name.GetPointer()); log.length += sprintf(log.data + log.length, "`,%s, 0x%x, %ld, %d`,%ld", temp, (unsigned int) &target, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1179,10 +1179,10 @@ result Thread::GetExitCode(int &exitCode) const { // log.length += sprintf(log.data + log.length, "`,(%d->%d)`,%ld", exitOld, // exitCode, ret); log.length += sprintf(log.data + log.length, "`,%d`,%ld", exitCode, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, 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); @@ -1243,10 +1243,10 @@ const Tizen::Base::String & Thread::GetName(void) const { //Input,ret WcharToChar(temp, ret.GetPointer()); log.length += sprintf(log.data + log.length, "`,`,%s", temp); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%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); @@ -1299,10 +1299,10 @@ result Thread::Join(void) { probeInfo.pID, probeInfo.tID); //Input,ret log.length += sprintf(log.data + log.length, "`,`,"); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,0`,%d`,%u`,`,0x%x`,%d`,%d",blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); log.length += sprintf(log.data + log.length, "`,callstack_end"); @@ -1323,10 +1323,10 @@ result Thread::Join(void) { probeInfo.pID, probeInfo.tID); //Input,ret log.length += sprintf(log.data + log.length, "`,`,%ld", ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret,blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_WAIT_END); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1404,7 +1404,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); @@ -1462,10 +1462,10 @@ result Thread::Start(void) { probeInfo.pID, probeInfo.tID); //Input,ret log.length += sprintf(log.data + log.length, "`,`,%ld", ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_START); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_START); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1522,10 +1522,10 @@ result Thread::Stop(void) { probeInfo.pID, probeInfo.tID); //Input,ret log.length += sprintf(log.data + log.length, "`,`,%ld", ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_WORKER, THREAD_API_STOP); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_STOP); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1585,10 +1585,10 @@ result EventDrivenThread::Construct(long stackSize, ThreadPriority priority) { //Input,ret log.length += sprintf(log.data + log.length, "`,%ld, %d`,%ld", stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1655,10 +1655,10 @@ result EventDrivenThread::Construct(const Tizen::Base::String &name, long stackS WcharToChar(temp, name.GetPointer()); log.length += sprintf(log.data + log.length, "`,%s, %ld, %d`,%ld", temp, stackSize, priority, ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_NEW); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); @@ -1717,10 +1717,10 @@ result EventDrivenThread::Quit() { probeInfo.pID, probeInfo.tID); //Input,ret log.length += sprintf(log.data + log.length, "`,`,%ld", ret); - //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,OspThreadID,ThreadType,ApiType + //PCAddr,errno,InternalCall,CallerPCAddr,PThreadID,TizenThreadID,ThreadType,ApiType log.length += sprintf(log.data + log.length, "`,0`,%lu`,%d`,%u`,`,0x%x`,%d`,%d", ret, blockresult, - (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_OSPTHREAD_EVENTDRIVEN, THREAD_API_STOP); + (unsigned int)CALLER_ADDRESS, (unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_STOP); //callstack log.length += sprintf(log.data + log.length, "`,\ncallstack_start`,"); getBacktraceString(&log, 4096 - log.length - 17); diff --git a/probe_ui/tizen_capture.c b/probe_ui/capi_capture.c similarity index 100% rename from probe_ui/tizen_capture.c rename to probe_ui/capi_capture.c diff --git a/probe_ui/osp_capture.cpp b/probe_ui/tizen_capture.cpp similarity index 94% rename from probe_ui/osp_capture.cpp rename to probe_ui/tizen_capture.cpp index 560b1ac..fd83364 100755 --- a/probe_ui/osp_capture.cpp +++ b/probe_ui/tizen_capture.cpp @@ -38,7 +38,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; @@ -236,7 +236,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(); @@ -254,7 +254,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); @@ -292,7 +292,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); @@ -311,7 +311,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); @@ -335,7 +335,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); @@ -354,7 +354,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); diff --git a/probe_ui/osp_display.cpp b/probe_ui/tizen_display.cpp similarity index 76% rename from probe_ui/osp_display.cpp rename to probe_ui/tizen_display.cpp index 5eed0a9..aa0e695 100644 --- a/probe_ui/osp_display.cpp +++ b/probe_ui/tizen_display.cpp @@ -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); diff --git a/probe_ui/osp_frameani.cpp b/probe_ui/tizen_frameani.cpp similarity index 98% rename from probe_ui/osp_frameani.cpp rename to probe_ui/tizen_frameani.cpp index a18926d..4ce0fe8 100644 --- a/probe_ui/osp_frameani.cpp +++ b/probe_ui/tizen_frameani.cpp @@ -30,7 +30,7 @@ #include "daprobe.h" #include "dahelper.h" -#include "osp_frameani.h" +#include "tizen_frameani.h" DAFrameAnimationEventListener DAFrameAnimationEventListener::rInstance; diff --git a/probe_ui/osp_frameani.h b/probe_ui/tizen_frameani.h similarity index 95% rename from probe_ui/osp_frameani.h rename to probe_ui/tizen_frameani.h index 6f8186d..7d8556b 100644 --- a/probe_ui/osp_frameani.h +++ b/probe_ui/tizen_frameani.h @@ -28,8 +28,8 @@ * */ -#ifndef __OSP_FRAMEANI_H__ -#define __OSP_FRAMEANI_H__ +#ifndef __TIZEN_FRAMEANI_H__ +#define __TIZEN_FRAMEANI_H__ #include @@ -54,5 +54,5 @@ private: }; -#endif // __OSP_FRAMEANI_H__ +#endif // __TIZEN_FRAMEANI_H__ diff --git a/probe_ui/osp_scenemanager.cpp b/probe_ui/tizen_scenemanager.cpp similarity index 97% rename from probe_ui/osp_scenemanager.cpp rename to probe_ui/tizen_scenemanager.cpp index 197c464..8174b7f 100755 --- a/probe_ui/osp_scenemanager.cpp +++ b/probe_ui/tizen_scenemanager.cpp @@ -35,7 +35,7 @@ #include "daprobe.h" #include "dacollection.h" // for find_object_hash #include "dahelper.h" // for captureScreen -#include "osp_probe.h" +#include "tizen_probe.h" using namespace Tizen::Base; using namespace Tizen::Ui::Controls; @@ -149,7 +149,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(); -- 2.7.4