diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index 97fe888..7e1c21e 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 4d58325..c4b9bf9 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -38,3 +38,7 @@ 536 608 1718401387919309201 bufferManagerProject 9c1ed4463eae2c5 1 794 1718401960945598030 CMakeFiles/bufferManagerProject.dir/src/SmartArrayMemoryManager.cpp.o 7f1573e03b2eb3a6 795 870 1718401961021605945 bufferManagerProject 9c1ed4463eae2c5 +2 847 1718402240802071861 CMakeFiles/bufferManagerProject.dir/src/SmartArrayMemoryManager.cpp.o 7f1573e03b2eb3a6 +847 916 1718402240870078645 bufferManagerProject 9c1ed4463eae2c5 +3 709 1718402458203515975 CMakeFiles/bufferManagerProject.dir/src/SmartArrayMemoryManager.cpp.o 7f1573e03b2eb3a6 +709 780 1718402458275523008 bufferManagerProject 9c1ed4463eae2c5 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 10e8daf..c105d1a 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Jun 15 00:52 EEST +Start testing: Jun 15 01:00 EEST ---------------------------------------------------------- -End testing: Jun 15 00:52 EEST +End testing: Jun 15 01:00 EEST diff --git a/src/SmartArrayMemoryManager.cpp b/src/SmartArrayMemoryManager.cpp index 144c628..6c85c0d 100644 --- a/src/SmartArrayMemoryManager.cpp +++ b/src/SmartArrayMemoryManager.cpp @@ -148,7 +148,7 @@ void MemoryManager::resolveConflict(size_t virtualPageId, size_t slotId) { void* newPhysicalPage = allocatePhysicalPage(); if (newPhysicalPage == nullptr) { throw std::runtime_error("Failed to allocate new physical page in resolveConflict"); - }W + } mapVirtualPageToPhysicalPage(virtualPageId, newPhysicalPage); // Move ONLY the conflicting entry to the new page