From: Nikita Kalyazin Date: Wed, 13 Nov 2013 09:09:45 +0000 (+0400) Subject: [PROTO] actualize return types for tizenapi X-Git-Tag: Tizen_SDK_2.3~106 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f57878663cab884294f73982284a535afa7746c;p=platform%2Fcore%2Fsystem%2Fswap-probe.git [PROTO] actualize return types for tizenapi Files concerned: - probe_tizenapi/tizen_controls.cpp - probe_tizenapi/tizen_file.cpp - probe_tizenapi/tizen_sync.cpp - probe_tizenapi/tizen_thread.cpp Change-Id: I27e44a6109450847c07e750580fd882898e6fca5 Signed-off-by: Nikita Kalyazin --- diff --git a/probe_tizenapi/tizen_controls.cpp b/probe_tizenapi/tizen_controls.cpp index 289ecb2..498cdeb 100755 --- a/probe_tizenapi/tizen_controls.cpp +++ b/probe_tizenapi/tizen_controls.cpp @@ -76,7 +76,7 @@ result UiApp::AddFrame(const Tizen::Ui::Controls::Frame& frame) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_UiApp__AddFrame_const_Tizen__Ui__Controls__Frame__frame_, "p", voidp_to_uint64(&frame)); - PACK_COMMON_END('p', ret, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(parent); PACK_UICONTROL(&frame); FLUSH_LOCAL_BUF(); @@ -92,7 +92,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame) typedef result (UiApp::*methodType)(const Tizen::Ui::Controls::Frame& frame); static methodType uiapp_removeframep; probeInfo_t probeInfo; - result ret; + result ret = 0; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen3App5UiApp11RemoveFrameERKNS_2Ui8Controls5FrameE, LIBOSP_UIFW, uiapp_removeframep); @@ -111,7 +111,7 @@ result UiApp::RemoveFrame(const Tizen::Ui::Controls::Frame &frame) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_UiApp__RemoveFrame_const_Tizen__Ui__Controls__Frame__frame_, "p", voidp_to_uint64(&frame)); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(parent); PACK_UICONTROL(&frame); } @@ -174,7 +174,7 @@ void Control::SetName(const Tizen::Base::String &name) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_void_Control__SetName_const_Tizen__Base__String__name_, "p", voidp_to_uint64(&name)); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('v', 0, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(parent); FLUSH_LOCAL_BUF(); @@ -229,7 +229,7 @@ result Container::AddControl(const Control &control) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_Container__AddControl_const_Control__control_, "p", voidp_to_uint64(&control)); - PACK_COMMON_END('p', ret, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(&control); FLUSH_LOCAL_BUF(); @@ -287,7 +287,7 @@ result Container::AddControl(Control* control) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_Container__AddControl_Control__control_, "p", voidp_to_uint64(control)); - PACK_COMMON_END('p', ret, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(control); FLUSH_LOCAL_BUF(); @@ -303,7 +303,7 @@ result Container::RemoveControl(const Control &control) typedef result (Container::*methodType)(const Control &control); static methodType container_removecontrolp; probeInfo_t probeInfo; - result ret; + result ret = 0; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlERKNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp); @@ -321,7 +321,7 @@ result Container::RemoveControl(const Control &control) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_Container__RemoveControl_const_Control__control_, "p", voidp_to_uint64(&control)); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(&control); } @@ -348,7 +348,7 @@ result Container::RemoveControl(Control* control) typedef result (Container::*methodType)(Control* control); static methodType container_removecontrolp; probeInfo_t probeInfo; - result ret; + result ret = 0; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEPNS0_7ControlE, LIBOSP_UIFW, container_removecontrolp); @@ -366,7 +366,7 @@ result Container::RemoveControl(Control* control) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_Container__RemoveControl_Control__control_, "p", voidp_to_uint64(control)); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(control); } @@ -393,7 +393,7 @@ result Container::RemoveControl(int index) typedef result (Container::*methodType)(int index); static methodType container_removecontrolip; probeInfo_t probeInfo; - result ret; + result ret = 0; bool bOption; GET_REAL_FUNC_TIZEN(_ZN5Tizen2Ui9Container13RemoveControlEi, LIBOSP_UIFW, container_removecontrolip); @@ -412,7 +412,7 @@ result Container::RemoveControl(int index) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_result_Container__RemoveControl_int_index_, "d", index); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('x', ret, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(pcontrol); } @@ -452,7 +452,7 @@ void Container::RemoveAllControls(void) PACK_COMMON_BEGIN(MSG_PROBE_UICONTROL, API_ID_void_Container__RemoveAllControls_void_, "", 0); - PACK_COMMON_END('p', 0, 0, 0); + PACK_COMMON_END('v', 0, 0, 0); PACK_UICONTROL(this); PACK_UICONTROL(pcontrol); FLUSH_LOCAL_BUF(); diff --git a/probe_tizenapi/tizen_file.cpp b/probe_tizenapi/tizen_file.cpp index 4d13474..3158bb2 100755 --- a/probe_tizenapi/tizen_file.cpp +++ b/probe_tizenapi/tizen_file.cpp @@ -90,7 +90,7 @@ result File::Construct(const Tizen::Base::String& filePath, PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_Tizen__Base__String__openMode__bool_createParentDirectories_, "ssd", absolutize_filepath(buffer,temp_path), temp_mode, createParentDirectories); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp_path); FLUSH_LOCAL_BUF(); @@ -150,7 +150,7 @@ result File::Construct(const Tizen::Base::String& filePath, PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_Tizen__Base__String__openMode_, "ss", absolutize_filepath(buffer, temp_path), temp_mode); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp_path); FLUSH_LOCAL_BUF(); @@ -206,7 +206,7 @@ result File::Construct(const Tizen::Base::String& filePath, API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode_, "sp", absolutize_filepath(buffer, temp), voidp_to_uint64(pOpenMode)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp); FLUSH_LOCAL_BUF(); @@ -263,7 +263,7 @@ result File::Construct(const Tizen::Base::String& filePath, API_ID_result_File__Construct_const_Tizen__Base__String__filePath__const_char__pOpenMode__const_Tizen__Base__ByteBuffer__secretKey_, "sp", temp, voidp_to_uint64(pOpenMode)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OPEN, size, temp); FLUSH_LOCAL_BUF(); @@ -314,7 +314,7 @@ result File::Flush(void) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Flush_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp); FLUSH_LOCAL_BUF(); @@ -413,7 +413,7 @@ result File::Read(Tizen::Base::String& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Read_Tizen__Base__String__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp); FLUSH_LOCAL_BUF(); @@ -433,7 +433,7 @@ result File::Read(Tizen::Base::String& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Read_Tizen__Base__String__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp); FLUSH_LOCAL_BUF(); @@ -480,7 +480,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp); FLUSH_LOCAL_BUF(); @@ -500,7 +500,7 @@ result File::Read(Tizen::Base::ByteBuffer& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Read_Tizen__Base__ByteBuffer__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp); FLUSH_LOCAL_BUF(); @@ -547,7 +547,7 @@ int File::Read(void *buffer, int length) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_int_File__Read_void__buffer__int_length_, "xd", (uint64_t)(buffer), length); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('d', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_READ_START, size, temp); FLUSH_LOCAL_BUF(); @@ -568,7 +568,7 @@ int File::Read(void *buffer, int length) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_int_File__Read_void__buffer__int_length_, "xd", (uint64_t)(buffer), length); - PACK_COMMON_END('p', ret, res, blockresult); + PACK_COMMON_END('d', ret, res, blockresult); PACK_RESOURCE(nRead, (unsigned long)this, FD_API_READ_END, size, temp); FLUSH_LOCAL_BUF(); @@ -633,7 +633,7 @@ result File::Seek(FileSeekPosition position, long offset) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Seek_FileSeekPosition_position__long_offset_, "sx", temp_pos, (uint64_t)(offset)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp); FLUSH_LOCAL_BUF(); @@ -686,7 +686,7 @@ int File::Tell(void) const { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_int_File__Tell_void__const, "", 0); - PACK_COMMON_END('p', ret, res, blockresult); + PACK_COMMON_END('d', ret, res, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp); FLUSH_LOCAL_BUF(); @@ -737,7 +737,7 @@ result File::Truncate(int length) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Truncate_int_length_, "d", length); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_OTHER, size, temp); FLUSH_LOCAL_BUF(); @@ -784,7 +784,7 @@ result File::Write(const void *buffer, int length) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_void__buffer__int_length_, "xd", (uint64_t)(buffer), length); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp); FLUSH_LOCAL_BUF(); @@ -804,7 +804,7 @@ result File::Write(const void *buffer, int length) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_void__buffer__int_length_, "xd", (uint64_t)(buffer), length); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp); FLUSH_LOCAL_BUF(); @@ -851,7 +851,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp); FLUSH_LOCAL_BUF(); @@ -871,7 +871,7 @@ result File::Write(const Tizen::Base::ByteBuffer& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_Tizen__Base__ByteBuffer__buffer_, "x", (uint64_t)(&buffer)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp); FLUSH_LOCAL_BUF(); @@ -920,7 +920,7 @@ result File::Write(const Tizen::Base::String& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_Tizen__Base__String__buffer_, "s", temp_buf); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_WRITE_START, size, temp_path); FLUSH_LOCAL_BUF(); @@ -942,7 +942,7 @@ result File::Write(const Tizen::Base::String& buffer) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_result_File__Write_const_Tizen__Base__String__buffer_, "s", temp_buf); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_RESOURCE(nWritten, (unsigned long)this, FD_API_WRITE_END, size, temp_path); FLUSH_LOCAL_BUF(); @@ -992,7 +992,7 @@ File::~File(void) { PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, API_ID_File___File_void_, "", 0); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('n', 0, 0, blockresult); PACK_RESOURCE(0, (unsigned long)this, FD_API_CLOSE, size, ""); FLUSH_LOCAL_BUF(); diff --git a/probe_tizenapi/tizen_sync.cpp b/probe_tizenapi/tizen_sync.cpp index c06a79b..a6cd977 100755 --- a/probe_tizenapi/tizen_sync.cpp +++ b/probe_tizenapi/tizen_sync.cpp @@ -88,7 +88,7 @@ result Mutex::Create(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__Create_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW); FLUSH_LOCAL_BUF(); @@ -144,7 +144,7 @@ result Mutex::Create(const Tizen::Base::String& name) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__Create_const_Tizen__Base__String__name_, "s", temp); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_NEW); FLUSH_LOCAL_BUF(); @@ -197,7 +197,7 @@ result Mutex::Release(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__Release_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_RELEASE); FLUSH_LOCAL_BUF(); @@ -244,7 +244,7 @@ result Mutex::Acquire(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__Acquire_void_, "", 0); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_START); FLUSH_LOCAL_BUF(); @@ -260,7 +260,7 @@ result Mutex::Acquire(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__Acquire_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_ACQUIRE_WAIT_END); FLUSH_LOCAL_BUF(); @@ -313,7 +313,7 @@ result Mutex::TryToAcquire(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Mutex__TryToAcquire_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MUTEX, SYNC_API_TRY_ACQUIRE); FLUSH_LOCAL_BUF(); @@ -367,7 +367,7 @@ result Semaphore::Create(int count) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__Create_int_count_, "d", count); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW); FLUSH_LOCAL_BUF(); @@ -423,7 +423,7 @@ result Semaphore::Create(const Tizen::Base::String& name, int count) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__Create_const_Tizen__Base__String__name__int_count_, "sd", temp, count); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_NEW); FLUSH_LOCAL_BUF(); @@ -471,7 +471,7 @@ result Semaphore::Acquire(long timeout) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__Acquire_long_timeout_, "x", (uint64_t)(timeout)); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_START); FLUSH_LOCAL_BUF(); @@ -487,7 +487,7 @@ result Semaphore::Acquire(long timeout) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__Acquire_long_timeout_, "x", (uint64_t)(timeout)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_ACQUIRE_WAIT_END); FLUSH_LOCAL_BUF(); @@ -540,7 +540,7 @@ result Semaphore::TryToAcquire(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__TryToAcquire_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_TRY_ACQUIRE); FLUSH_LOCAL_BUF(); @@ -593,7 +593,7 @@ result Semaphore::Release(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Semaphore__Release_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_SEMAPHORE, SYNC_API_RELEASE); FLUSH_LOCAL_BUF(); @@ -646,7 +646,7 @@ result Monitor::Construct(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Construct_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NEW); FLUSH_LOCAL_BUF(); @@ -693,7 +693,7 @@ result Monitor::Enter(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Enter_void_, "", 0); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_START); FLUSH_LOCAL_BUF(); @@ -709,7 +709,7 @@ result Monitor::Enter(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Enter_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_ACQUIRE_WAIT_END); FLUSH_LOCAL_BUF(); @@ -762,7 +762,7 @@ result Monitor::Exit(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Exit_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_RELEASE); FLUSH_LOCAL_BUF(); @@ -809,7 +809,7 @@ result Monitor::Wait(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Wait_void_, "", 0); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_START); FLUSH_LOCAL_BUF(); @@ -825,7 +825,7 @@ result Monitor::Wait(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Wait_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_COND_WAIT_END); FLUSH_LOCAL_BUF(); @@ -878,7 +878,7 @@ result Monitor::Notify(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__Notify_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY); FLUSH_LOCAL_BUF(); @@ -931,7 +931,7 @@ result Monitor::NotifyAll(void) { PACK_COMMON_BEGIN(MSG_PROBE_SYNC, API_ID_result_Monitor__NotifyAll_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_SYNC((unsigned int) this, SYNC_TIZEN_MONITOR, SYNC_API_NOTIFY_ALL); FLUSH_LOCAL_BUF(); diff --git a/probe_tizenapi/tizen_thread.cpp b/probe_tizenapi/tizen_thread.cpp index 5cac066..d5b09da 100755 --- a/probe_tizenapi/tizen_thread.cpp +++ b/probe_tizenapi/tizen_thread.cpp @@ -128,6 +128,7 @@ _ThreadImpl::ThreadProc(void* params) { int blockresult; bool bfiltering = false; void *tmpPtr; + void *ret; if (!ThreadProcp) { probeBlockStart(); @@ -163,7 +164,7 @@ _ThreadImpl::ThreadProc(void* params) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_void___ThreadImpl__ThreadProc_void__params_, "p", voidp_to_uint64(params)); - PACK_COMMON_END('p', (unsigned int)pSelf, 0, blockresult); + PACK_COMMON_END('p', 0, 0, blockresult); PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_START); FLUSH_LOCAL_BUF(); @@ -171,7 +172,7 @@ _ThreadImpl::ThreadProc(void* params) { probingEnd(); } // all probe should be reachable inside thread start_routine (user implemented Thread::Run) - (ThreadProcp)(params); + ret = (ThreadProcp)(params); // if (postBlockBegin(blockresult)) { probingStart(); @@ -187,7 +188,7 @@ _ThreadImpl::ThreadProc(void* params) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_void___ThreadImpl__ThreadProc_void__params_, "p", voidp_to_uint64(params)); - PACK_COMMON_END('p', (unsigned int)pSelf, 0, blockresult); + PACK_COMMON_END('p', ret, 0, blockresult); PACK_THREAD((unsigned int)pThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_INTERNAL_STOP); FLUSH_LOCAL_BUF(); @@ -470,7 +471,7 @@ result Thread::Sleep(long milliSeconds) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Sleep_long_milliSeconds_, "x", (uint64_t)(milliSeconds)); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START); FLUSH_LOCAL_BUF(); @@ -489,7 +490,7 @@ result Thread::Sleep(long milliSeconds) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Yield_void_, "x", (uint64_t)(milliSeconds)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END); FLUSH_LOCAL_BUF(); @@ -542,7 +543,8 @@ Thread* Thread::GetCurrentThread(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_Thread__Thread__GetCurrentThread_void_, "", 0); - PACK_COMMON_END('p', (unsigned int)currentThread, res, blockresult); + PACK_COMMON_END('p', voidp_to_uint64(currentThread), + res, blockresult); PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER); FLUSH_LOCAL_BUF(); @@ -596,7 +598,7 @@ result Thread::Yield(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Yield_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER); FLUSH_LOCAL_BUF(); @@ -645,7 +647,7 @@ result Thread::Exit(int exitCode) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Exit_int_exitCode_, "d", exitCode); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('n', 0, 0, blockresult); PACK_THREAD((unsigned int)currentThread, THREAD_TIZENTHREAD_WORKER, THREAD_API_EXIT); FLUSH_LOCAL_BUF(); @@ -706,7 +708,7 @@ result Thread::Construct(ThreadType threadType, long stackSize, API_ID_result_Thread__Construct_ThreadType_threadType__long_stackSize__ThreadPriority_priority_, "dxd", threadType, (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -757,7 +759,7 @@ result Thread::Construct(long stackSize, ThreadPriority priority) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Construct_long_stackSize__ThreadPriority_priority_, "xd", (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -814,7 +816,7 @@ result Thread::Construct(const Tizen::Base::String &name, long stackSize, PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_, "sxd", temp, (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -874,7 +876,7 @@ result Thread::Construct(const Tizen::Base::String &name, ThreadType threadType, API_ID_result_Thread__Construct_const_Tizen__Base__String__name__ThreadType_threadType__long_stackSize__ThreadPriority_priority_, "sdxd", temp, threadType, (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -931,7 +933,7 @@ result Thread::Construct(IRunnable &target, long stackSize, API_ID_result_Thread__Construct_IRunnable__target__long_stackSize__ThreadPriority_priority_, "xxd", (uint64_t)(&target), (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -991,7 +993,7 @@ result Thread::Construct(const Tizen::Base::String &name, IRunnable &target, API_ID_result_Thread__Construct_const_Tizen__Base__String__name__IRunnable__target__long_stackSize__ThreadPriority_priority_, "sxxd", temp, (uint64_t)(&target), (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -1045,7 +1047,7 @@ result Thread::GetExitCode(int &exitCode) const { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__GetExitCode_int__exitCode__const, "d", exitCode); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_OTHER); FLUSH_LOCAL_BUF(); @@ -1146,7 +1148,7 @@ result Thread::Join(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Join_void_, "", 0); - PACK_COMMON_END('p', 0, 0, blockresult); + PACK_COMMON_END('x', 0, 0, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_START); FLUSH_LOCAL_BUF(); @@ -1162,7 +1164,7 @@ result Thread::Join(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Join_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_WAIT_END); FLUSH_LOCAL_BUF(); @@ -1291,7 +1293,7 @@ result Thread::Start(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Start_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_START); FLUSH_LOCAL_BUF(); @@ -1341,7 +1343,7 @@ result Thread::Stop(void) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_Thread__Stop_void_, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_WORKER, THREAD_API_STOP); FLUSH_LOCAL_BUF(); @@ -1393,7 +1395,7 @@ result EventDrivenThread::Construct(long stackSize, ThreadPriority priority) { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_EventDrivenThread__Construct_long_stackSize__ThreadPriority_priority_, "xd", (uint64_t)(stackSize), priority); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -1453,7 +1455,7 @@ result EventDrivenThread::Construct(const Tizen::Base::String &name, long stackS PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_EventDrivenThread__Construct_const_Tizen__Base__String__name__long_stackSize__ThreadPriority_priority_, "sx", temp, (uint64_t)(stackSize)); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_NEW); FLUSH_LOCAL_BUF(); @@ -1505,7 +1507,7 @@ result EventDrivenThread::Quit() { PACK_COMMON_BEGIN(MSG_PROBE_THREAD, API_ID_result_EventDrivenThread__Quit__, "", 0); - PACK_COMMON_END('p', ret, ret, blockresult); + PACK_COMMON_END('x', ret, ret, blockresult); PACK_THREAD((unsigned int) this, THREAD_TIZENTHREAD_EVENTDRIVEN, THREAD_API_STOP); FLUSH_LOCAL_BUF();