Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ option(WITH_MEMORY_TRACKING "Enable tracking of memory allocations." ON)

set(SRC_FILES
CcpCore.cpp
CCPAssert.cpp
CCPCallstack.cpp
CCPDefines.cpp
CcpAssert.cpp
CcpCallstack.cpp
CcpDefines.cpp
CcpFileUtils.cpp
CCPHash.cpp
CCPMemory.cpp
CCPMemoryTracker.cpp
CCPMemoryTrackerMutex.h
CcpHash.cpp
CcpMemory.cpp
CcpMemoryTracker.cpp
CcpMemoryTrackerMutex.h
CcpProcess.cpp
CcpSecureCrt.cpp
CcpSemaphore.cpp
Expand All @@ -35,7 +35,7 @@ set(SRC_FILES
CcpThreadClass.cpp
CcpTime.cpp
StringConversions.cpp
CCPLog.cpp
CcpLog.cpp
)

add_library(CcpCore SHARED ${SRC_FILES})
Expand All @@ -57,17 +57,17 @@ generate_export_header(CcpCore

set(PUBLIC_HEADER_FILES
include/CachedAllocator.h
include/CCPAssert.h
include/CcpAssert.h
include/CcpAtomic.h
include/CCPCallstack.h
include/CcpCallstack.h
include/CcpCore.h
include/CcpCrash.h
include/CcpDefines.h
include/CcpFileUtils.h
include/CCPHash.h
include/CcpHash.h
include/CcpMacros.h
include/CCPMemory.h
include/CCPMemoryTracker.h
include/CcpMemory.h
include/CcpMemoryTracker.h
include/CcpMutex.h
include/CcpPairingHeap.h
include/CcpProcess.h
Expand All @@ -83,7 +83,7 @@ set(PUBLIC_HEADER_FILES
include/ICrashReporter.h
include/StringConversions.h
include/TrackableContainer.h
include/CCPLog.h
include/CcpLog.h
${CMAKE_CURRENT_BINARY_DIR}/carbon_core_export.h
)
target_sources(CcpCore PRIVATE ${PUBLIC_HEADER_FILES})
Expand Down
2 changes: 1 addition & 1 deletion CCPAssert.cpp → CcpAssert.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright © 2025 CCP ehf.

#include "include/CCPAssert.h"
#include "include/CcpAssert.h"
#include "include/CcpSecureCrt.h"

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion CCPCallstack.cpp → CcpCallstack.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright © 2025 CCP ehf.

#include "include/CCPCallstack.h"
#include "include/CcpCallstack.h"

namespace
{
Expand Down
2 changes: 1 addition & 1 deletion CCPHash.cpp → CcpHash.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright © 2025 CCP ehf.

#include "include/CCPHash.h"
#include "include/CcpHash.h"

/// See http://www.isthe.com/chongo/tech/comp/fnv/ for a description of the FNV1 hash algorithm
/// and the specific values used here.
Expand Down
2 changes: 1 addition & 1 deletion CCPLog.cpp → CcpLog.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright © 2008 CCP ehf.

#include "CCPLog.h"
#include "CcpLog.h"

#include <cassert>
#include <thread>
Expand Down
6 changes: 3 additions & 3 deletions CCPMemory.cpp → CcpMemory.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright © 2025 CCP ehf.

#include "include/CCPMemory.h"
#include "include/CCPMemoryTracker.h"
#include "include/CCPAssert.h"
#include "include/CcpMemory.h"
#include "include/CcpMemoryTracker.h"
#include "include/CcpAssert.h"
#include "include/CcpTelemetry.h"
#include "CcpMemoryTrackerMutex.h"

Expand Down
8 changes: 4 additions & 4 deletions CCPMemoryTracker.cpp → CcpMemoryTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

// See http://core/wiki/Memory_Tracking

#include "include/CCPMemoryTracker.h"
#include "include/CcpMemoryTracker.h"
#include "include/CcpMutex.h"

#include <map>

// #define CCP_UNIT_TEST 1

#include "include/CcpMacros.h"
#include "include/CCPAssert.h"
#include "include/CCPHash.h"
#include "include/CCPCallstack.h"
#include "include/CcpAssert.h"
#include "include/CcpHash.h"
#include "include/CcpCallstack.h"
#include "include/CcpSecureCrt.h"

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion CcpSemaphore.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2013 CCP ehf.

#include "include/CcpSemaphore.h"
#include "include/CCPAssert.h"
#include "include/CcpAssert.h"

#ifdef _WIN32

Expand Down
2 changes: 1 addition & 1 deletion CcpTelemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <queue>

#include "include/CCPAssert.h"
#include "include/CcpAssert.h"
#include "include/CcpTelemetry.h"
#include "include/CcpTime.h"

Expand Down
6 changes: 3 additions & 3 deletions CcpThread.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright © 2013 CCP ehf.

#include <CCPLog.h>
#include <CcpLog.h>

#include "include/CcpThread.h"
#include "include/CCPMemory.h"
#include "include/CcpMemory.h"

namespace
{
Expand Down Expand Up @@ -113,7 +113,7 @@ bool CcpGetThreadTimes( int64_t& kernelTime, int64_t& userTime )
#elif __APPLE__

#include <sys/time.h>
#include "include/CCPAssert.h"
#include "include/CcpAssert.h"
#include <mach/thread_act.h>

namespace
Expand Down
2 changes: 1 addition & 1 deletion CcpTime.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2013 CCP ehf.

#include "include/CcpTime.h"
#include "include/CCPAssert.h"
#include "include/CcpAssert.h"
#include <cfloat>
#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
#include <vector>
#include <algorithm>

#include <CCPLog.h>
#include <CcpLog.h>
2 changes: 1 addition & 1 deletion StringConversions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ std::string WideToUTF8( const wchar_t* wideString )

#include <wchar.h>
#include <string.h>
#include "CCPMemory.h"
#include "CcpMemory.h"


BlueConvertWideToAscii::BlueConvertWideToAscii( const wchar_t* src ) : m_converted( nullptr )
Expand Down
4 changes: 2 additions & 2 deletions include/CachedAllocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef CachedAllocator_h
#define CachedAllocator_h

#include "CCPMemory.h"
#include "CcpMemory.h"

// CachedAllocator is a template class that provides cached allocations for its template argument.
//
Expand Down Expand Up @@ -37,7 +37,7 @@
// Once those 1024 are used up (and whenever there are no instances available to be reused), memory for 256
// further instances is allocated.

#include "CCPAssert.h"
#include "CcpAssert.h"

template <class T>
class CachedAllocator
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions include/CcpCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

#include "CcpTypes.h"
#include "CcpMacros.h"
#include "CCPMemory.h"
#include "CCPMemoryTracker.h"
#include "CCPAssert.h"
#include "CcpMemory.h"
#include "CcpMemoryTracker.h"
#include "CcpAssert.h"
#include "CcpMutex.h"
#include "CcpSemaphore.h"
#include "CcpTelemetry.h"
#include "CachedAllocator.h"
#include "CCPHash.h"
#include "CcpHash.h"
#include "TrackableContainer.h"
#include "ICrashReporter.h"
#include "CcpSecureCrt.h"
Expand Down
2 changes: 1 addition & 1 deletion include/CcpCrash.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef _CCPCRASH_H
#define _CCPCRASH_H

#include <CCPLog.h>
#include <CcpLog.h>

#if _MSC_VER
#define NOINLINE __declspec(noinline)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion include/CcpThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <type_traits>
#include <exception>
#include <algorithm>
#include "CCPMemory.h"
#include "CcpMemory.h"

#if _WIN32
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion include/TrackableContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef TRACKABLECONTAINER_H
#define TRACKABLECONTAINER_H

#include "CCPMemory.h"
#include "CcpMemory.h"
#include "CcpSecureCrt.h"
#ifdef _MSC_VER
#include <xmemory>
Expand Down
8 changes: 4 additions & 4 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ find_package(GTest CONFIG REQUIRED)
find_package(lz4 CONFIG REQUIRED)
add_executable(CcpCoreTest
CcpAtomic.cpp
CCPCallstack.cpp
CcpCallstack.cpp
CcpCoreTest.cpp
CCPHash.cpp
CcpHash.cpp
CcpFileUtils.cpp
CcpMemory.cpp
CCPMemoryTracker.cpp
CcpMemoryTracker.cpp
CcpSecureCrt.cpp
CcpStatistics.cpp
CcpTelemetry.cpp
CcpThread.cpp
CcpTime.cpp
StringConversions.cpp
TempFile.cpp
CCPLog.cpp
CcpLog.cpp
TracyTestClient.cpp
)
target_link_libraries(CcpCoreTest PRIVATE CcpCore GTest::gtest GTest::gtest_main lz4::lz4)
Expand Down
2 changes: 1 addition & 1 deletion tests/CCPCallstack.cpp → tests/CcpCallstack.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2025 CCP ehf.

#include "gtest/gtest.h"
#include "CCPCallstack.h"
#include "CcpCallstack.h"
#include <memory>

#include "TempFile.h"
Expand Down
2 changes: 1 addition & 1 deletion tests/CCPHash.cpp → tests/CcpHash.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2025 CCP ehf.

#include "gtest/gtest.h"
#include "CCPHash.h"
#include "CcpHash.h"

TEST ( CCPHash, TestHashEmptyString )
{
Expand Down
2 changes: 1 addition & 1 deletion tests/CCPLog.cpp → tests/CcpLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <stack>
#include <gtest/gtest.h>
#include <CCPLog.h>
#include <CcpLog.h>


struct LogEntry
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/CcpSemaphore.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2025 CCP ehf.

#include "gtest/gtest.h"
#include "CcpCore/include/CCPCore.h"
#include "CcpCore/include/CcpCore.h"

namespace
{
Expand Down