Skip to content

Commit cc97438

Browse files
mjp41mjp41
committed
Clangformat.
1 parent 55427c1 commit cc97438

File tree

9 files changed

+80
-41
lines changed

9 files changed

+80
-41
lines changed

‎src/snmalloc/backend_helpers/statsrange.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace snmalloc
1717
{
1818
using ContainsParent<ParentRange>::parent;
1919

20-
static inline Stat usage{};
20+
static inline Stat usage{};
2121

2222
public:
2323
static constexpr bool Aligned = ParentRange::Aligned;

‎src/snmalloc/ds_core/stats.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#include "defines.h"
2+
13
#include <atomic>
24
#include <cstddef>
3-
#include "defines.h"
45

56
namespace snmalloc
67
{
@@ -28,8 +29,9 @@ namespace snmalloc
2829
void decrease(size_t amount)
2930
{
3031
size_t prev = curr.fetch_sub(amount);
31-
// TODO Fix this to be true.
32-
// SNMALLOC_ASSERT_MSG(prev >= amount, "prev = {}, amount = {}", prev, amount);
32+
// TODO Fix this to be true.
33+
// SNMALLOC_ASSERT_MSG(prev >= amount, "prev = {}, amount = {}",
34+
// prev, amount);
3335
UNUSED(prev);
3436
}
3537

‎src/snmalloc/mem/allocstats.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#include "../ds_core/ds_core.h"
2-
#include <array>
32
#include "sizeclasstable.h"
43

4+
#include <array>
5+
56
namespace snmalloc
67
{
78
class MonotoneStat
89
{
910
size_t value{0};
11+
1012
public:
1113
void operator++(int)
1214
{
@@ -53,7 +55,8 @@ namespace snmalloc
5355
for (size_t i = 0; i < SIZECLASS_REP_SIZE; i++)
5456
{
5557
sizeclass[i].objects_allocated += other.sizeclass[i].objects_allocated;
56-
sizeclass[i].objects_deallocated += other.sizeclass[i].objects_deallocated;
58+
sizeclass[i].objects_deallocated +=
59+
other.sizeclass[i].objects_deallocated;
5760
sizeclass[i].slabs_allocated += other.sizeclass[i].slabs_allocated;
5861
sizeclass[i].slabs_deallocated += other.sizeclass[i].slabs_deallocated;
5962
}

‎src/snmalloc/mem/corealloc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ namespace snmalloc
370370
auto start = clear_slab(meta, sizeclass);
371371

372372
stats[sizeclass].slabs_deallocated++;
373-
373+
374374
Config::Backend::dealloc_chunk(
375375
get_backend_local_state(),
376376
*meta,

‎src/snmalloc/mem/globalalloc.h‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ namespace snmalloc
8787
}
8888
}
8989

90-
if (result == nullptr && RemoteDeallocCache::remote_inflight.get_curr() != 0)
90+
if (
91+
result == nullptr && RemoteDeallocCache::remote_inflight.get_curr() != 0)
9192
error("ERROR: RemoteDeallocCache::remote_inflight != 0");
9293

9394
if (result != nullptr)
@@ -158,8 +159,12 @@ namespace snmalloc
158159
auto l_dump = dump++;
159160
if (l_dump == 0)
160161
{
161-
message<1024>("snmalloc_allocs,dumpid,sizeclass,size,allocated,deallocated,in_use,bytes,slabs allocated,slabs deallocated,slabs in_use,slabs bytes");
162-
message<1024>("snmalloc_totals,dumpid,backend bytes,peak backend bytes,requested,slabs requested bytes");
162+
message<1024>(
163+
"snmalloc_allocs,dumpid,sizeclass,size,allocated,deallocated,in_use,"
164+
"bytes,slabs allocated,slabs deallocated,slabs in_use,slabs bytes");
165+
message<1024>(
166+
"snmalloc_totals,dumpid,backend bytes,peak backend "
167+
"bytes,requested,slabs requested bytes");
163168
}
164169

165170
auto stats = snmalloc::get_stats<Config>();
@@ -183,8 +188,26 @@ namespace snmalloc
183188
auto amount_slabs = in_use_slabs * slab_size;
184189
total_live_slabs += amount_slabs;
185190

186-
snmalloc::message<1024>("snmalloc_allocs,{},{},{},{},{},{},{},{},{},{},{}", l_dump, i, size, allocated, deallocated, in_use, amount, slabs_allocated, slabs_deallocated, in_use_slabs, amount_slabs);
191+
snmalloc::message<1024>(
192+
"snmalloc_allocs,{},{},{},{},{},{},{},{},{},{},{}",
193+
l_dump,
194+
i,
195+
size,
196+
allocated,
197+
deallocated,
198+
in_use,
199+
amount,
200+
slabs_allocated,
201+
slabs_deallocated,
202+
in_use_slabs,
203+
amount_slabs);
187204
}
188-
snmalloc::message<1024>("snmalloc_totals,{},{},{},{},{}", l_dump, Config::Backend::get_current_usage(), Config::Backend::get_peak_usage(), total_live, total_live_slabs);
205+
snmalloc::message<1024>(
206+
"snmalloc_totals,{},{},{},{},{}",
207+
l_dump,
208+
Config::Backend::get_current_usage(),
209+
Config::Backend::get_peak_usage(),
210+
total_live,
211+
total_live_slabs);
189212
}
190213
} // namespace snmalloc

‎src/snmalloc/mem/localcache.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,11 @@ namespace snmalloc
9595
typename Config,
9696
typename Slowpath,
9797
typename Domesticator>
98-
SNMALLOC_FAST_PATH capptr::Alloc<void>
99-
alloc(Domesticator domesticate, AllocStats& stats, size_t size, Slowpath slowpath)
98+
SNMALLOC_FAST_PATH capptr::Alloc<void> alloc(
99+
Domesticator domesticate,
100+
AllocStats& stats,
101+
size_t size,
102+
Slowpath slowpath)
100103
{
101104
auto& key = entropy.get_free_list_key();
102105
smallsizeclass_t sizeclass = size_to_sizeclass(size);

‎src/test/func/cleanup/cleanup.cc‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,50 @@
1-
#include <snmalloc/snmalloc.h>
2-
31
#include <iostream>
2+
#include <snmalloc/snmalloc.h>
43
#include <thread>
54

65
void ecall()
76
{
8-
snmalloc::ScopedAllocator a;
9-
std::vector<void*> allocs;
10-
size_t count = 0;
11-
for (size_t j = 0; j < 1000; j++)
12-
{
13-
allocs.push_back(a.alloc.alloc(j % 1024));
14-
count += j % 1024;
15-
}
16-
auto p = a.alloc.alloc(1 * 1024 * 1024);
17-
memset(p, 0, 1 * 1024 * 1024);
7+
snmalloc::ScopedAllocator a;
8+
std::vector<void*> allocs;
9+
size_t count = 0;
10+
for (size_t j = 0; j < 1000; j++)
11+
{
12+
allocs.push_back(a.alloc.alloc(j % 1024));
13+
count += j % 1024;
14+
}
15+
auto p = a.alloc.alloc(1 * 1024 * 1024);
16+
memset(p, 0, 1 * 1024 * 1024);
1817

19-
for (size_t j = 0; j < allocs.size(); j++)
20-
a.alloc.dealloc(allocs[j]);
21-
22-
a.alloc.dealloc(p);
18+
for (size_t j = 0; j < allocs.size(); j++)
19+
a.alloc.dealloc(allocs[j]);
20+
21+
a.alloc.dealloc(p);
2322
}
2423

2524
void thread_body()
2625
{
27-
for (int i = 0; i < 10000; i++) {
26+
for (int i = 0; i < 10000; i++)
27+
{
2828
ecall();
2929
std::this_thread::sleep_for(std::chrono::milliseconds(10));
3030
}
3131
}
3232

3333
void monitor_body()
3434
{
35-
for (int i = 0; i < 10000; i++) {
36-
std::cout << "Current: " << snmalloc::Alloc::Config::Backend::get_current_usage() << std::endl;
37-
std::cout << "Peak : " << snmalloc::Alloc::Config::Backend::get_peak_usage() << std::endl;
38-
std::cout << "Allocs : " << snmalloc::Alloc::Config::pool().get_count() << std::endl;
35+
for (int i = 0; i < 10000; i++)
36+
{
37+
std::cout << "Current: "
38+
<< snmalloc::Alloc::Config::Backend::get_current_usage()
39+
<< std::endl;
40+
std::cout << "Peak : "
41+
<< snmalloc::Alloc::Config::Backend::get_peak_usage()
42+
<< std::endl;
43+
std::cout << "Allocs : " << snmalloc::Alloc::Config::pool().get_count()
44+
<< std::endl;
3945
std::cout << "--------------------------------------------" << std::endl;
4046
std::this_thread::sleep_for(std::chrono::seconds(1));
41-
}
47+
}
4248
}
4349

4450
int main()

‎src/test/func/statistics/stats.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void debug_check_empty_1()
2828

2929
snmalloc::print_alloc_stats<snmalloc::StandardConfig>();
3030

31-
a.dealloc(r);
31+
a.dealloc(r);
3232

3333
snmalloc::print_alloc_stats<snmalloc::StandardConfig>();
3434

‎src/test/perf/churn/churn.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@ int main()
7272
// std::endl; std::cout << "Running threads: " << running <<
7373
// std::endl; std::cout << "Index: " << count << std::endl;
7474
// std::cout << "------------------------------------------" << std::endl;
75-
std::cout << count << "," << snmalloc::Alloc::Config::Backend::get_peak_usage() << ","
76-
<< snmalloc::Alloc::Config::Backend::get_current_usage() << "," << requests.get_curr()
77-
<< "," << requests.get_peak() << ","
75+
std::cout << count << ","
76+
<< snmalloc::Alloc::Config::Backend::get_peak_usage() << ","
77+
<< snmalloc::Alloc::Config::Backend::get_current_usage() << ","
78+
<< requests.get_curr() << "," << requests.get_peak() << ","
7879
<< snmalloc::RemoteDeallocCache::remote_inflight.get_peak()
79-
<< "," << snmalloc::RemoteDeallocCache::remote_inflight.get_curr()
80+
<< ","
81+
<< snmalloc::RemoteDeallocCache::remote_inflight.get_curr()
8082
<< std::endl;
8183
snmalloc::print_alloc_stats<snmalloc::Alloc::Config>();
8284
}

0 commit comments

Comments
 (0)