Skip to content

Commit d2caaf2

Browse files
JakeHillionJakeHillion
committed
formatting: force pointers/references with the type
1 parent 2e74fa3 commit d2caaf2

40 files changed

+1054
-1056
lines changed

‎.clang-format‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ AllowShortCaseLabelsOnASingleLine: false
66
AllowShortFunctionsOnASingleLine: false
77
AllowShortIfStatementsOnASingleLine: false
88
AllowShortLoopsOnASingleLine: false
9+
DerivePointerAlignment: false
10+
PointerAlignment: Left

‎examples/oil-metrics/Metrics.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include "Metrics.h"
1717

1818
namespace Metrics {
19-
std::atomic<Metrics *> Metrics::singleton = nullptr;
19+
std::atomic<Metrics*> Metrics::singleton = nullptr;
2020

21-
const char *to_string(ArgTiming t) {
21+
const char* to_string(ArgTiming t) {
2222
switch (t) {
2323
case ENTRY:
2424
return "entry";
@@ -29,7 +29,7 @@ const char *to_string(ArgTiming t) {
2929
}
3030
}
3131

32-
Metrics::Metrics(ObjectIntrospection::options opts, const std::string &savePath)
32+
Metrics::Metrics(ObjectIntrospection::options opts, const std::string& savePath)
3333
: opts(opts) {
3434
writer = std::fstream(savePath, std::ios_base::out);
3535
writer << "{ \"metrics\": [" << std::endl;
@@ -43,7 +43,7 @@ Metrics::~Metrics() {
4343
}
4444

4545
void Metrics::save(std::string object) {
46-
Metrics *m = singleton.load();
46+
Metrics* m = singleton.load();
4747
std::lock_guard<std::mutex> guard(m->writerLock);
4848

4949
if (m->hasWritten) {
@@ -54,7 +54,7 @@ void Metrics::save(std::string object) {
5454
}
5555
}
5656

57-
void Metrics::saveArg(const char *name, const char *argName, ArgTiming timing,
57+
void Metrics::saveArg(const char* name, const char* argName, ArgTiming timing,
5858
size_t size) {
5959
std::string out = "{\"type\": \"size\", \"traceName\": \"";
6060
out += name;
@@ -69,7 +69,7 @@ void Metrics::saveArg(const char *name, const char *argName, ArgTiming timing,
6969
save(out);
7070
}
7171

72-
void Metrics::saveDuration(const char *name,
72+
void Metrics::saveDuration(const char* name,
7373
std::chrono::milliseconds duration) {
7474
std::string out = "{\"type\": \"duration\", \"traceName\": \"";
7575
out += name;
@@ -80,7 +80,7 @@ void Metrics::saveDuration(const char *name,
8080
save(out);
8181
}
8282

83-
Tracing::Tracing(const char *name, bool enabled)
83+
Tracing::Tracing(const char* name, bool enabled)
8484
: name(name), enabled(enabled) {
8585
}
8686

@@ -91,15 +91,15 @@ Tracing::~Tracing() {
9191
saveDuration(duration);
9292
}
9393

94-
for (auto const &exitFunc : exitFuncs)
94+
for (auto const& exitFunc : exitFuncs)
9595
exitFunc();
9696
}
9797

9898
bool Tracing::isTimingEnabled() {
9999
return enabled || Metrics::isEnabled();
100100
}
101101

102-
bool Tracing::isArgEnabled(const char *argName, ArgTiming timing) {
102+
bool Tracing::isArgEnabled(const char* argName, ArgTiming timing) {
103103
return enabled || Metrics::isEnabled();
104104
}
105105

@@ -109,7 +109,7 @@ void Tracing::start() {
109109
}
110110
}
111111

112-
void Tracing::saveArg(const char *argName, ArgTiming timing, size_t size) {
112+
void Tracing::saveArg(const char* argName, ArgTiming timing, size_t size) {
113113
Metrics::saveArg(name, argName, timing, size);
114114
}
115115

‎examples/oil-metrics/Metrics.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ class Metrics {
3333
friend class Tracing;
3434

3535
public:
36-
Metrics(ObjectIntrospection::options opts, const std::string &savePath);
36+
Metrics(ObjectIntrospection::options opts, const std::string& savePath);
3737
~Metrics();
3838

3939
void enable() {
4040
enableAll = true;
4141
}
4242

4343
private:
44-
static std::atomic<Metrics *> singleton;
44+
static std::atomic<Metrics*> singleton;
4545

4646
ObjectIntrospection::options opts;
4747
std::fstream writer;
4848
std::mutex writerLock;
4949
bool hasWritten = false;
5050
bool enableAll = false;
5151

52-
static ObjectIntrospection::options &getOptions() {
52+
static ObjectIntrospection::options& getOptions() {
5353
return singleton.load()->opts;
5454
}
5555

@@ -58,39 +58,39 @@ class Metrics {
5858
}
5959

6060
static void save(std::string object);
61-
static void saveArg(const char *name, const char *argName, ArgTiming timing,
61+
static void saveArg(const char* name, const char* argName, ArgTiming timing,
6262
size_t size);
63-
static void saveDuration(const char *name,
63+
static void saveDuration(const char* name,
6464
std::chrono::milliseconds duration);
6565
};
6666

6767
class Tracing {
6868
public:
69-
Tracing(const char *name, bool enabled = false);
69+
Tracing(const char* name, bool enabled = false);
7070
~Tracing();
7171

7272
void start();
7373

7474
template <class T>
75-
void registerArg(const char *argName, T *value);
75+
void registerArg(const char* argName, T* value);
7676

7777
private:
7878
bool isTimingEnabled();
79-
bool isArgEnabled(const char *argName, ArgTiming timing);
80-
void saveArg(const char *argName, ArgTiming timing, size_t size);
79+
bool isArgEnabled(const char* argName, ArgTiming timing);
80+
void saveArg(const char* argName, ArgTiming timing, size_t size);
8181
void saveDuration(std::chrono::milliseconds duration);
8282

8383
template <class T>
84-
void inspectArg(const char *argName, ArgTiming timing, T *value);
84+
void inspectArg(const char* argName, ArgTiming timing, T* value);
8585

86-
const char *name;
86+
const char* name;
8787
bool enabled;
8888
std::chrono::high_resolution_clock::time_point startTime;
8989
std::vector<std::function<void()>> exitFuncs;
9090
};
9191

9292
template <class T>
93-
void Tracing::registerArg(const char *argName, T *value) {
93+
void Tracing::registerArg(const char* argName, T* value) {
9494
if (isArgEnabled(argName, ArgTiming::ENTRY)) {
9595
inspectArg(argName, ArgTiming::ENTRY, value);
9696
}
@@ -108,7 +108,7 @@ void Tracing::registerArg(const char *argName, T *value) {
108108
}
109109

110110
template <class T>
111-
void Tracing::inspectArg(const char *argName, ArgTiming timing, T *value) {
111+
void Tracing::inspectArg(const char* argName, ArgTiming timing, T* value) {
112112
size_t size;
113113
if (int responseCode = ObjectIntrospection::getObjectSize(
114114
value, &size, Metrics::getOptions(), false);

‎include/ObjectIntrospection.h‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ struct options {
9292
bool chaseRawPointers = false;
9393
bool generateJitDebugInfo = false;
9494

95-
friend bool operator==(const options &lhs, const options &rhs);
96-
friend bool operator!=(const options &lhs, const options &rhs);
95+
friend bool operator==(const options& lhs, const options& rhs);
96+
friend bool operator!=(const options& lhs, const options& rhs);
9797
};
9898

9999
constexpr std::string_view OI_SECTION_PREFIX = ".oi.";
@@ -102,29 +102,29 @@ class OILibrary {
102102
friend class OILibraryImpl;
103103

104104
public:
105-
OILibrary(void *TemplateFunc, options opt);
105+
OILibrary(void* TemplateFunc, options opt);
106106
~OILibrary();
107107
int init();
108-
int getObjectSize(void *objectAddr, size_t &size);
108+
int getObjectSize(void* objectAddr, size_t& size);
109109

110110
options opts;
111111

112112
private:
113-
class OILibraryImpl *pimpl_;
113+
class OILibraryImpl* pimpl_;
114114

115-
size_t (*fp)(const void *) = nullptr;
115+
size_t (*fp)(const void*) = nullptr;
116116
};
117117

118118
template <class T>
119119
class CodegenHandler {
120120
public:
121-
static int init(const options &opts = {}, bool checkOptions = true) {
122-
OILibrary *lib;
121+
static int init(const options& opts = {}, bool checkOptions = true) {
122+
OILibrary* lib;
123123
return getLibrary(lib, opts, checkOptions);
124124
}
125125

126126
static void teardown() {
127-
OILibrary *lib;
127+
OILibrary* lib;
128128
if (int responseCode = getLibrary(lib);
129129
responseCode != Response::OIL_SUCCESS) {
130130
return;
@@ -135,64 +135,64 @@ class CodegenHandler {
135135
delete lib;
136136
}
137137

138-
static int getObjectSize(const T &objectAddr, size_t &objectSize) {
139-
OILibrary *lib;
138+
static int getObjectSize(const T& objectAddr, size_t& objectSize) {
139+
OILibrary* lib;
140140
if (int responseCode = getLibrary(lib);
141141
responseCode != Response::OIL_SUCCESS) {
142142
return responseCode;
143143
}
144144

145-
return lib->getObjectSize((void *)&objectAddr, objectSize);
145+
return lib->getObjectSize((void*)&objectAddr, objectSize);
146146
}
147147

148-
static int getObjectSize(const T &objectAddr, size_t &objectSize,
149-
const options &opts, bool checkOptions = true) {
150-
OILibrary *lib;
148+
static int getObjectSize(const T& objectAddr, size_t& objectSize,
149+
const options& opts, bool checkOptions = true) {
150+
OILibrary* lib;
151151
if (int responseCode = getLibrary(lib, opts, checkOptions);
152152
responseCode != Response::OIL_SUCCESS) {
153153
return responseCode;
154154
}
155155

156-
return lib->getObjectSize((void *)&objectAddr, objectSize);
156+
return lib->getObjectSize((void*)&objectAddr, objectSize);
157157
}
158158

159159
private:
160-
static std::atomic<OILibrary *> *getLib() {
161-
static std::atomic<OILibrary *> lib = nullptr;
160+
static std::atomic<OILibrary*>* getLib() {
161+
static std::atomic<OILibrary*> lib = nullptr;
162162
return &lib;
163163
}
164164

165-
static std::atomic<std::atomic<OILibrary *> *> *getBoxedLib() {
166-
static std::atomic<std::atomic<OILibrary *> *> boxedLib = nullptr;
165+
static std::atomic<std::atomic<OILibrary*>*>* getBoxedLib() {
166+
static std::atomic<std::atomic<OILibrary*>*> boxedLib = nullptr;
167167
return &boxedLib;
168168
}
169169

170-
static int getLibrary(OILibrary *&result) {
171-
std::atomic<OILibrary *> *curBoxedLib = getBoxedLib()->load();
170+
static int getLibrary(OILibrary*& result) {
171+
std::atomic<OILibrary*>* curBoxedLib = getBoxedLib()->load();
172172
if (curBoxedLib == nullptr)
173173
return Response::OIL_UNINITIALISED;
174174

175-
OILibrary *curLib = curBoxedLib->load();
175+
OILibrary* curLib = curBoxedLib->load();
176176
if (curLib == nullptr)
177177
return Response::OIL_UNINITIALISED;
178178

179179
result = curLib;
180180
return Response::OIL_SUCCESS;
181181
}
182182

183-
static int getLibrary(OILibrary *&result, const options &opts,
183+
static int getLibrary(OILibrary*& result, const options& opts,
184184
bool checkOptions) {
185-
std::atomic<OILibrary *> *curBoxedLib = getBoxedLib()->load();
185+
std::atomic<OILibrary*>* curBoxedLib = getBoxedLib()->load();
186186

187187
if (curBoxedLib == nullptr) {
188188
if (!getBoxedLib()->compare_exchange_strong(curBoxedLib, getLib())) {
189189
return Response::OIL_INITIALISING;
190190
}
191191
curBoxedLib = getLib();
192192

193-
int (*sizeFp)(const T &, size_t &) = &getObjectSize;
194-
void *typedFp = reinterpret_cast<void *>(sizeFp);
195-
OILibrary *newLib = new OILibrary(typedFp, opts);
193+
int (*sizeFp)(const T&, size_t&) = &getObjectSize;
194+
void* typedFp = reinterpret_cast<void*>(sizeFp);
195+
OILibrary* newLib = new OILibrary(typedFp, opts);
196196

197197
if (int initCode = newLib->init(); initCode != Response::OIL_SUCCESS) {
198198
delete newLib;
@@ -203,7 +203,7 @@ class CodegenHandler {
203203
getLib()->store(newLib);
204204
}
205205

206-
OILibrary *curLib = curBoxedLib->load();
206+
OILibrary* curLib = curBoxedLib->load();
207207
if (curLib == nullptr) {
208208
return Response::OIL_INITIALISING;
209209
}
@@ -224,7 +224,7 @@ class CodegenHandler {
224224
* Ahead-Of-Time (AOT) compilation.
225225
*/
226226
template <class T>
227-
int getObjectSize(const T &objectAddr, size_t &objectSize, const options &opts,
227+
int getObjectSize(const T& objectAddr, size_t& objectSize, const options& opts,
228228
bool checkOptions = true) {
229229
return CodegenHandler<T>::getObjectSize(objectAddr, objectSize, opts,
230230
checkOptions);
@@ -234,7 +234,7 @@ int getObjectSize(const T &objectAddr, size_t &objectSize, const options &opts,
234234

235235
template <class T>
236236
int __attribute__((weak))
237-
getObjectSizeImpl(const T &objectAddr, size_t &objectSize);
237+
getObjectSizeImpl(const T& objectAddr, size_t& objectSize);
238238

239239
#endif
240240

@@ -249,7 +249,7 @@ getObjectSizeImpl(const T &objectAddr, size_t &objectSize);
249249
*/
250250
template <class T>
251251
int __attribute__((noinline))
252-
getObjectSize(const T &objectAddr, size_t &objectSize) {
252+
getObjectSize(const T& objectAddr, size_t& objectSize) {
253253
#ifdef OIL_AOT_COMPILATION
254254
if (!getObjectSizeImpl<T>) {
255255
return Response::OIL_UNINITIALISED;

‎src/Common.h‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,22 @@ struct ClassMember {
3838
};
3939

4040
struct DrgnClassMemberInfo {
41-
struct drgn_type *type;
41+
struct drgn_type* type;
4242
std::string member_name;
4343
uint64_t bit_offset;
4444
uint64_t bit_field_size;
4545
bool isStubbed;
4646
};
4747

4848
struct TypeHierarchy {
49-
std::map<struct drgn_type *, std::vector<DrgnClassMemberInfo>>
50-
classMembersMap;
51-
std::map<struct drgn_type *,
49+
std::map<struct drgn_type*, std::vector<DrgnClassMemberInfo>> classMembersMap;
50+
std::map<struct drgn_type*,
5251
std::pair<ContainerInfo, std::vector<struct drgn_qualified_type>>>
5352
containerTypeMap;
54-
std::map<struct drgn_type *, struct drgn_type *> typedefMap;
53+
std::map<struct drgn_type*, struct drgn_type*> typedefMap;
5554
std::map<std::string, size_t> sizeMap;
56-
std::set<struct drgn_type *> knownDummyTypeList;
57-
std::map<struct drgn_type *, struct drgn_type *> pointerToTypeMap;
58-
std::set<struct drgn_type *> thriftIssetStructTypes;
59-
std::map<struct drgn_type *, std::vector<struct drgn_type *>>
60-
descendantClasses;
55+
std::set<struct drgn_type*> knownDummyTypeList;
56+
std::map<struct drgn_type*, struct drgn_type*> pointerToTypeMap;
57+
std::set<struct drgn_type*> thriftIssetStructTypes;
58+
std::map<struct drgn_type*, std::vector<struct drgn_type*>> descendantClasses;
6159
};

‎src/ContainerInfo.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ enum ContainerTypeEnum {
6969
LIST_OF_CONTAINER_TYPES
7070
#undef X
7171
};
72-
ContainerTypeEnum containerTypeEnumFromStr(std::string &str);
73-
const char *containerTypeEnumToStr(ContainerTypeEnum ty);
72+
ContainerTypeEnum containerTypeEnumFromStr(std::string& str);
73+
const char* containerTypeEnumToStr(ContainerTypeEnum ty);
7474

7575
struct ContainerInfo {
7676
std::string typeName;
@@ -85,9 +85,9 @@ struct ContainerInfo {
8585
// adapter
8686
std::optional<size_t> underlyingContainerIndex{};
8787

88-
static std::unique_ptr<ContainerInfo> loadFromFile(const fs::path &path);
88+
static std::unique_ptr<ContainerInfo> loadFromFile(const fs::path& path);
8989

90-
bool operator<(const ContainerInfo &rhs) const {
90+
bool operator<(const ContainerInfo& rhs) const {
9191
return (typeName < rhs.typeName);
9292
}
9393
};

0 commit comments

Comments
 (0)