Skip to content

Commit

Permalink
tests pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@gafferongames
gafferongames committed Dec 24, 2023
1 parent a0ce013 commit 3935d92
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 303 deletions.
311 changes: 16 additions & 295 deletions premake5.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,27 @@ solution "Yojimbo"
rtti "Off"
warnings "Extra"
floatingpoint "Fast"
configuration "Debug"
filter "configurations:Debug"
symbols "On"
defines { "YOJIMBO_DEBUG", "NETCODE_DEBUG", "RELIABLE_DEBUG" }
configuration "Release"
filter "configurations:Release"
symbols "Off"
optimize "Speed"
defines { "YOJIMBO_RELEASE", "NETCODE_RELEASE", "RELIABLE_RELEASE" }

project "sodium"
kind "StaticLib"
files {
"sodium/**.c",
"sodium/**.h",
}
filter { "system:not windows", "platforms:*x64 or *avx or *avx2" }
files {
"sodium/**.S"
}
filter { "action:gmake" }
buildoptions { "-Wno-unused-parameter", "-Wno-unused-function", "-Wno-unknown-pragmas", "-Wno-unused-variable", "-Wno-type-limits" }

project "netcode"
kind "StaticLib"
language "C"
Expand Down Expand Up @@ -71,299 +85,6 @@ project "test"
files { "test.cpp" }
links { "yojimbo", "sodium", "tlsf", "netcode", "reliable" }

if not os.istarget "windows" then

-- MacOSX and Linux.

newaction
{
trigger = "test",
description = "Build and run all unit tests",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j test" then
os.execute "./bin/test"
end
end
}

newaction
{
trigger = "client_server",
description = "Build and run client/server test",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j client_server" then
os.execute "./bin/client_server"
end
end
}

newaction
{
trigger = "loopback",
description = "Build and run loopback test",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j loopback" then
os.execute "./bin/loopback"
end
end
}

newoption
{
trigger = "serverAddress",
value = "IP[:port]",
description = "Specify the server address that the client should connect to",
}

newaction
{
trigger = "client",
description = "Build and run client",
valid_kinds = premake.action.get("gmake").valid_kinds,
valid_languages = premake.action.get("gmake").valid_languages,
valid_tools = premake.action.get("gmake").valid_tools,

execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j client" then
if _OPTIONS["serverAddress"] then
os.execute( "./bin/client " .. _OPTIONS["serverAddress"] )
else
os.execute "./bin/client"
end
end
end
}

newaction
{
trigger = "server",
description = "Build and run server",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j server" then
os.execute "./bin/server"
end
end
}

newaction
{
trigger = "secure_server",
description = "Build and run secure server",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j secure_server" then
os.execute "./bin/secure_server"
end
end
}

newaction
{
trigger = "docker",
description = "Build and run a yojimbo server inside a docker container",
execute = function ()
os.execute "docker run --rm --privileged alpine hwclock -s" -- workaround for clock getting out of sync on macos. see https://docs.docker.com/docker-for-mac/troubleshoot/#issues
os.execute "rm -rf docker/yojimbo && mkdir -p docker/yojimbo && mkdir -p docker/yojimbo/tests && cp *.h docker/yojimbo && cp *.cpp docker/yojimbo && cp premake5.lua docker/yojimbo && cp -R reliable docker/yojimbo && cp -R netcode docker/yojimbo && cp -R tlsf docker/yojimbo && cd docker && docker build -t \"networkprotocol:yojimbo-server\" . && rm -rf yojimbo && docker run -ti -p 40000:40000/udp networkprotocol:yojimbo-server"
end
}

newaction
{
trigger = "valgrind",
description = "Run valgrind over tests inside docker",
execute = function ()
os.execute "rm -rf valgrind/yojimbo && mkdir -p valgrind/yojimbo && mkdir -p valgrind/yojimbo/tests && cp *.h valgrind/yojimbo && cp *.cpp valgrind/yojimbo && cp premake5.lua valgrind/yojimbo && cp -R reliable valgrind/yojimbo && cp -R netcode valgrind/yojimbo && cp -R tlsf valgrind/yojimbo && cd valgrind && docker build -t \"networkprotocol:yojimbo-valgrind\" . && rm -rf netcode && docker run -ti networkprotocol:yojimbo-valgrind"
end
}

newaction
{
trigger = "matcher",
description = "Build and run the matchmaker web service inside a docker container",
execute = function ()
os.execute "docker run --rm --privileged alpine hwclock -s" -- workaround for clock getting out of sync on macos. see https://docs.docker.com/docker-for-mac/troubleshoot/#issues
os.execute "cd matcher && docker build -t networkprotocol:yojimbo-matcher . && docker run -ti -p 8080:8080 networkprotocol:yojimbo-matcher"
end
}

newaction
{
trigger = "secure_client",
description = "Build and run secure client and connect to a server via the matcher",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j secure_client" then
os.execute "./bin/secure_client"
end
end
}

newaction
{
trigger = "stress",
description = "Launch 64 secure client instances to stress the matcher and server",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j secure_client" then
for i = 0, 63 do
os.execute "./bin/secure_client &"
end
end
end
}

newaction
{
trigger = "soak",
description = "Build and run soak test",
execute = function ()
os.execute "test ! -e Makefile && premake5 gmake"
if os.execute "make -j soak" then
os.execute "./bin/soak"
end
end
}

newaction
{
trigger = "cppcheck",
description = "Run cppcheck over the source code and write to cppcheck.txt",
execute = function ()
os.execute "cppcheck *.h *.cpp --force --std=c++03 --language=c++ --quiet -U min -U max 2>&1 --config-exclude=tlsf --suppress=incorrectStringBooleanError --suppress=cstyleCast --suppress=unusedFunction --suppress=unusedStructMember --suppress=variableScope --suppress=memsetClassFloat --enable=warning --enable=performance --enable=style --platform=native -j 32 | tee -a cppcheck.txt"
end
}

newaction
{
trigger = "scan-build",
description = "Run clang scan-build over the project",
execute = function ()
os.execute "premake5 clean && premake5 gmake && scan-build make all -j"
end
}

newaction
{
trigger = "coverity",
description = "Integrate latest code into coverity_scan so it gets coverity scanned by travis job",
execute = function ()
os.execute "git checkout coverity_scan && git merge master && git push && git checkout master"
end
}

newaction
{
trigger = "loc",
description = "Count lines of code",
execute = function ()
os.execute "wc -l *.h *.cpp netcode/*.c netcode/*.h reliable/*.c reliable/*.h"
end
}

newaction
{
trigger = "release",
description = "Create a release of this project",
execute = function ()
_ACTION = "clean"
premake.action.call( "clean" )
files_to_zip = "README.md BUILDING.md CHANGES.md ROADMAP.md *.cpp *.h premake5.lua docker tests tlsf windows"
os.execute( "rm -rf *.zip *.tar.gz" );
os.execute( "rm -rf docker/yojimbo" );
os.execute( "zip -9r yojimbo-" .. yojimbo_version .. ".zip " .. files_to_zip )
os.execute( "unzip yojimbo-" .. yojimbo_version .. ".zip -d yojimbo-" .. yojimbo_version );
os.execute( "tar -zcvf yojimbo-" .. yojimbo_version .. ".tar.gz yojimbo-" .. yojimbo_version );
os.execute( "rm -rf yojimbo-" .. yojimbo_version );
os.execute( "mkdir -p release" );
os.execute( "mv yojimbo-" .. yojimbo_version .. ".zip release" );
os.execute( "mv yojimbo-" .. yojimbo_version .. ".tar.gz release" );
os.execute( "echo" );
os.execute( "echo \"*** SUCCESSFULLY CREATED RELEASE - yojimbo-" .. yojimbo_version .. " *** \"" );
os.execute( "echo" );
end
}

newaction
{
trigger = "sublime",
description = "Create sublime project",
execute = function ()
os.execute "cp .sublime yojimbo.sublime-project"
end
}

newaction
{
trigger = "docs",
description = "Build documentation",
execute = function ()
if os.host() == "macosx" then
os.execute "doxygen doxygen.config && open docs/html/index.html"
else
os.execute "doxygen doxygen.config"
end
end
}

else

-- Windows

newaction
{
trigger = "solution",
description = "Open Yojimbo.sln",
execute = function ()
os.execute "premake5 vs2019"
os.execute "start Yojimbo.sln"
end
}

newaction
{
trigger = "docker",
description = "Build and run a yojimbo server inside a docker container",
execute = function ()
os.execute "cd docker && copyFiles.bat && buildServer.bat && runServer.bat"
end
}

newaction
{
trigger = "matcher",
description = "Build and run the matchmaker web service inside a docker container",
execute = function ()
os.execute "cd matcher && docker build -t networkprotocol:yojimbo-matcher . && docker run -ti -p 8080:8080 networkprotocol:yojimbo-matcher"
end
}

newaction
{
trigger = "stress",
description = "Launch 64 secure client instances to stress the matcher and server",
execute = function ()
for i = 0, 63 do
os.execute "if exist bin\\Debug\\secure_client.exe ( start /B bin\\Debug\\secure_client ) else ( echo could not find bin\\Debug\\secure_client.exe )"
end
end
}

newaction
{
trigger = "docs",
description = "Build documentation",
execute = function ()
os.execute "doxygen doxygen.config && start docs\\html\\index.html"
end
}

end

newaction
{
trigger = "clean",
Expand Down
16 changes: 8 additions & 8 deletions reliable/reliable.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,7 @@ void test_sequence_buffer_rollover()
reliable_endpoint_destroy( context.receiver );
}

#define RELIABLE_ARRAY_SIZE(x) ( int( sizeof((x)) / sizeof((x)[0]) ) )
#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))

struct test_tracking_allocate_context_t
{
Expand All @@ -2270,15 +2270,15 @@ void * test_tracking_allocate_function( void * context, uint64_t bytes )
struct test_tracking_allocate_context_t* tracking_context = (struct test_tracking_allocate_context_t*)context;
void * allocation = malloc( bytes );
int tracking_index;
for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations); ++tracking_index )
for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations); ++tracking_index )
{
if ( tracking_context->active_allocations[tracking_index] == NULL )
{
break;
}
}

reliable_assert(tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations));
reliable_assert(tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations));
tracking_context->active_allocations[tracking_index] = allocation;
return allocation;
}
Expand All @@ -2287,15 +2287,15 @@ void test_tracking_free_function( void * context, void * pointer )
{
struct test_tracking_allocate_context_t* tracking_context = (struct test_tracking_allocate_context_t*)context;
int tracking_index;
for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations); ++tracking_index )
for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations); ++tracking_index )
{
if ( tracking_context->active_allocations[tracking_index] == pointer )
{
break;
}
}

reliable_assert(tracking_index < RELIABLE_ARRAY_SIZE(tracking_context->active_allocations));
reliable_assert( tracking_index < (int) ARRAY_LENGTH(tracking_context->active_allocations) );
tracking_context->active_allocations[tracking_index] = NULL;
free( pointer );
}
Expand Down Expand Up @@ -2355,10 +2355,10 @@ void test_fragment_cleanup()
};

// Make sure we're sending more than receiver_config.fragment_reassembly_buffer_size packets, so the buffer wraps around.
reliable_assert( RELIABLE_ARRAY_SIZE( packet_sizes ) > receiver_config.fragment_reassembly_buffer_size );
reliable_assert( (int) ARRAY_LENGTH( packet_sizes ) > receiver_config.fragment_reassembly_buffer_size );

int i;
for ( i = 0; i < RELIABLE_ARRAY_SIZE( packet_sizes ); ++i )
for ( i = 0; i < (int) ARRAY_LENGTH( packet_sizes ); ++i )
{
// Only allow one packet per transmit, so that our fragmented packets are only partially
// delivered.
Expand All @@ -2384,7 +2384,7 @@ void test_fragment_cleanup()

// Make sure that there is no memory that hasn't been freed.
int tracking_index;
for ( tracking_index = 0; tracking_index < RELIABLE_ARRAY_SIZE(tracking_alloc_context.active_allocations); ++tracking_index )
for ( tracking_index = 0; tracking_index < (int) ARRAY_LENGTH(tracking_alloc_context.active_allocations); ++tracking_index )
{
check( tracking_alloc_context.active_allocations[tracking_index] == NULL );
}
Expand Down

0 comments on commit 3935d92

Please sign in to comment.