Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leak in PhysicsClientSharedMemory

Browse Source
This commit is contained in:
Takuya Nakaoka
2015-11-09 11:40:11 +09:00
parent 6df6df3b26
commit b961cce360
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
examples/SharedMemory/PhysicsClientSharedMemory.cpp
View File

@@ -3,6 +3,7 @@
#include "Win32SharedMemory.h" #include "Win32SharedMemory.h"
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include <string.h>
#include "Bullet3Common/b3Logging.h" #include "Bullet3Common/b3Logging.h"
#include "../Utils/b3ResourcePath.h" #include "../Utils/b3ResourcePath.h"
@@ -71,6 +72,15 @@ struct PhysicsClientSharedMemoryInternalData {
bool canSubmitCommand() const; bool canSubmitCommand() const;
}; };
static char* strDup(const char* const str)
{
#ifdef _WIN32
return _strdup(str);
#else
return strdup(str);
#endif
}
int PhysicsClientSharedMemory::getNumJoints(int bodyIndex) const int PhysicsClientSharedMemory::getNumJoints(int bodyIndex) const
{ {
BodyJointInfoCache** bodyJointsPtr = m_data->m_bodyJointMap[bodyIndex]; BodyJointInfoCache** bodyJointsPtr = m_data->m_bodyJointMap[bodyIndex];
@@ -188,24 +198,24 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
} }
if (serverCmd.m_dataStreamArguments.m_streamChunkLength > 0) { if (serverCmd.m_dataStreamArguments.m_streamChunkLength > 0) {
bParse::btBulletFile* bf = new bParse::btBulletFile( bParse::btBulletFile bf(
this->m_data->m_testBlock1->m_bulletStreamDataServerToClient, this->m_data->m_testBlock1->m_bulletStreamDataServerToClient,
serverCmd.m_dataStreamArguments.m_streamChunkLength); serverCmd.m_dataStreamArguments.m_streamChunkLength);
bf->setFileDNAisMemoryDNA(); bf.setFileDNAisMemoryDNA();
bf->parse(false); bf.parse(false);
int bodyIndex = serverCmd.m_dataStreamArguments.m_bodyUniqueId; int bodyIndex = serverCmd.m_dataStreamArguments.m_bodyUniqueId;
BodyJointInfoCache* bodyJoints = new BodyJointInfoCache; BodyJointInfoCache* bodyJoints = new BodyJointInfoCache;
m_data->m_bodyJointMap.insert(bodyIndex,bodyJoints); m_data->m_bodyJointMap.insert(bodyIndex,bodyJoints);
for (int i = 0; i < bf->m_multiBodies.size(); i++) { for (int i = 0; i < bf.m_multiBodies.size(); i++) {
int flag = bf->getFlags(); int flag = bf.getFlags();
int qOffset = 7; int qOffset = 7;
int uOffset = 6; int uOffset = 6;
if ((flag & bParse::FD_DOUBLE_PRECISION) != 0) { if ((flag & bParse::FD_DOUBLE_PRECISION) != 0) {
Bullet::btMultiBodyDoubleData* mb = Bullet::btMultiBodyDoubleData* mb =
(Bullet::btMultiBodyDoubleData*)bf->m_multiBodies[i]; (Bullet::btMultiBodyDoubleData*)bf.m_multiBodies[i];
if (mb->m_baseName) { if (mb->m_baseName) {
if (m_data->m_verboseOutput) { if (m_data->m_verboseOutput) {
b3Printf("mb->m_baseName = %s\n", mb->m_baseName); b3Printf("mb->m_baseName = %s\n", mb->m_baseName);
@@ -227,14 +237,14 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
b3Printf("mb->m_links[%d].m_linkName = %s\n", link, b3Printf("mb->m_links[%d].m_linkName = %s\n", link,
mb->m_links[link].m_linkName); mb->m_links[link].m_linkName);
} }
info.m_linkName = mb->m_links[link].m_linkName; info.m_linkName = strDup(mb->m_links[link].m_linkName);
} }
if (mb->m_links[link].m_jointName) { if (mb->m_links[link].m_jointName) {
if (m_data->m_verboseOutput) { if (m_data->m_verboseOutput) {
b3Printf("mb->m_links[%d].m_jointName = %s\n", link, b3Printf("mb->m_links[%d].m_jointName = %s\n", link,
mb->m_links[link].m_jointName); mb->m_links[link].m_jointName);
} }
info.m_jointName = mb->m_links[link].m_jointName; info.m_jointName = strDup(mb->m_links[link].m_jointName);
} }
info.m_jointType = mb->m_links[link].m_jointType; info.m_jointType = mb->m_links[link].m_jointType;
@@ -251,7 +261,7 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
} else { } else {
Bullet::btMultiBodyFloatData* mb = Bullet::btMultiBodyFloatData* mb =
(Bullet::btMultiBodyFloatData*)bf->m_multiBodies[i]; (Bullet::btMultiBodyFloatData*)bf.m_multiBodies[i];
if (mb->m_baseName) { if (mb->m_baseName) {
if (m_data->m_verboseOutput) { if (m_data->m_verboseOutput) {
b3Printf("mb->m_baseName = %s\n", mb->m_baseName); b3Printf("mb->m_baseName = %s\n", mb->m_baseName);
@@ -272,14 +282,14 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
b3Printf("mb->m_links[%d].m_linkName = %s\n", link, b3Printf("mb->m_links[%d].m_linkName = %s\n", link,
mb->m_links[link].m_linkName); mb->m_links[link].m_linkName);
} }
info.m_linkName = mb->m_links[link].m_linkName; info.m_linkName = strDup(mb->m_links[link].m_linkName);
} }
if (mb->m_links[link].m_jointName) { if (mb->m_links[link].m_jointName) {
if (m_data->m_verboseOutput) { if (m_data->m_verboseOutput) {
b3Printf("mb->m_links[%d].m_jointName = %s\n", link, b3Printf("mb->m_links[%d].m_jointName = %s\n", link,
mb->m_links[link].m_jointName); mb->m_links[link].m_jointName);
} }
info.m_jointName = mb->m_links[link].m_jointName; info.m_jointName = strDup(mb->m_links[link].m_jointName);
} }
info.m_jointType = mb->m_links[link].m_jointType; info.m_jointType = mb->m_links[link].m_jointType;
if ((mb->m_links[link].m_jointType == eRevoluteType) || if ((mb->m_links[link].m_jointType == eRevoluteType) ||
@@ -293,7 +303,7 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
} }
} }
} }
if (bf->ok()) { if (bf.ok()) {
if (m_data->m_verboseOutput) { if (m_data->m_verboseOutput) {
b3Printf("Received robot description ok!\n"); b3Printf("Received robot description ok!\n");
} }
@@ -401,6 +411,17 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
BodyJointInfoCache** bodyJointsPtr = m_data->m_bodyJointMap.getAtIndex(i); BodyJointInfoCache** bodyJointsPtr = m_data->m_bodyJointMap.getAtIndex(i);
if (bodyJointsPtr && *bodyJointsPtr) if (bodyJointsPtr && *bodyJointsPtr)
{ {
BodyJointInfoCache* bodyJoints = *bodyJointsPtr;
for (int j=0;j<bodyJoints->m_jointInfo.size();j++) {
if (bodyJoints->m_jointInfo[j].m_jointName)
{
free(bodyJoints->m_jointInfo[j].m_jointName);
}
if (bodyJoints->m_jointInfo[j].m_linkName)
{
free(bodyJoints->m_jointInfo[j].m_linkName);
}
}
delete (*bodyJointsPtr); delete (*bodyJointsPtr);
} }
} }