Skip to content

Commit b13788f

Browse files
authored
[PTI-0] Simplify PTI errors to string conversion (#629)
1 parent 2745360 commit b13788f

File tree

2 files changed

+26
-111
lines changed

2 files changed

+26
-111
lines changed

sdk/src/pti.cc

Lines changed: 26 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,66 +6,34 @@
66

77
#include "pti/pti.h"
88

9-
#include <spdlog/spdlog.h>
9+
#define PTI_CASE_ENUM_TO_STRING(e) \
10+
case e: \
11+
return #e;
1012

11-
#include <array>
12-
13-
#include "utils/enum_conversion_helper.h"
14-
15-
constexpr const char* const kResultFallback = "INVALID";
16-
17-
inline constexpr static std::array kResultStrTable = {
18-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_SUCCESS),
19-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_STATUS_END_OF_BUFFER),
20-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_NOT_IMPLEMENTED),
21-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_BAD_ARGUMENT),
22-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_NO_CALLBACKS_SET),
23-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_EXTERNAL_ID_QUEUE_EMPTY),
24-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_BAD_TIMESTAMP),
25-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_BAD_API_ID),
26-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_DRIVER),
27-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_TRACING_NOT_INITIALIZED),
28-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_L0_LOCAL_PROFILING_NOT_SUPPORTED),
29-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_ENABLED),
30-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_DISABLED),
31-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_PAUSED),
32-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_COLLECTION_ALREADY_PAUSED),
33-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_COLLECTION_ALREADY_ENABLED),
34-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result,
35-
PTI_ERROR_METRICS_BAD_COLLECTION_CONFIGURATION),
36-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_METRICS_NO_DATA_COLLECTED),
37-
PTI_ASSOCIATE_ENUM_MEMBER_TO_DEFAULT(pti_result, PTI_ERROR_INTERNAL),
38-
};
39-
40-
constexpr const char* PtiResultTypeToStringImpl(pti_result result_value) {
13+
const char* ptiResultTypeToString(pti_result result_value) {
4114
switch (result_value) {
42-
PTI_ENUM_CONVERSION(pti_result, PTI_SUCCESS, kResultStrTable)
43-
PTI_ENUM_CONVERSION(pti_result, PTI_STATUS_END_OF_BUFFER, kResultStrTable)
44-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_NOT_IMPLEMENTED, kResultStrTable)
45-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_BAD_ARGUMENT, kResultStrTable)
46-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_NO_CALLBACKS_SET, kResultStrTable)
47-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_EXTERNAL_ID_QUEUE_EMPTY, kResultStrTable)
48-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_BAD_TIMESTAMP, kResultStrTable)
49-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_BAD_API_ID, kResultStrTable)
50-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_DRIVER, kResultStrTable)
51-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_TRACING_NOT_INITIALIZED, kResultStrTable)
52-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_L0_LOCAL_PROFILING_NOT_SUPPORTED, kResultStrTable)
53-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_ENABLED, kResultStrTable)
54-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_DISABLED, kResultStrTable)
55-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_COLLECTION_NOT_PAUSED, kResultStrTable)
56-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_COLLECTION_ALREADY_PAUSED, kResultStrTable)
57-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_COLLECTION_ALREADY_ENABLED, kResultStrTable)
58-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_BAD_COLLECTION_CONFIGURATION, kResultStrTable)
59-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_METRICS_NO_DATA_COLLECTED, kResultStrTable)
60-
PTI_ENUM_CONVERSION(pti_result, PTI_ERROR_INTERNAL, kResultStrTable)
15+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_BAD_API_ID)
16+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_BAD_ARGUMENT)
17+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_BAD_TIMESTAMP)
18+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_DRIVER)
19+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_EXTERNAL_ID_QUEUE_EMPTY)
20+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_INTERNAL)
21+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_L0_LOCAL_PROFILING_NOT_SUPPORTED)
22+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_BAD_COLLECTION_CONFIGURATION)
23+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_COLLECTION_ALREADY_ENABLED)
24+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_COLLECTION_ALREADY_PAUSED)
25+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_COLLECTION_NOT_DISABLED)
26+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_COLLECTION_NOT_ENABLED)
27+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_COLLECTION_NOT_PAUSED)
28+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_METRICS_NO_DATA_COLLECTED)
29+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_NO_CALLBACKS_SET)
30+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_NOT_IMPLEMENTED)
31+
PTI_CASE_ENUM_TO_STRING(PTI_ERROR_TRACING_NOT_INITIALIZED)
32+
PTI_CASE_ENUM_TO_STRING(PTI_STATUS_END_OF_BUFFER)
33+
PTI_CASE_ENUM_TO_STRING(PTI_SUCCESS)
6134
}
62-
return kResultFallback;
63-
}
6435

65-
const char* ptiResultTypeToString(pti_result result_value) {
66-
try {
67-
return PtiResultTypeToStringImpl(result_value);
68-
} catch (...) {
69-
return kResultFallback;
70-
}
36+
return "INVALID";
7137
}
38+
39+
#undef PTI_CASE_ENUM_TO_STRING

sdk/src/utils/enum_conversion_helper.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)