From: Sunwook Bae Date: Thu, 30 May 2013 07:12:21 +0000 (+0900) Subject: Revert "Add SetTimeout() in _IpcClient" X-Git-Tag: accepted/tizen/20130912.081851^2~281 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0b6088da5447713f9bdc1113f3b7d5c380d8071;p=platform%2Fframework%2Fnative%2Fappfw.git Revert "Add SetTimeout() in _IpcClient" This reverts commit c322ed329530873f0dc78d6244f53cbcffdf508a. Change-Id: Ic65acef45cd467e429020dd73d071e031c2a2489 Signed-off-by: Sunwook Bae --- diff --git a/src/io/FIo_IpcClient.cpp b/src/io/FIo_IpcClient.cpp index 780bb7f..6e1061f 100644 --- a/src/io/FIo_IpcClient.cpp +++ b/src/io/FIo_IpcClient.cpp @@ -57,7 +57,6 @@ namespace Tizen { namespace Io _IpcClient::_IpcClient(void) : __pReverseSource(null) , __fdCount(0) - , __timeout(-1) , __pFdLock(null) , __pListener(null) { @@ -565,7 +564,7 @@ _IpcClient::SendSync(IPC::Message* pMessage) while (true) { - ret = poll(&pfd, 1, __timeout); + ret = poll(&pfd, 1, -1); if (ret < 0) { if (errno == EINTR) @@ -578,13 +577,6 @@ _IpcClient::SendSync(IPC::Message* pMessage) ReleaseFd(fd); return E_SYSTEM; } - else if (ret == 0) - { - SysLogException(NID_IO, E_TIMEOUT, "[E_TIMEOUT] Timeout."); - - ReleaseFd(fd); - return E_TIMEOUT; - } if (pfd.revents & POLLRDHUP) { @@ -675,16 +667,4 @@ _IpcClient::SendRequest(const IPC::Message& message) return r; } -void -_IpcClient::SetTimeout(int timeout) -{ - __timeout = timeout; -} - -int -_IpcClient::GetTimeout(void) const -{ - return __timeout; -} - } } //Tizen::Io diff --git a/src/io/inc/FIo_IpcClient.h b/src/io/inc/FIo_IpcClient.h index f262022..1cbd394 100644 --- a/src/io/inc/FIo_IpcClient.h +++ b/src/io/inc/FIo_IpcClient.h @@ -104,7 +104,6 @@ public: * @exception E_SUCCESS The method was successful. * @exception E_INVALID_STATE The instance is in an invalid state. * @exception E_OUT_OF_MEMORY Insufficient memory. - * @exception E_TIMEOUT The operation can not be completed within the specified time period. * @exception E_SYSTEM A system error occurred. * */ @@ -112,22 +111,6 @@ public: result SendRequest(IPC::Message* pMessage); - - /** - * Sets the timeout value which is used to send a synchronous message to the server. - * - * @param[in] timeout The time limit for synchronous messages, in milliseconds. - * @c infinite timeout if @c timeout value is a negative. - */ - void SetTimeout(int timeout); - - /** - * Gets the timeout value. - * - * @return The name of the IPC server. - */ - int GetTimeout() const; - private: _IpcClient(const _IpcClient& value); @@ -154,7 +137,6 @@ private: std::vector __fds; int __fdCount; - int __timeout; Tizen::Base::Runtime::Mutex* __pFdLock; Tizen::Base::String __name; _IIpcClientEventListener* __pListener;