Revision: 9134
http://sourceforge.net/p/playerstage/svn/9134
Author: jpgr87
Date: 2013-11-11 00:50:34 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
Applied patch #639: thread safety of playerc_client_writepacket
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/client.c
code/player/trunk/client_libs/libplayerc/playerc.h
Modified: code/player/trunk/client_libs/libplayerc/client.c
===================================================================
--- code/player/trunk/client_libs/libplayerc/client.c 2013-11-11 00:44:19 UTC
(rev 9133)
+++ code/player/trunk/client_libs/libplayerc/client.c 2013-11-11 00:50:34 UTC
(rev 9134)
@@ -185,11 +185,9 @@
// TODO: make this memory allocation more conservative
client->data = (char*)malloc(PLAYER_MAX_MESSAGE_SIZE);
- client->write_xdrdata = (char*)malloc(PLAYERXDR_MAX_MESSAGE_SIZE);
client->read_xdrdata = (char*)malloc(PLAYERXDR_MAX_MESSAGE_SIZE);
client->read_xdrdata_len = 0;
assert(client->data);
- assert(client->write_xdrdata);
assert(client->read_xdrdata);
client->qfirst = 0;
@@ -231,7 +229,6 @@
#endif
free(client->data);
- free(client->write_xdrdata);
free(client->read_xdrdata);
free(client->host);
free(client);
@@ -1297,10 +1294,12 @@
player_pack_fn_t packfunc;
int encode_msglen;
struct timeval curr;
+ char *write_xdrdata = (char
*)malloc(sizeof(char[PLAYERXDR_MAX_MESSAGE_SIZE]));
if (client->sock < 0)
{
PLAYERC_WARN("no socket to write to");
+ free(write_xdrdata);
return -1;
}
@@ -1316,16 +1315,18 @@
// messages
PLAYERC_ERR4("skipping message to %s:%u with unsupported type %s:%u",
interf_to_str(header->addr.interf), header->addr.index,
msgtype_to_str(header->type), header->subtype);
+ free(write_xdrdata);
return(-1);
}
if((encode_msglen =
- (*packfunc)(client->write_xdrdata + PLAYERXDR_MSGHDR_SIZE,
+ (*packfunc)(write_xdrdata + PLAYERXDR_MSGHDR_SIZE,
PLAYER_MAX_MESSAGE_SIZE - PLAYERXDR_MSGHDR_SIZE,
(void*) data, PLAYERXDR_ENCODE)) < 0)
{
PLAYERC_ERR4("encoding failed on message from %s:%u with type %s:%u",
interf_to_str(header->addr.interf), header->addr.index,
msgtype_to_str(header->type), header->subtype);
+ free(write_xdrdata);
return(-1);
}
}
@@ -1337,10 +1338,11 @@
gettimeofday(&curr,NULL);
header->timestamp = curr.tv_sec + curr.tv_usec / 1e6;
// Pack the header
- if(player_msghdr_pack(client->write_xdrdata, PLAYERXDR_MSGHDR_SIZE,
+ if(player_msghdr_pack(write_xdrdata, PLAYERXDR_MSGHDR_SIZE,
header, PLAYERXDR_ENCODE) < 0)
{
PLAYERC_ERR("failed to pack header");
+ free(write_xdrdata);
return -1;
}
@@ -1349,7 +1351,7 @@
bytes = PLAYERXDR_MSGHDR_SIZE + encode_msglen;
do
{
- ret = send(client->sock, &client->write_xdrdata[length-bytes],
+ ret = send(client->sock, &write_xdrdata[length-bytes],
bytes, 0);
if (ret > 0)
{
@@ -1363,10 +1365,12 @@
{
STRERROR (PLAYERC_ERR2, "send on body failed with error [%d: %s]");
//playerc_client_disconnect(client);
+ free(write_xdrdata);
return(playerc_client_disconnect_retry(client));
}
} while (bytes);
+ free(write_xdrdata);
return 0;
}
Modified: code/player/trunk/client_libs/libplayerc/playerc.h
===================================================================
--- code/player/trunk/client_libs/libplayerc/playerc.h 2013-11-11 00:44:19 UTC
(rev 9133)
+++ code/player/trunk/client_libs/libplayerc/playerc.h 2013-11-11 00:50:34 UTC
(rev 9134)
@@ -562,7 +562,6 @@
/** @internal Temp buffers for incoming / outgoing packets. */
char *data;
- char *write_xdrdata;
char *read_xdrdata;
size_t read_xdrdata_len;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
