Skip to content

Commit

Permalink
Fix file caching (#1575)
Browse files Browse the repository at this point in the history 
* Fix file caching

* Update test to count entries, remove unnecessary memcpy

* UT uses MEMFREE
  • Loading branch information
@jdelapla
jdelapla authored Oct 20, 2022
1 parent 3036e6a commit 36f123e
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/source/Signaling/FileCache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ STATUS signalingCacheSaveToFile(PSignalingFileCacheEntry pSignalingFileCacheEntr
UINT32 entryCount = ARRAY_SIZE(entries), i, serializedCacheEntryLen;
UINT64 fileSize = 0;
PCHAR fileBuffer = NULL;
PSignalingFileCacheEntry pExistingCacheEntry = NULL;
BOOL newEntry = TRUE;
CHAR serializedCacheEntry[MAX_SERIALIZED_SIGNALING_CACHE_ENTRY_LEN];

CHK(cacheFilePath != NULL && pSignalingFileCacheEntry != NULL, STATUS_NULL_ARG);
Expand All @@ -199,20 +199,26 @@ STATUS signalingCacheSaveToFile(PSignalingFileCacheEntry pSignalingFileCacheEntr
entryCount = 0;
}

for (i = 0; pExistingCacheEntry == NULL && i < entryCount; ++i) {
for (i = 0; i < entryCount; ++i) {
/* Assume channel name and region has been validated */
if (STRCMP(entries[i].channelName, pSignalingFileCacheEntry->channelName) == 0 &&
STRCMP(entries[i].region, pSignalingFileCacheEntry->region) == 0 && entries[i].role == pSignalingFileCacheEntry->role) {
pExistingCacheEntry = &entries[i];
newEntry = FALSE;
break;
}
}

/* at this point i is at most entryCount */
CHK_WARN(entryCount < MAX_SIGNALING_CACHE_ENTRY_COUNT, STATUS_INVALID_OPERATION,
"Failed to store signaling cache because max entry count of %u reached", MAX_SIGNALING_CACHE_ENTRY_COUNT);
if (entryCount >= MAX_SIGNALING_CACHE_ENTRY_COUNT) {
DLOGW("Overwrote 32nd entry to store signaling cache because max entry count of %u reached", MAX_SIGNALING_CACHE_ENTRY_COUNT);
i = MAX_SIGNALING_CACHE_ENTRY_COUNT - 1;
newEntry = FALSE;
}

entries[i] = *pSignalingFileCacheEntry;
entryCount++;
if (newEntry) {
entryCount++;
}

for (i = 0; i < entryCount; ++i) {
serializedCacheEntryLen =
Expand Down
124 changes: 124 additions & 0 deletions tst/SignalingApiFunctionalityTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3397,6 +3397,130 @@ TEST_F(SignalingApiFunctionalityTest, fileCachingUpdateCache)
EXPECT_EQ(STATUS_SUCCESS, signalingCacheSaveToFile(&testEntry, DEFAULT_CACHE_FILE_PATH));
}

TEST_F(SignalingApiFunctionalityTest, fileCachingUpdateMultiChannelCache)
{
FREMOVE(DEFAULT_CACHE_FILE_PATH);
srand(GETTIME());

SignalingFileCacheEntry testEntry;
BOOL cacheFound = FALSE;
int additionalEntries = rand()%15 + 2;
char testWssEndpoint[MAX_SIGNALING_ENDPOINT_URI_LEN + 1] = {0};
char testHttpsEndpoint[MAX_SIGNALING_ENDPOINT_URI_LEN + 1] = {0};
char testRegion[MAX_REGION_NAME_LEN + 1] = {0};
char testChannelArn[MAX_ARN_LEN + 1] = {0};
char testChannel[MAX_CHANNEL_NAME_LEN + 1] = {0};
int time = GETTIME() / HUNDREDS_OF_NANOS_IN_A_SECOND;
int append = 0;
int i = 0;
char * fileBuffer;
UINT64 fileSize;
UINT32 entryCount;
SignalingFileCacheEntry entries[MAX_SIGNALING_CACHE_ENTRY_COUNT];
const int TEST_CHANNEL_COUNT = 5;

for(i = 0; i < MAX_SIGNALING_CACHE_ENTRY_COUNT + additionalEntries; i++) {
testEntry.role = SIGNALING_CHANNEL_ROLE_TYPE_VIEWER;
MEMSET(testWssEndpoint, 0, MAX_SIGNALING_ENDPOINT_URI_LEN+1);
MEMSET(testHttpsEndpoint, 0, MAX_SIGNALING_ENDPOINT_URI_LEN+1);
MEMSET(testRegion, 0, MAX_REGION_NAME_LEN + 1);
MEMSET(testChannelArn, 0, MAX_ARN_LEN+1);
MEMSET(testChannel, 0, MAX_CHANNEL_NAME_LEN+1);

append = rand()%TEST_CHANNEL_COUNT;
SPRINTF(testWssEndpoint, "%s%d", "testWssEndpoint", append);
SPRINTF(testHttpsEndpoint, "%s%d", "testHttpsEndpoint", append);
SPRINTF(testRegion, "%s%d", "testRegion", append);
SPRINTF(testChannelArn, "%s%d", "testChannelArn", append);
SPRINTF(testChannel, "%s%d", "testChannel", append);

STRCPY(testEntry.wssEndpoint, testWssEndpoint);
STRCPY(testEntry.httpsEndpoint, testHttpsEndpoint);
STRCPY(testEntry.region, testRegion);
STRCPY(testEntry.channelArn, testChannelArn);
STRCPY(testEntry.channelName, testChannel);
testEntry.creationTsEpochSeconds = time + i;
EXPECT_EQ(STATUS_SUCCESS, signalingCacheSaveToFile(&testEntry, DEFAULT_CACHE_FILE_PATH));
}
testEntry.creationTsEpochSeconds = 0;
EXPECT_EQ(STATUS_SUCCESS, signalingCacheLoadFromFile(testChannel, testRegion, SIGNALING_CHANNEL_ROLE_TYPE_VIEWER, &testEntry, &cacheFound, DEFAULT_CACHE_FILE_PATH));
EXPECT_EQ(TRUE, cacheFound);
EXPECT_EQ(time + i - 1, testEntry.creationTsEpochSeconds);
EXPECT_EQ(0, STRCMP(testEntry.wssEndpoint, testWssEndpoint));
EXPECT_EQ(0, STRCMP(testEntry.httpsEndpoint, testHttpsEndpoint));
EXPECT_EQ(0, STRCMP(testEntry.region, testRegion));
EXPECT_EQ(0, STRCMP(testEntry.channelArn, testChannelArn));
EXPECT_EQ(0, STRCMP(testEntry.channelName, testChannel));

//Check size to ensure entries are properly overwriting each other
EXPECT_EQ(STATUS_SUCCESS, readFile(DEFAULT_CACHE_FILE_PATH, FALSE, NULL, &fileSize));

EXPECT_LT(0, fileSize);
/* +1 for null terminator */
fileBuffer = (char*)MEMCALLOC(1, (fileSize + 1) * SIZEOF(CHAR));
EXPECT_TRUE((fileBuffer != NULL));
EXPECT_EQ(STATUS_SUCCESS, readFile(DEFAULT_CACHE_FILE_PATH, FALSE, (PBYTE) fileBuffer, &fileSize));
EXPECT_EQ(STATUS_SUCCESS, deserializeSignalingCacheEntries(fileBuffer, fileSize, entries, &entryCount, DEFAULT_CACHE_FILE_PATH));
EXPECT_LT(entryCount, TEST_CHANNEL_COUNT+1);

MEMFREE(fileBuffer);

FREMOVE(DEFAULT_CACHE_FILE_PATH);
}

TEST_F(SignalingApiFunctionalityTest, fileCachingUpdateFullMultiChannelCache)
{
FREMOVE(DEFAULT_CACHE_FILE_PATH);
srand(GETTIME());

SignalingFileCacheEntry testEntry;
BOOL cacheFound = FALSE;
int additionalEntries = rand()%15 + 2;
char testWssEndpoint[MAX_SIGNALING_ENDPOINT_URI_LEN + 1] = {0};
char testHttpsEndpoint[MAX_SIGNALING_ENDPOINT_URI_LEN + 1] = {0};
char testRegion[MAX_REGION_NAME_LEN + 1] = {0};
char testChannelArn[MAX_ARN_LEN + 1] = {0};
char testChannel[MAX_CHANNEL_NAME_LEN + 1] = {0};
int time = GETTIME() / HUNDREDS_OF_NANOS_IN_A_SECOND;
int append = 0;
int i = 0;

for(i = 0; i < MAX_SIGNALING_CACHE_ENTRY_COUNT + additionalEntries; i++) {
testEntry.role = SIGNALING_CHANNEL_ROLE_TYPE_VIEWER;
MEMSET(testWssEndpoint, 0, MAX_SIGNALING_ENDPOINT_URI_LEN+1);
MEMSET(testHttpsEndpoint, 0, MAX_SIGNALING_ENDPOINT_URI_LEN+1);
MEMSET(testRegion, 0, MAX_REGION_NAME_LEN + 1);
MEMSET(testChannelArn, 0, MAX_ARN_LEN+1);
MEMSET(testChannel, 0, MAX_CHANNEL_NAME_LEN+1);

append = i;
SPRINTF(testWssEndpoint, "%s%d", "testWssEndpoint", append);
SPRINTF(testHttpsEndpoint, "%s%d", "testHttpsEndpoint", append);
SPRINTF(testRegion, "%s%d", "testRegion", append);
SPRINTF(testChannelArn, "%s%d", "testChannelArn", append);
SPRINTF(testChannel, "%s%d", "testChannel", append);

STRCPY(testEntry.wssEndpoint, testWssEndpoint);
STRCPY(testEntry.httpsEndpoint, testHttpsEndpoint);
STRCPY(testEntry.region, testRegion);
STRCPY(testEntry.channelArn, testChannelArn);
STRCPY(testEntry.channelName, testChannel);
testEntry.creationTsEpochSeconds = time + i;
EXPECT_EQ(STATUS_SUCCESS, signalingCacheSaveToFile(&testEntry, DEFAULT_CACHE_FILE_PATH));
}
testEntry.creationTsEpochSeconds = 0;
EXPECT_EQ(STATUS_SUCCESS, signalingCacheLoadFromFile(testChannel, testRegion, SIGNALING_CHANNEL_ROLE_TYPE_VIEWER, &testEntry, &cacheFound, DEFAULT_CACHE_FILE_PATH));
EXPECT_EQ(TRUE, cacheFound);
EXPECT_EQ(time + i - 1, testEntry.creationTsEpochSeconds);
EXPECT_EQ(0, STRCMP(testEntry.wssEndpoint, testWssEndpoint));
EXPECT_EQ(0, STRCMP(testEntry.httpsEndpoint, testHttpsEndpoint));
EXPECT_EQ(0, STRCMP(testEntry.region, testRegion));
EXPECT_EQ(0, STRCMP(testEntry.channelArn, testChannelArn));
EXPECT_EQ(0, STRCMP(testEntry.channelName, testChannel));

FREMOVE(DEFAULT_CACHE_FILE_PATH);
}

TEST_F(SignalingApiFunctionalityTest, receivingIceConfigOffer)
{
if (!mAccessKeyIdSet) {
Expand Down

0 comments on commit 36f123e

Please sign in to comment.