Revision: 7213 http://playerstage.svn.sourceforge.net/playerstage/?rev=7213&view=rev Author: thjc Date: 2008-12-28 01:26:08 +0000 (Sun, 28 Dec 2008)
Log Message: ----------- Merge from trunk 7081: applied patch 2136981 khepera read() patch Modified Paths: -------------- code/player/branches/release-2-1-patches/server/drivers/mixed/khepera/khepera_serial.cc Property Changed: ---------------- code/player/branches/release-2-1-patches/ Property changes on: code/player/branches/release-2-1-patches ___________________________________________________________________ Modified: svn:mergeinfo - /code/player/trunk:7062 + /code/player/trunk:7062,7081 Modified: code/player/branches/release-2-1-patches/server/drivers/mixed/khepera/khepera_serial.cc =================================================================== --- code/player/branches/release-2-1-patches/server/drivers/mixed/khepera/khepera_serial.cc 2008-12-22 18:10:00 UTC (rev 7212) +++ code/player/branches/release-2-1-patches/server/drivers/mixed/khepera/khepera_serial.cc 2008-12-28 01:26:08 UTC (rev 7213) @@ -132,10 +132,14 @@ int TimePassed = 0; gettimeofday(&Start,NULL); int length = 0; + int rc = 0; do { pthread_testcancel(); - length += read(fd, &buffer[length], KHEPERA_BUFFER_LEN - length); + rc = read(fd, &buffer[length], KHEPERA_BUFFER_LEN - length); + if (rc < 0) + errno = rc = 0; + else length += rc; gettimeofday(&Now,NULL); TimePassed = (Now.tv_sec - Start.tv_sec)*1000000 + Now.tv_usec - Start.tv_usec; } while (buffer[length-1] != '\n' && TimePassed < KHEPERA_SERIAL_TIMEOUT_USECS); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit