From 2be5e9fa3e3def3c72ad997bfc89f03ca22ce07b Mon Sep 17 00:00:00 2001 From: greatim Date: Thu, 31 Oct 2013 18:52:13 +0900 Subject: [PATCH] [Title] fix ui controls list bug [Desc.] [Issue] Change-Id: I9ea228e5baf3b28181c2a2d50362c473307d047f --- include/probeinfo.h | 2 +- probe_tizenapi/tizen_controls.cpp | 269 ++++++++++++++++++++++---------------- 2 files changed, 155 insertions(+), 116 deletions(-) diff --git a/include/probeinfo.h b/include/probeinfo.h index 0fe5e8b..9693a28 100755 --- a/include/probeinfo.h +++ b/include/probeinfo.h @@ -163,7 +163,7 @@ enum DaOptions OPT_SNAPSHOT = 0x00000040, OPT_EVENT = 0x00000080, OPT_RECORD = 0x00000100, - OPT_ALWAYSON = 0x11111111 + OPT_ALWAYSON = 0xffffffff }; diff --git a/probe_tizenapi/tizen_controls.cpp b/probe_tizenapi/tizen_controls.cpp index 2fc058e..ee5863d 100755 --- a/probe_tizenapi/tizen_controls.cpp +++ b/probe_tizenapi/tizen_controls.cpp @@ -185,52 +185,58 @@ result Container::AddControl(const Control &control) typedef result (Container::*methodType)(const Control &control); static methodType container_addcontrolp; DECLARE_COMMON_VARIABLE; + int blockresult; + bool bfiltering = false; result ret; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container10AddControlERKNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp); - probeBlockStart(); - if(unlikely(IsRegisteredFrameAnimatorEventListener == false)) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - char *type = NULL, *classname = NULL; - if(likely(find_uiobject_hash((void*)this, &type, &classname) == 1)) // there is entry in object hash + if(unlikely(IsRegisteredFrameAnimatorEventListener == false)) { - if(strcmp(type, "Frame") == 0) + char *type = NULL, *classname = NULL; + if(likely(find_uiobject_hash((void*)this, &type, &classname) == 1)) // there is entry in object hash { - FrameAnimator* fa = ((Frame*)this)->GetFrameAnimator(); - if(fa != NULL) - { - fa->AddFrameAnimatorEventListener(GetFrameAnimatorEventListener()); - IsRegisteredFrameAnimatorEventListener = true; - } - else // frame is not yet constructed + if(strcmp(type, "Frame") == 0) { + FrameAnimator* fa = ((Frame*)this)->GetFrameAnimator(); + if(fa != NULL) + { + fa->AddFrameAnimatorEventListener(GetFrameAnimatorEventListener()); + IsRegisteredFrameAnimatorEventListener = true; + } + else // frame is not yet constructed + { + } } } } + preBlockEnd(); } - probeBlockEnd(); ret = (this->*container_addcontrolp)(control); - probeBlockStart(); - if(ret == E_SUCCESS) + if(postBlockBegin(blockresult)) { - IsInTouchMode(); - control.IsInTouchMode(); - - if(isOptionEnabled(OPT_UI)) + if(ret == E_SUCCESS) { - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(&control); - printLog(&log, MSG_LOG); + IsInTouchMode(); + control.IsInTouchMode(); + + if(isOptionEnabled(OPT_UI)) + { + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(&control); + printLog(&log, MSG_LOG); + } } + postBlockEnd(); } - probeBlockEnd(); return ret; } @@ -240,52 +246,58 @@ result Container::AddControl(Control* control) typedef result (Container::*methodType)(Control* control); static methodType container_addcontrolp; DECLARE_COMMON_VARIABLE; + int blockresult; + bool bfiltering = false; result ret; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container10AddControlEPNS0_7ControlE, LIBOSP_UIFW, container_addcontrolp); - probeBlockStart(); - if(unlikely(IsRegisteredFrameAnimatorEventListener == false)) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - char *type = NULL, *classname = NULL; - if(likely(find_uiobject_hash((void*)this, &type, &classname) == 1)) // there is entry in object hash + if(unlikely(IsRegisteredFrameAnimatorEventListener == false)) { - if(strcmp(type, "Frame") == 0) + char *type = NULL, *classname = NULL; + if(likely(find_uiobject_hash((void*)this, &type, &classname) == 1)) // there is entry in object hash { - FrameAnimator* fa = ((Frame*)this)->GetFrameAnimator(); - if(fa != NULL) - { - fa->AddFrameAnimatorEventListener(GetFrameAnimatorEventListener()); - IsRegisteredFrameAnimatorEventListener = true; - } - else // frame is not yet constructed + if(strcmp(type, "Frame") == 0) { + FrameAnimator* fa = ((Frame*)this)->GetFrameAnimator(); + if(fa != NULL) + { + fa->AddFrameAnimatorEventListener(GetFrameAnimatorEventListener()); + IsRegisteredFrameAnimatorEventListener = true; + } + else // frame is not yet constructed + { + } } } } + preBlockEnd(); } - probeBlockEnd(); ret = (this->*container_addcontrolp)(control); - probeBlockStart(); - if(ret == E_SUCCESS) + if(postBlockBegin(blockresult)) { - IsInTouchMode(); - control->IsInTouchMode(); - - if(isOptionEnabled(OPT_UI)) + if(ret == E_SUCCESS) { - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(control); - printLog(&log, MSG_LOG); + IsInTouchMode(); + control->IsInTouchMode(); + + if(isOptionEnabled(OPT_UI)) + { + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "AddControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(control); + printLog(&log, MSG_LOG); + } } + postBlockEnd(); } - probeBlockEnd(); return ret; } @@ -295,34 +307,40 @@ result Container::RemoveControl(const Control &control) typedef result (Container::*methodType)(const Control &control); static methodType container_removecontrolp; DECLARE_COMMON_VARIABLE; + int blockresult; + bool bfiltering = false; result ret; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlERKNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp); - probeBlockStart(); - control.IsInTouchMode(); - - if((bOption = isOptionEnabled(OPT_UI))) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(&control); + control.IsInTouchMode(); + + if((bOption = isOptionEnabled(OPT_UI))) + { + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(&control); + } + preBlockEnd(); } - probeBlockEnd(); ret = (this->*container_removecontrolp)(control); - probeBlockStart(); - if(ret == E_SUCCESS) + if(postBlockBegin(blockresult)) { - if(bOption) - printLog(&log, MSG_LOG); + if(ret == E_SUCCESS) + { + if(bOption) + printLog(&log, MSG_LOG); + } + postBlockEnd(); } - probeBlockEnd(); return ret; } @@ -332,34 +350,40 @@ result Container::RemoveControl(Control* control) typedef result (Container::*methodType)(Control* control); static methodType container_removecontrolp; DECLARE_COMMON_VARIABLE; + int blockresult; + bool bfiltering = false; result ret; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEPNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp); - probeBlockStart(); - control->IsInTouchMode(); - - if((bOption = isOptionEnabled(OPT_UI))) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(control); + control->IsInTouchMode(); + + if((bOption = isOptionEnabled(OPT_UI))) + { + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(control); + } + preBlockEnd(); } - probeBlockEnd(); ret = (this->*container_removecontrolp)(control); - probeBlockStart(); - if(ret == E_SUCCESS) + if(postBlockBegin(blockresult)) { - if(bOption) - printLog(&log, MSG_LOG); + if(ret == E_SUCCESS) + { + if(bOption) + printLog(&log, MSG_LOG); + } + postBlockEnd(); } - probeBlockEnd(); return ret; } @@ -369,35 +393,41 @@ result Container::RemoveControl(int index) typedef result (Container::*methodType)(int index); static methodType container_removecontrolip; DECLARE_COMMON_VARIABLE; + int blockresult; + bool bfiltering = false; result ret; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEi, LIBOSP_UIFW, container_removecontrolip); - probeBlockStart(); - Control* pcontrol = GetControl(index); - pcontrol->IsInTouchMode(); - - if((bOption = isOptionEnabled(OPT_UI))) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(pcontrol); + Control* pcontrol = GetControl(index); + pcontrol->IsInTouchMode(); + + if((bOption = isOptionEnabled(OPT_UI))) + { + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(pcontrol); + } + preBlockEnd(); } - probeBlockEnd(); ret = (this->*container_removecontrolip)(index); - probeBlockStart(); - if(ret == E_SUCCESS) + if(postBlockBegin(blockresult)) { - if(bOption) - printLog(&log, MSG_LOG); + if(ret == E_SUCCESS) + { + if(bOption) + printLog(&log, MSG_LOG); + } + postBlockEnd(); } - probeBlockEnd(); return ret; } @@ -407,24 +437,33 @@ void Container::RemoveAllControls(void) typedef void (Container::*methodType)(void); static methodType container_removeallcontrolp; DECLARE_COMMON_VARIABLE; - + int blockresult; + bool bfiltering = false; + GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container17RemoveAllControlsEv, LIBOSP_UIFW, container_removeallcontrolp); - probeBlockStart(); - if(isOptionEnabled(OPT_UI)) + if((blockresult = preBlockBegin(CALLER_ADDRESS, bfiltering, OPT_ALWAYSON)) != 0) { - Control* pcontrol = NULL; - setProbePoint(&probeInfo); - INIT_LOG; - APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveAllControl"); - APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); - APPEND_LOG_CONTROL_TIZEN(this); - APPEND_LOG_CONTROL_TIZEN(pcontrol); - printLog(&log, MSG_LOG); + if(isOptionEnabled(OPT_UI)) + { + Control* pcontrol = NULL; + setProbePoint(&probeInfo); + INIT_LOG; + APPEND_LOG_BASIC_NAME(LC_UICREATE, "RemoveAllControl"); + APPEND_LOG_COMMON_NONE(CALLER_ADDRESS); + APPEND_LOG_CONTROL_TIZEN(this); + APPEND_LOG_CONTROL_TIZEN(pcontrol); + printLog(&log, MSG_LOG); + } + preBlockEnd(); } - probeBlockEnd(); (this->*container_removeallcontrolp)(); + + if(postBlockBegin(blockresult)) + { + postBlockEnd(); + } } } } // end of namespace Tizen::Ui -- 2.7.4