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

Commit

Permalink
fix(core): Fix severity shift error and reorder error code
Browse files Browse the repository at this point in the history
Same type of error is given the same error code now(the last 3 bits).
  • Loading branch information
jkrvivian committed Mar 15, 2019
1 parent cb3d926 commit 92c1f87
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions accelerator/errors.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ extern "C" {
#define SC_SEVERITY_MASK 0x18
#define SC_SEVERITY_SHIFT 3

#define SC_SEVERITY_MINOR (0x0 << SC_SEVERITY_MASK)
#define SC_SEVERITY_MODERATE (0x01 << SC_SEVERITY_MASK)
#define SC_SEVERITY_MAJOR (0x02 << SC_SEVERITY_MASK)
#define SC_SEVERITY_FATAL (0x03 << SC_SEVERITY_MASK)
#define SC_SEVERITY_MINOR (0x0 << SC_SEVERITY_SHIFT)
#define SC_SEVERITY_MODERATE (0x01 << SC_SEVERITY_SHIFT)
#define SC_SEVERITY_MAJOR (0x02 << SC_SEVERITY_SHIFT)
#define SC_SEVERITY_FATAL (0x03 << SC_SEVERITY_SHIFT)
/** @} */

/** @name module code */
Expand Down Expand Up @@ -64,35 +64,37 @@ typedef enum {
// CClient module
SC_CCLIENT_OOM = 0x01 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
/**< Fail to create cclient object */
SC_CCLIENT_NOT_FOUND = 0x02 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
SC_CCLIENT_NOT_FOUND = 0x03 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
/**< Empty result from cclient */
SC_CCLIENT_FAILED_RESPONSE = 0x03 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
SC_CCLIENT_FAILED_RESPONSE = 0x04 | SC_MODULE_CCLIENT | SC_SEVERITY_FATAL,
/**< Error in cclient response */
SC_CCLIENT_INVALID_FLEX_TRITS = 0x04 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
SC_CCLIENT_INVALID_FLEX_TRITS = 0x05 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
/**< flex_trits conversion error */
SC_CCLIENT_HASH = 0x05 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
SC_CCLIENT_HASH = 0x06 | SC_MODULE_CCLIENT | SC_SEVERITY_MAJOR,
/**< hash container operation error */

// Serializer module
SC_SERIALIZER_JSON_CREATE = 0x01 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
/**< Fail to create JSON object in serializer */
SC_SERIALIZER_JSON_PARSE = 0x02 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
/**< Fail to parse JSON object in serializer */
SC_SERIALIZER_NULL = 0x03 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
SC_SERIALIZER_NULL = 0x02 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
/**< NULL object in serializer */
SC_SERIALIZER_JSON_PARSE = 0x07 | SC_MODULE_SERIALIZER | SC_SEVERITY_FATAL,
/**< Fail to parse JSON object in serializer */

// Cache module
SC_CACHE_NULL = 0x01 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
SC_CACHE_NULL = 0x02 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
/**< NULL parameters in cache */
SC_CACHE_FAILED_RESPONSE = 0x02 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
SC_CACHE_FAILED_RESPONSE = 0x04 | SC_MODULE_CACHE | SC_SEVERITY_FATAL,
/**< Fail in cache operations */

// MAM module
SC_MAM_OOM = 0x01 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
/**< Fail to create mam object */
SC_MAM_NULL = 0x02 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
/**< NULL object in mam */
SC_MAM_FAILED_RESPONSE = 0x03 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
SC_MAM_NOT_FOUND = 0x03 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
/**< Empty result from mam */
SC_MAM_FAILED_RESPONSE = 0x04 | SC_MODULE_MAM | SC_SEVERITY_FATAL,
/**< Error in mam response */
} status_t;

Expand Down

0 comments on commit 92c1f87

Please sign in to comment.