kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new makefile target + better error description in Socket::readBytes

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-04-14 21:50:26 -07:00
parent bea582c208
commit 35630fe7ed
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ixwebsocket/IXSocket.cpp
View File

@ -376,7 +376,8 @@ namespace ix
{ {
if (isCancellationRequested && isCancellationRequested()) if (isCancellationRequested && isCancellationRequested())
{ {
return std::make_pair(false, std::string()); const std::string errorMsg("Cancellation Requested");
return std::make_pair(false, errorMsg);
} }
size_t size = std::min(kChunkSize, length - output.size()); size_t size = std::min(kChunkSize, length - output.size());
@ -388,7 +389,8 @@ namespace ix
} }
else if (ret <= 0 && !Socket::isWaitNeeded()) else if (ret <= 0 && !Socket::isWaitNeeded())
{ {
return std::make_pair(false, std::string()); const std::string errorMsg("Recv Error");
return std::make_pair(false, errorMsg);
} }
if (onProgressCallback) onProgressCallback((int) output.size(), (int) length); if (onProgressCallback) onProgressCallback((int) output.size(), (int) length);
@ -397,7 +399,8 @@ namespace ix
// This way we are not busy looping // This way we are not busy looping
if (isReadyToRead(1) == PollResultType::Error) if (isReadyToRead(1) == PollResultType::Error)
{ {
return std::make_pair(false, std::string()); const std::string errorMsg("Poll Error");
return std::make_pair(false, errorMsg);
} }
} }

6
makefile
View File

@ -116,10 +116,12 @@ test_ubsan:
(cd build/test ; ln -sf Debug/ixwebsocket_unittest) (cd build/test ; ln -sf Debug/ixwebsocket_unittest)
(cd test ; python2.7 run.py -r) (cd test ; python2.7 run.py -r)
test_asan: test_asan: build_test_asan
(cd test ; python2.7 run.py -r)
build_test_asan:
mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableAddressSanitizer YES) mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableAddressSanitizer YES)
(cd build/test ; ln -sf Debug/ixwebsocket_unittest) (cd build/test ; ln -sf Debug/ixwebsocket_unittest)
(cd test ; python2.7 run.py -r)
test_tsan_openssl: test_tsan_openssl:
mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES) mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES)