thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2026-02-04 00:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(memory): remove single arg SMemFree

Browse source
This commit is contained in:
Adam Heinermann 2025-10-07 02:52:35 -07:00 • committed by fallenoak
parent 51b200da0d
commit 47d903f4ac
7 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storm/Memory.cpp
View file

@ -51,12 +51,6 @@ void STORMAPI SMemFill(void* ptr, size_t bytes, uint8_t value) {
memset(ptr, value, bytes); memset(ptr, value, bytes);
} }
void STORMAPI SMemFree(void* ptr) {
if (ptr) {
free(ptr);
}
}
void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags) { void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags) {
if (ptr) { if (ptr) {
free(ptr); free(ptr);

2
storm/Memory.hpp
View file

@ -29,8 +29,6 @@ void STORMAPI SMemCopy(void* dst, void* src, size_t bytes);
void STORMAPI SMemFill(void* ptr, size_t bytes, uint8_t value); void STORMAPI SMemFill(void* ptr, size_t bytes, uint8_t value);
void STORMAPI SMemFree(void* ptr);
void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags = 0); void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags = 0);
void STORMAPI SMemMove(void* dst, void* src, size_t bytes); void STORMAPI SMemMove(void* dst, void* src, size_t bytes);

2
storm/thread/linux/S_Thread.cpp
View file

@ -20,7 +20,7 @@ void* S_Thread::s_SLaunchThread(void* threadParam) {
pthread_cond_signal(&params->syncObject->m_cond); pthread_cond_signal(&params->syncObject->m_cond);
} }
SMemFree(threadParam); STORM_FREE(threadParam);
return nullptr; return nullptr;
} }

2
storm/thread/mac/S_Thread.mm
View file

@ -37,7 +37,7 @@ uint32_t S_Thread::s_SLaunchThread(void* threadParam) {
pthread_cond_signal(&params->syncObject->m_cond); pthread_cond_signal(&params->syncObject->m_cond);
} }
SMemFree(threadParam); STORM_FREE(threadParam);
return 0; return 0;
} }

2
storm/thread/win/S_Thread.cpp
View file

@ -6,7 +6,7 @@ DWORD WINAPI S_Thread::s_SLaunchThread(void* threadParam) {
auto proc = params->threadProc; auto proc = params->threadProc;
auto param = params->threadParam; auto param = params->threadParam;
SMemFree(threadParam); STORM_FREE(threadParam);
auto val = proc(param); auto val = proc(param);

24
test/Memory.cpp
View file

@ -28,14 +28,14 @@ TEST_CASE("SMemAlloc", "[memory]") {
void* ptr = SMemAlloc(16, __FILE__, __LINE__); void* ptr = SMemAlloc(16, __FILE__, __LINE__);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
CHECK_NOTHROW(memset(ptr, 1, 16)); CHECK_NOTHROW(memset(ptr, 1, 16));
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates memory with null filename") { SECTION("allocates memory with null filename") {
void* ptr = SMemAlloc(16, nullptr, 0); void* ptr = SMemAlloc(16, nullptr, 0);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
CHECK_NOTHROW(memset(ptr, 1, 16)); CHECK_NOTHROW(memset(ptr, 1, 16));
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates memory initialized to 0 with flag") { SECTION("allocates memory initialized to 0 with flag") {
@ -45,13 +45,13 @@ TEST_CASE("SMemAlloc", "[memory]") {
uint8_t* pArray = static_cast<uint8_t*>(ptr); uint8_t* pArray = static_cast<uint8_t*>(ptr);
CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0); CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0);
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates a memory pointer even if the size is 0") { SECTION("allocates a memory pointer even if the size is 0") {
void* ptr = SMemAlloc(0, __FILE__, __LINE__); void* ptr = SMemAlloc(0, __FILE__, __LINE__);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
SMemFree(ptr); STORM_FREE(ptr);
} }
} }
@ -109,12 +109,6 @@ TEST_CASE("SMemFill", "[memory]") {
} }
TEST_CASE("SMemFree", "[memory]") { TEST_CASE("SMemFree", "[memory]") {
SECTION("does nothing on nullptr") {
CHECK_NOTHROW(SMemFree(nullptr));
}
}
TEST_CASE("SMemFree full args", "[memory]") {
SECTION("does nothing on nullptr") { SECTION("does nothing on nullptr") {
CHECK_NOTHROW(SMemFree(nullptr, __FILE__, __LINE__)); CHECK_NOTHROW(SMemFree(nullptr, __FILE__, __LINE__));
} }
@ -162,14 +156,14 @@ TEST_CASE("SMemReAlloc", "[memory]") {
void* ptr = SMemReAlloc(nullptr, 16, __FILE__, __LINE__); void* ptr = SMemReAlloc(nullptr, 16, __FILE__, __LINE__);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
CHECK_NOTHROW(memset(ptr, 1, 16)); CHECK_NOTHROW(memset(ptr, 1, 16));
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates memory with null filename") { SECTION("allocates memory with null filename") {
void* ptr = SMemReAlloc(nullptr, 16, nullptr, 0); void* ptr = SMemReAlloc(nullptr, 16, nullptr, 0);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
CHECK_NOTHROW(memset(ptr, 1, 16)); CHECK_NOTHROW(memset(ptr, 1, 16));
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates memory initialized to 0 with flag") { SECTION("allocates memory initialized to 0 with flag") {
@ -179,13 +173,13 @@ TEST_CASE("SMemReAlloc", "[memory]") {
uint8_t* pArray = static_cast<uint8_t*>(ptr); uint8_t* pArray = static_cast<uint8_t*>(ptr);
CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0); CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0);
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("allocates a memory pointer even if the size is 0") { SECTION("allocates a memory pointer even if the size is 0") {
void* ptr = SMemReAlloc(nullptr, 0, __FILE__, __LINE__); void* ptr = SMemReAlloc(nullptr, 0, __FILE__, __LINE__);
REQUIRE(ptr != nullptr); REQUIRE(ptr != nullptr);
SMemFree(ptr); STORM_FREE(ptr);
} }
SECTION("reallocates memory") { SECTION("reallocates memory") {
@ -201,7 +195,7 @@ TEST_CASE("SMemReAlloc", "[memory]") {
CHECK(*static_cast<uint32_t*>(ptr2) == 123456); CHECK(*static_cast<uint32_t*>(ptr2) == 123456);
CHECK_NOTHROW(memset(ptr2, 1, 1024 * 1024)); CHECK_NOTHROW(memset(ptr2, 1, 1024 * 1024));
SMemFree(ptr2); STORM_FREE(ptr2);
} }
} }

4
test/String.cpp
View file

@ -227,7 +227,7 @@ TEST_CASE("SStrDupA", "[string]") {
auto string2 = SStrDupA(string1, __FILE__, __LINE__); auto string2 = SStrDupA(string1, __FILE__, __LINE__);
auto compare = SStrCmp(string1, string2); auto compare = SStrCmp(string1, string2);
auto newPtr = string1 != string2; auto newPtr = string1 != string2;
SMemFree(string2); STORM_FREE(string2);
REQUIRE(compare == 0); REQUIRE(compare == 0);
REQUIRE(newPtr == true); REQUIRE(newPtr == true);
@ -238,7 +238,7 @@ TEST_CASE("SStrDupA", "[string]") {
auto string2 = SStrDupA(string1, __FILE__, __LINE__); auto string2 = SStrDupA(string1, __FILE__, __LINE__);
auto compare = SStrCmp(string1, string2); auto compare = SStrCmp(string1, string2);
auto newPtr = string1 != string2; auto newPtr = string1 != string2;
SMemFree(string2); STORM_FREE(string2);
REQUIRE(compare == 0); REQUIRE(compare == 0);
REQUIRE(newPtr == true); REQUIRE(newPtr == true);