Revision: 7247 http://playerstage.svn.sourceforge.net/playerstage/?rev=7247&view=rev Author: thjc Date: 2009-01-06 18:51:07 +0000 (Tue, 06 Jan 2009)
Log Message: ----------- Merge of 7246 from trunk: Fixed bug where client reads would not timeout when waiting for data in pull mode Modified Paths: -------------- code/player/branches/release-2-1-patches/client_libs/libplayerc/client.c 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,7081,7166-7169,7188,7207 + /code/player/trunk:7062,7081,7166-7169,7188,7207,7246 Modified: code/player/branches/release-2-1-patches/client_libs/libplayerc/client.c =================================================================== --- code/player/branches/release-2-1-patches/client_libs/libplayerc/client.c 2009-01-06 18:41:50 UTC (rev 7246) +++ code/player/branches/release-2-1-patches/client_libs/libplayerc/client.c 2009-01-06 18:51:07 UTC (rev 7247) @@ -764,15 +764,19 @@ return playerc_client_writepacket(client, &header, cmd); } +inline double tdiff (const struct timeval t1, const struct timeval t2) +{ + return (double)(t2.tv_sec - t1.tv_sec) + (double)(t2.tv_usec - t1.tv_usec)/1e6; +} + // Issue request and await reply (blocking). int playerc_client_request(playerc_client_t *client, playerc_device_t *deviceinfo, uint8_t subtype, const void *req_data, void **rep_data) { - double t; int peek; - struct timeval last; + struct timeval start; struct timeval curr; player_msghdr_t req_header, rep_header; memset(&req_header, 0, sizeof(req_header)); @@ -794,14 +798,11 @@ if (playerc_client_writepacket(client, &req_header, req_data) < 0) return -1; - t = client->request_timeout; - // Read packets until we get a reply. Data packets get queued up // for later processing. - while(t >= 0) + gettimeofday(&start,NULL); + for(curr = start; tdiff(start,curr)< client->request_timeout; gettimeofday(&curr,NULL)) { - gettimeofday(&last,NULL); - // Peek at the socket if((peek = playerc_client_internal_peek(client,10)) < 0) return -1; @@ -811,9 +812,6 @@ // There's data on the socket, so read a packet (blocking). if(playerc_client_readpacket(client, &rep_header, client->data) < 0) return -1; - gettimeofday(&curr,NULL); - t -= ((curr.tv_sec + curr.tv_usec/1e6) - - (last.tv_sec + last.tv_usec/1e6)); if (rep_header.type == PLAYER_MSGTYPE_DATA || rep_header.type == PLAYER_MSGTYPE_SYNCH) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit