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

UDP networking improvements and experiments (send CMD_STEP_FORWARD_SIMULATION as 4 bytes command, status 8 bytes, instead of enormous command/status packages.

Browse Source 
Change some timeouts to use actual RTC time instead of dummy loops 1024*1024*1024.
Fix type conected -> connected
This commit is contained in:
erwincoumans
2017-01-28 22:14:45 -08:00
parent 2ea7111933
commit 87bce5eacf
9 changed files with 110 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
examples/SharedMemory/udp/main.cpp
View File

@@ -15,7 +15,7 @@
#include "SharedMemoryCommands.h"
#include "Bullet3Common/b3AlignedObjectArray.h"
#include "PhysicsServerCommandProcessor.h"
#include "../Utils/b3Clock.h"
bool gVerboseNetworkMessagesServer = false;
@@ -36,6 +36,8 @@ void MySerializeInt(unsigned int sz, unsigned char* output)
int main(int argc, char *argv[])
{
b3CommandLineArgs parseArgs(argc,argv);
b3Clock clock;
double timeOutInSeconds = 10;
DummyGUIHelper guiHelper;
MyCommandProcessor* sm = new MyCommandProcessor;
@@ -102,6 +104,8 @@ int main(int argc, char *argv[])
while (true)
{
b3Clock::usleep(0);
serviceResult = 1;
/* Keep doing host_service until no events are left */
@@ -136,20 +140,36 @@ int main(int argc, char *argv[])
event.peer->data,
event.channelID);
}
SharedMemoryCommand cmd;
SharedMemoryCommand* cmdPtr = 0;
//performance test
if (event.packet->dataLength == sizeof(int))
{
cmdPtr = &cmd;
cmd.m_type = *(int*)event.packet->data;
}
if (event.packet->dataLength == sizeof(SharedMemoryCommand))
{
SharedMemoryCommand* cmdPtr = (SharedMemoryCommand*)event.packet->data;
cmdPtr = (SharedMemoryCommand*)event.packet->data;
}
if (cmdPtr)
{
SharedMemoryStatus serverStatus;
b3AlignedObjectArray<char> buffer;
buffer.resize(SHARED_MEMORY_MAX_STREAM_CHUNK_SIZE);
bool hasStatus = sm->processCommand(*cmdPtr,serverStatus, &buffer[0], buffer.size());
int timeout = 1024 * 1024 * 1024;
while ((!hasStatus) && (timeout-- > 0))
double startTimeSeconds = clock.getTimeInSeconds();
double curTimeSeconds = clock.getTimeInSeconds();
while ((!hasStatus) && ((curTimeSeconds - startTimeSeconds) <timeOutInSeconds))
{
hasStatus = sm->receiveStatus(serverStatus, &buffer[0], buffer.size());
curTimeSeconds = clock.getTimeInSeconds();
}
if (gVerboseNetworkMessagesServer)
{
@@ -158,29 +178,49 @@ int main(int argc, char *argv[])
}
if (hasStatus)
{
//create packetData with [int packetSizeInBytes, status, streamBytes)
unsigned char* statBytes = (unsigned char*)&serverStatus;
b3AlignedObjectArray<unsigned char> packetData;
packetData.resize(4 + sizeof(SharedMemoryStatus) + serverStatus.m_numDataStreamBytes);
int sz = packetData.size();
int curPos = 0;
unsigned char* statBytes = (unsigned char*)&serverStatus;
MySerializeInt(sz, &packetData[curPos]);
curPos += 4;
for (int i = 0; i < sizeof(SharedMemoryStatus); i++)
if (cmdPtr->m_type == CMD_STEP_FORWARD_SIMULATION)
{
packetData[i + curPos] = statBytes[i];
}
curPos += sizeof(SharedMemoryStatus);
packetData.resize(4 + sizeof(int));
int sz = packetData.size();
int curPos = 0;
for (int i = 0; i < serverStatus.m_numDataStreamBytes; i++)
MySerializeInt(sz, &packetData[curPos]);
curPos += 4;
for (int i = 0; i < sizeof(int); i++)
{
packetData[i + curPos] = statBytes[i];
}
curPos += sizeof(int);
ENetPacket *packet = enet_packet_create(&packetData[0], packetData.size(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(event.peer, 0, packet);
}
else
{
packetData[i + curPos] = buffer[i];
}
//create packetData with [int packetSizeInBytes, status, streamBytes)
packetData.resize(4 + sizeof(SharedMemoryStatus) + serverStatus.m_numDataStreamBytes);
int sz = packetData.size();
int curPos = 0;
ENetPacket *packet = enet_packet_create(&packetData[0], packetData.size() , ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(event.peer, 0, packet);
//enet_host_broadcast(server, 0, packet);
MySerializeInt(sz, &packetData[curPos]);
curPos += 4;
for (int i = 0; i < sizeof(SharedMemoryStatus); i++)
{
packetData[i + curPos] = statBytes[i];
}
curPos += sizeof(SharedMemoryStatus);
for (int i = 0; i < serverStatus.m_numDataStreamBytes; i++)
{
packetData[i + curPos] = buffer[i];
}
ENetPacket *packet = enet_packet_create(&packetData[0], packetData.size(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(event.peer, 0, packet);
//enet_host_broadcast(server, 0, packet);
}
}
}
else

2
examples/SharedMemory/udp/premake4.lua
View File

@@ -43,6 +43,8 @@ project ("App_PhysicsServerSharedMemoryBridgeUDP")
"../PosixSharedMemory.h",
"../../Utils/b3ResourcePath.cpp",
"../../Utils/b3ResourcePath.h",
"../../Utils/b3Clock.cpp",
"../../Utils/b3Clock.h",
}