diff options
author | Roger Meier <roger@apache.org> | 2011-08-03 20:12:32 +0000 |
---|---|---|
committer | Roger Meier <roger@apache.org> | 2011-08-03 20:12:32 +0000 |
commit | 184281c1a1a9a1f1fe0cbbdf4a97926936082028 (patch) | |
tree | 9e09bc8b48d90e8cf69f075dcdefbf357c36fbfc | |
parent | 9e0f0743f377e59ee2aa21666c18bb3b092661f5 (diff) | |
download | thrift-184281c1a1a9a1f1fe0cbbdf4a97926936082028.tar.gz |
THRIFT-916 printf %lld for 32bit platform only by using __ia64__
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1153638 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | lib/cpp/src/transport/TFileTransport.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/cpp/src/transport/TFileTransport.cpp b/lib/cpp/src/transport/TFileTransport.cpp index b42a09318..984543628 100644 --- a/lib/cpp/src/transport/TFileTransport.cpp +++ b/lib/cpp/src/transport/TFileTransport.cpp @@ -741,9 +741,15 @@ bool TFileTransport::isEventCorrupted() { } else if( ((offset_ + readState_.bufferPtr_ - 4)/chunkSize_) != ((offset_ + readState_.bufferPtr_ + readState_.event_->eventSize_ - 1)/chunkSize_) ) { // 3. size indicates that event crosses chunk boundary +#ifdef __ia64__ + T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u Offset:%ld", + readState_.event_->eventSize_, + (int64_t) (offset_ + readState_.bufferPtr_ + 4)); +#else T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u Offset:%lld", readState_.event_->eventSize_, (int64_t) (offset_ + readState_.bufferPtr_ + 4)); +#endif return true; } @@ -783,8 +789,13 @@ void TFileTransport::performRecovery() { readState_.resetState(readState_.lastDispatchPtr_); currentEvent_ = NULL; char errorMsg[1024]; +#ifdef __ia64__ + sprintf(errorMsg, "TFileTransport: log file corrupted at offset: %ld", + (int64_t) (offset_ + readState_.lastDispatchPtr_)); +#else sprintf(errorMsg, "TFileTransport: log file corrupted at offset: %lld", (int64_t) (offset_ + readState_.lastDispatchPtr_)); +#endif GlobalOutput(errorMsg); throw TTransportException(errorMsg); |