You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2010/10/06 19:09:42 UTC
svn commit: r1005129 - in /incubator/thrift/trunk:
compiler/cpp/src/generate/ lib/cpp/src/ lib/cpp/src/transport/ test/cpp/src/
Author: dreiss
Date: Wed Oct 6 17:09:42 2010
New Revision: 1005129
URL: http://svn.apache.org/viewvc?rev=1005129&view=rev
Log:
THRIFT-928. cpp: Include request/response size in processor callbacks
Required updating transport interface.
Modified:
incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
incubator/thrift/trunk/lib/cpp/src/TProcessor.h
incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp
incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp
incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.h
incubator/thrift/trunk/lib/cpp/src/transport/TTransport.h
incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp
incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.h
incubator/thrift/trunk/test/cpp/src/TestServer.cpp
Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_cpp_generator.cc Wed Oct 6 17:09:42 2010
@@ -2351,9 +2351,9 @@ void t_cpp_generator::generate_process_f
indent() << argsname << " args;" << endl <<
indent() << "args.read(iprot);" << endl <<
indent() << "iprot->readMessageEnd();" << endl <<
- indent() << "iprot->getTransport()->readEnd();" << endl << endl <<
+ indent() << "uint32_t bytes = iprot->getTransport()->readEnd();" << endl << endl <<
indent() << "if (eventHandler_.get() != NULL) {" << endl <<
- indent() << " eventHandler_->postRead(ctx, \"" << tfunction->get_name() << "\");" << endl <<
+ indent() << " eventHandler_->postRead(ctx, \"" << tfunction->get_name() << "\", bytes);" << endl <<
indent() << "}" << endl <<
endl;
@@ -2460,10 +2460,10 @@ void t_cpp_generator::generate_process_f
indent() << "oprot->writeMessageBegin(\"" << tfunction->get_name() << "\", ::apache::thrift::protocol::T_REPLY, seqid);" << endl <<
indent() << "result.write(oprot);" << endl <<
indent() << "oprot->writeMessageEnd();" << endl <<
- indent() << "oprot->getTransport()->writeEnd();" << endl <<
+ indent() << "bytes = oprot->getTransport()->writeEnd();" << endl <<
indent() << "oprot->getTransport()->flush();" << endl << endl <<
indent() << "if (eventHandler_.get() != NULL) {" << endl <<
- indent() << " eventHandler_->postWrite(ctx, \"" << tfunction->get_name() << "\");" << endl <<
+ indent() << " eventHandler_->postWrite(ctx, \"" << tfunction->get_name() << "\", bytes);" << endl <<
indent() << "}" << endl;
// Close function
Modified: incubator/thrift/trunk/lib/cpp/src/TProcessor.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/TProcessor.h?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/TProcessor.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/TProcessor.h Wed Oct 6 17:09:42 2010
@@ -59,7 +59,7 @@ class TProcessorEventHandler {
/**
* Called between reading arguments and calling the handler.
*/
- virtual void postRead(void* ctx, const char* fn_name) {}
+ virtual void postRead(void* ctx, const char* fn_name, uint32_t bytes) {}
/**
* Called between calling the handler and writing the response.
@@ -69,7 +69,7 @@ class TProcessorEventHandler {
/**
* Called after writing the response.
*/
- virtual void postWrite(void* ctx, const char* fn_name) {}
+ virtual void postWrite(void* ctx, const char* fn_name, uint32_t bytes) {}
/**
* Called when an async function call completes successfully.
Modified: incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.cpp Wed Oct 6 17:09:42 2010
@@ -262,6 +262,10 @@ void TFramedTransport::flush() {
transport_->flush();
}
+uint32_t TFramedTransport::writeEnd() {
+ return wBase_ - wBuf_.get();
+}
+
const uint8_t* TFramedTransport::borrowSlow(uint8_t* buf, uint32_t* len) {
// Don't try to be clever with shifting buffers.
// If the fast path failed let the protocol use its slow path.
@@ -269,6 +273,10 @@ const uint8_t* TFramedTransport::borrowS
return NULL;
}
+uint32_t TFramedTransport::readEnd() {
+ // include framing bytes
+ return rBound_ - rBuf_.get() + sizeof(uint32_t);
+}
void TMemoryBuffer::computeRead(uint32_t len, uint8_t** out_start, uint32_t* out_give) {
// Correct rBound_ so we can use the fast path in the future.
Modified: incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h Wed Oct 6 17:09:42 2010
@@ -348,6 +348,10 @@ class TFramedTransport : public TBufferB
virtual void flush();
+ uint32_t readEnd();
+
+ uint32_t writeEnd();
+
const uint8_t* borrowSlow(uint8_t* buf, uint32_t* len);
boost::shared_ptr<TTransport> getUnderlyingTransport() {
@@ -612,10 +616,18 @@ class TMemoryBuffer : public TBufferBase
uint32_t readAppendToString(std::string& str, uint32_t len);
- void readEnd() {
+ // return number of bytes read
+ uint32_t readEnd() {
+ uint32_t bytes = rBase_ - buffer_;
if (rBase_ == wBase_) {
resetBuffer();
}
+ return bytes;
+ }
+
+ // Return number of bytes written
+ uint32_t writeEnd() {
+ return wBase_ - buffer_;
}
uint32_t available_read() const {
Modified: incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.cpp Wed Oct 6 17:09:42 2010
@@ -66,13 +66,14 @@ uint32_t THttpTransport::read(uint8_t* b
return readBuffer_.read(buf, len);
}
-void THttpTransport::readEnd() {
+uint32_t THttpTransport::readEnd() {
// Read any pending chunked data (footers etc.)
if (chunked_) {
while (!chunkedDone_) {
readChunked();
}
}
+ return 0;
}
uint32_t THttpTransport::readMoreData() {
Modified: incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.h?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/THttpTransport.h Wed Oct 6 17:09:42 2010
@@ -55,7 +55,7 @@ class THttpTransport : public TTransport
uint32_t read(uint8_t* buf, uint32_t len);
- void readEnd();
+ uint32_t readEnd();
void write(const uint8_t* buf, uint32_t len);
Modified: incubator/thrift/trunk/lib/cpp/src/transport/TTransport.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/TTransport.h?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/TTransport.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/TTransport.h Wed Oct 6 17:09:42 2010
@@ -116,10 +116,11 @@ class TTransport {
* This can be over-ridden to perform a transport-specific action
* e.g. logging the request to a file
*
+ * @return number of bytes read if available, 0 otherwise.
*/
- virtual void readEnd() {
+ virtual uint32_t readEnd() {
// default behaviour is to do nothing
- return;
+ return 0;
}
/**
@@ -137,10 +138,11 @@ class TTransport {
* This can be over-ridden to perform a transport-specific action
* at the end of a request.
*
+ * @return number of bytes written if available, 0 otherwise
*/
- virtual void writeEnd() {
+ virtual uint32_t writeEnd() {
// default behaviour is to do nothing
- return;
+ return 0;
}
/**
@@ -149,7 +151,9 @@ class TTransport {
*
* @throws TTransportException if an error occurs
*/
- virtual void flush() {}
+ virtual void flush() {
+ // default behaviour is to do nothing
+ }
/**
* Attempts to return a pointer to \c len bytes, possibly copied into \c buf.
Modified: incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.cpp Wed Oct 6 17:09:42 2010
@@ -135,16 +135,16 @@ uint32_t TPipedFileReaderTransport::read
return have;
}
-void TPipedFileReaderTransport::readEnd() {
- TPipedTransport::readEnd();
+uint32_t TPipedFileReaderTransport::readEnd() {
+ return TPipedTransport::readEnd();
}
void TPipedFileReaderTransport::write(const uint8_t* buf, uint32_t len) {
TPipedTransport::write(buf, len);
}
-void TPipedFileReaderTransport::writeEnd() {
- TPipedTransport::writeEnd();
+uint32_t TPipedFileReaderTransport::writeEnd() {
+ return TPipedTransport::writeEnd();
}
void TPipedFileReaderTransport::flush() {
Modified: incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.h?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/transport/TTransportUtils.h Wed Oct 6 17:09:42 2010
@@ -136,7 +136,7 @@ class TPipedTransport : virtual public T
uint32_t read(uint8_t* buf, uint32_t len);
- void readEnd() {
+ uint32_t readEnd() {
if (pipeOnRead_) {
dstTrans_->write(rBuf_, rPos_);
@@ -148,18 +148,22 @@ class TPipedTransport : virtual public T
// If requests are being pipelined, copy down our read-ahead data,
// then reset our state.
int read_ahead = rLen_ - rPos_;
+ uint32_t bytes = rPos_;
memcpy(rBuf_, rBuf_ + rPos_, read_ahead);
rPos_ = 0;
rLen_ = read_ahead;
+
+ return bytes;
}
void write(const uint8_t* buf, uint32_t len);
- void writeEnd() {
+ uint32_t writeEnd() {
if (pipeOnWrite_) {
dstTrans_->write(wBuf_, wLen_);
dstTrans_->flush();
}
+ return wLen_;
}
void flush();
@@ -237,9 +241,9 @@ class TPipedFileReaderTransport : public
void close();
uint32_t read(uint8_t* buf, uint32_t len);
uint32_t readAll(uint8_t* buf, uint32_t len);
- void readEnd();
+ uint32_t readEnd();
void write(const uint8_t* buf, uint32_t len);
- void writeEnd();
+ uint32_t writeEnd();
void flush();
// TFileReaderTransport functions
Modified: incubator/thrift/trunk/test/cpp/src/TestServer.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/cpp/src/TestServer.cpp?rev=1005129&r1=1005128&r2=1005129&view=diff
==============================================================================
--- incubator/thrift/trunk/test/cpp/src/TestServer.cpp (original)
+++ incubator/thrift/trunk/test/cpp/src/TestServer.cpp Wed Oct 6 17:09:42 2010
@@ -298,13 +298,13 @@ class TestProcessorEventHandler : public
virtual void preRead(void* ctx, const char* fn_name) {
communicate("preRead", ctx, fn_name);
}
- virtual void postRead(void* ctx, const char* fn_name) {
+ virtual void postRead(void* ctx, const char* fn_name, uint32_t bytes) {
communicate("postRead", ctx, fn_name);
}
virtual void preWrite(void* ctx, const char* fn_name) {
communicate("preWrite", ctx, fn_name);
}
- virtual void postWrite(void* ctx, const char* fn_name) {
+ virtual void postWrite(void* ctx, const char* fn_name, uint32_t bytes) {
communicate("postWrite", ctx, fn_name);
}
virtual void asyncComplete(void* ctx, const char* fn_name) {