Fix -v RpcData

silicon-heaven · Dec 17, 2024 · c807222 · c807222
1 parent bc8c0a8
commit c807222
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/libshvchainpack/include/shv/chainpack/abstractstreamreader.h b/libshvchainpack/include/shv/chainpack/abstractstreamreader.h
@@ -33,7 +33,7 @@ class SHVCHAINPACK_DECL_EXPORT AbstractStreamReader
 	virtual void read(RpcValue::MetaData &meta_data) = 0;
 	virtual void read(RpcValue &val) = 0;
 
-	ssize_t readCount() const;
+	int64_t readCount() const;
 protected:
 	// NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members)
 	std::istream &m_in;

diff --git a/libshvchainpack/src/abstractstreamreader.cpp b/libshvchainpack/src/abstractstreamreader.cpp
@@ -70,7 +70,7 @@ RpcValue AbstractStreamReader::read(std::string *error)
 	return ret;
 }
 
-ssize_t AbstractStreamReader::readCount() const
+int64_t AbstractStreamReader::readCount() const
 {
 	auto count = m_in.tellg();
 	if (count >= 0) {

diff --git a/libshvchainpack/src/rpcdriver.cpp b/libshvchainpack/src/rpcdriver.cpp
@@ -50,7 +50,6 @@ void RpcDriver::sendRpcFrame(RpcFrame &&frame)
 			writeFrame(frame2);
 		}
 		else {
-			//logRpcData().nospace() << "FRAME DATA WRITE " << frame_data.size() << " bytes of data:\n" << shv::chainpack::utils::hexDump(frame_data);
 			writeFrame(frame);
 		}
 	}

diff --git a/libshviotqt/src/rpc/socket.cpp b/libshviotqt/src/rpc/socket.cpp
@@ -28,6 +28,9 @@ void FrameWriter::addFrame(const chainpack::RpcFrame &frame)
 {
 	try {
 		auto frame_head = frame.toFrameHead();
+		logRpcData().nospace() << "FRAME DATA WRITE " << (frame_head.length() + frame.data.length())
+							   << " bytes of data:\n"
+							   << [&frame_head, &frame]() { return shv::chainpack::utils::hexDump(frame_head + frame.data); }();
 		addFrameData(frame_head, frame.data);
 	} catch (const std::runtime_error &e) {
 		shvWarning() << "Error converting frame to data:" << e.what();
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ void RpcDriver::sendRpcFrame(RpcFrame &&frame) @@
     			writeFrame(frame2);
     		}
     		else {
-    			//logRpcData().nospace() << "FRAME DATA WRITE " << frame_data.size() << " bytes of data:\n" << shv::chainpack::utils::hexDump(frame_data);
     			writeFrame(frame);
     		}
     	}
@@ Expand Down @@