Remove validation bits
Discard invalid properties from json decode. JSON output should only
contain valid properties. This saves time in preventing post
processing of output for valid fields.
Ensure round trip validity with validation bits removed and required
properties populated.
Fix bugs in json decode.
Overhaul unit tests to use valijson. Add tests with static examples
to validate against schema. Use and nlohmann for better schema
validation over intrinsic libcper validation.
Example json output before:
{
"ValidationBits": {
"LevelValid": false,
"CorrectedValid": true
},
"Level": 1,
"Corrected": true
}
After:
{
"Corrected": true
}
Change-Id: I188bdc2827a57d938c22a431238fadfcdc939ab8
Signed-off-by: Aushim Nagarkatti <anagarkatti@nvidia.com>
diff --git a/cper-utils.c b/cper-utils.c
index 1e259e8..c777974 100644
--- a/cper-utils.c
+++ b/cper-utils.c
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <json.h>
+#include <string.h>
#include <libcper/Cper.h>
#include <libcper/cper-utils.h>
@@ -98,8 +99,10 @@
UINT32 *cur = start;
for (int i = 0; i < len; i++) {
+ UINT32 value;
+ memcpy(&value, cur, sizeof(UINT32));
json_object_object_add(result, names[i],
- json_object_new_uint64(*cur));
+ json_object_new_uint64(value));
cur++;
}
@@ -196,6 +199,29 @@
return result;
}
+//Filters properties based on Validation Bits.
+// Refer to CPER spec for vbit_idx to be passed here.
+void add_to_valid_bitfield(ValidationTypes *val, int vbit_idx)
+{
+ switch (val->size) {
+ case UINT_8T:
+ val->value.ui8 |= (0x01 << vbit_idx);
+ break;
+ case UINT_16T:
+ val->value.ui16 |= (0x01 << vbit_idx);
+ break;
+ case UINT_32T:
+ val->value.ui32 |= (0x01 << vbit_idx);
+ break;
+ case UINT_64T:
+ val->value.ui64 |= (0x01 << vbit_idx);
+ break;
+ default:
+ printf("IR to CPER: Unknown validation bits size passed, Enum IntType=%d",
+ val->size);
+ }
+}
+
//Converts the given IR bitfield into a standard UINT64 bitfield, with fields beginning from bit 0.
UINT64 ir_to_bitfield(json_object *ir, int num_fields, const char *names[])
{
@@ -210,6 +236,53 @@
return result;
}
+// Filters properties based on Validation Bits.
+// Refer to CPER spec for vbit_idx to be passed here.
+// Overload function for 16, 32, 64b
+bool isvalid_prop_to_ir(ValidationTypes *val, int vbit_idx)
+{
+ UINT64 vbit_mask = 0x01 << vbit_idx;
+ switch (val->size) {
+ case UINT_16T:
+ return (vbit_mask & val->value.ui16);
+
+ case UINT_32T:
+ return (vbit_mask & val->value.ui32);
+
+ case UINT_64T:
+ return (vbit_mask & val->value.ui64);
+
+ default:
+ printf("CPER to IR:Unknown validation bits size passed. Enum IntType: %d",
+ val->size);
+ }
+ return 0;
+}
+
+void print_val(ValidationTypes *val)
+{
+ switch (val->size) {
+ case UINT_8T:
+ printf("Validation bits: %x\n", val->value.ui8);
+ break;
+ case UINT_16T:
+ printf("Validation bits: %x\n", val->value.ui16);
+ break;
+
+ case UINT_32T:
+ printf("Validation bits: %x\n", val->value.ui32);
+ break;
+
+ case UINT_64T:
+ printf("Validation bits: %llx\n", val->value.ui64);
+ break;
+
+ default:
+ printf("CPER to IR:Unknown validation bits size passed. Enum IntType: %d",
+ val->size);
+ }
+}
+
//Converts the given UINT64 array into a JSON IR array, given the length.
json_object *uint64_array_to_ir_array(UINT64 *array, int len)
{