valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[thrift] Propogate exceptions from transports in thrift_protocol extension

Browse Source 
Summary: Otherwise, it will spin forever if your socket connection gets dropped
  or otherwise times out.
Reviewed by: dbraginsky
Test plan: Modified TSocket to always throw an exception on read() and tried
  some service calls
Revert: svn


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665652 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dweatherford 2008-04-11 02:51:44 +00:00
parent 8361bf0565
commit e4dc4f5366
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
View File

@ -75,6 +75,19 @@ zend_module_entry thrift_protocol_module_entry = {
ZEND_GET_MODULE(thrift_protocol) ZEND_GET_MODULE(thrift_protocol)
#endif #endif
class PHPExceptionWrapper : public std::exception {
public:
PHPExceptionWrapper(zval* _ex) throw() : ex(_ex) {
snprintf(_what, 40, "PHP exception zval=%p", ex);
}
const char* what() const throw() { return _what; }
~PHPExceptionWrapper() throw() {}
operator zval*() const throw() { return const_cast<zval*>(ex); } // Zend API doesn't do 'const'...
protected:
zval* ex;
char _what[40];
} ;
class PHPTransport { class PHPTransport {
public: public:
zval* protocol() { return p; } zval* protocol() { return p; }
@ -198,6 +211,11 @@ protected:
call_user_function(EG(function_table), &t, &writefn, &ret, 1, args TSRMLS_CC); call_user_function(EG(function_table), &t, &writefn, &ret, 1, args TSRMLS_CC);
zval_ptr_dtor(args); zval_ptr_dtor(args);
zval_dtor(&ret); zval_dtor(&ret);
if (EG(exception)) {
zval* ex = EG(exception);
EG(exception) = NULL;
throw PHPExceptionWrapper(ex);
}
} }
}; };
@ -306,6 +324,13 @@ protected:
call_user_function(EG(function_table), &t, &funcname, &retval, 1, args TSRMLS_CC); call_user_function(EG(function_table), &t, &funcname, &retval, 1, args TSRMLS_CC);
zval_ptr_dtor(args); zval_ptr_dtor(args);
if (EG(exception)) {
zval_dtor(&retval);
zval* ex = EG(exception);
EG(exception) = NULL;
throw PHPExceptionWrapper(ex);
}
buffer_used = Z_STRLEN(retval); buffer_used = Z_STRLEN(retval);
memcpy(buffer, Z_STRVAL(retval), buffer_used); memcpy(buffer, Z_STRVAL(retval), buffer_used);
zval_dtor(&retval); zval_dtor(&retval);
@ -337,19 +362,6 @@ void createObject(char* obj_typename, zval* return_value, int nargs = 0, zval* a
zval_ptr_dtor(&ctor_rv); zval_ptr_dtor(&ctor_rv);
} }
class PHPExceptionWrapper : public std::exception {
public:
PHPExceptionWrapper(zval* _ex) throw() : ex(_ex) {
snprintf(_what, 40, "PHP exception zval=%p", ex);
}
const char* what() const throw() { return _what; }
~PHPExceptionWrapper() throw() {}
operator zval*() const throw() { return const_cast<zval*>(ex); } // Zend API doesn't do 'const'...
protected:
zval* ex;
char _what[40];
} ;
void throw_tprotocolexception(char* what, long errorcode) { void throw_tprotocolexception(char* what, long errorcode) {
TSRMLS_FETCH(); TSRMLS_FETCH();