Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit 92c1f87

Browse files
committed
fix(core): Fix severity shift error and reorder error code
Same type of error is given the same error code now(the last 3 bits).
1 parent cb3d926 commit 92c1f87

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

accelerator/errors.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ extern "C" {
2424
#define SC_SEVERITY_MASK 0x18
2525
#define SC_SEVERITY_SHIFT 3
2626

27-
#define SC_SEVERITY_MINOR (0x0 << SC_SEVERITY_MASK)
28-
#define SC_SEVERITY_MODERATE (0x01 << SC_SEVERITY_MASK)
29-
#define SC_SEVERITY_MAJOR (0x02 << SC_SEVERITY_MASK)
30-
#define SC_SEVERITY_FATAL (0x03 << SC_SEVERITY_MASK)
27+
#define SC_SEVERITY_MINOR (0x0 << SC_SEVERITY_SHIFT)
28+
#define SC_SEVERITY_MODERATE (0x01 << SC_SEVERITY_SHIFT)
29+
#define SC_SEVERITY_MAJOR (0x02 << SC_SEVERITY_SHIFT)
30+
#define SC_SEVERITY_FATAL (0x03 << SC_SEVERITY_SHIFT)
3131
/** @} */
3232

3333
/** @name module code */
@@ -64,35 +64,37 @@ typedef enum {
6464
// CClient module
6565
SC_CCLIENT_OOM = 0x01 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
6666
/**< Fail to create cclient object */
67-
SC_CCLIENT_NOT_FOUND = 0x02 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
67+
SC_CCLIENT_NOT_FOUND = 0x03 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
6868
/**< Empty result from cclient */
69-
SC_CCLIENT_FAILED_RESPONSE = 0x03 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
69+
SC_CCLIENT_FAILED_RESPONSE = 0x04 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
7070
/**< Error in cclient response */
71-
SC_CCLIENT_INVALID_FLEX_TRITS = 0x04 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
71+
SC_CCLIENT_INVALID_FLEX_TRITS = 0x05 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
7272
/**< flex_trits conversion error */
73-
SC_CCLIENT_HASH = 0x05 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
73+
SC_CCLIENT_HASH = 0x06 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
7474
/**< hash container operation error */
7575

7676
// Serializer module
7777
SC_SERIALIZER_JSON_CREATE = 0x01 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
7878
/**< Fail to create JSON object in serializer */
79-
SC_SERIALIZER_JSON_PARSE = 0x02 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
80-
/**< Fail to parse JSON object in serializer */
81-
SC_SERIALIZER_NULL = 0x03 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
79+
SC_SERIALIZER_NULL = 0x02 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
8280
/**< NULL object in serializer */
81+
SC_SERIALIZER_JSON_PARSE = 0x07 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
82+
/**< Fail to parse JSON object in serializer */
8383

8484
// Cache module
85-
SC_CACHE_NULL = 0x01 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
85+
SC_CACHE_NULL = 0x02 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
8686
/**< NULL parameters in cache */
87-
SC_CACHE_FAILED_RESPONSE = 0x02 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
87+
SC_CACHE_FAILED_RESPONSE = 0x04 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
8888
/**< Fail in cache operations */
8989

9090
// MAM module
9191
SC_MAM_OOM = 0x01 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
9292
/**< Fail to create mam object */
9393
SC_MAM_NULL = 0x02 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
9494
/**< NULL object in mam */
95-
SC_MAM_FAILED_RESPONSE = 0x03 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
95+
SC_MAM_NOT_FOUND = 0x03 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
96+
/**< Empty result from mam */
97+
SC_MAM_FAILED_RESPONSE = 0x04 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
9698
/**< Error in mam response */
9799
} status_t;
98100

0 commit comments

Comments
 (0)