RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:54:58 +00:00
Code Issues Activity Actions

Kernel: Change the format of /proc/all to JSON.

Browse source 
Update ProcessManager, top and WSCPUMonitor to handle the new format.

Since the kernel is not allowed to use floating-point math, we now compile
the JSON classes in AK without JsonValue::Type::Double support.
To accomodate large unsigned ints, I added a JsonValue::Type::UnsignedInt.
This commit is contained in:
Andreas Kling 2019-06-29 09:04:45 +02:00
parent 561bfd3ed6
commit 2bd8118843
9 changed files with 128 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

23
AK/JsonValue.cpp
View file

@ -68,15 +68,15 @@ JsonValue::JsonValue(int value)
m_value.as_int = value;
}
JsonValue::JsonValue(unsigned value)
JsonValue::JsonValue(long unsigned value)
: JsonValue((unsigned)value)
{
if (value > INT32_MAX) {
m_type = Type::Double;
m_value.as_double = value;
} else {
m_type = Type::Int;
m_value.as_int = (int)value;
}
}
JsonValue::JsonValue(unsigned value)
: m_type(Type::UnsignedInt)
{
m_value.as_uint = value;
}
JsonValue::JsonValue(const char* cstring)
@ -84,11 +84,13 @@ JsonValue::JsonValue(const char* cstring)
{
}
#ifndef KERNEL
JsonValue::JsonValue(double value)
: m_type(Type::Double)
{
m_value.as_double = value;
}
#endif
JsonValue::JsonValue(bool value)
: m_type(Type::Bool)
@ -153,12 +155,17 @@ void JsonValue::serialize(StringBuilder& builder) const
case Type::Bool:
builder.append(m_value.as_bool ? "true" : "false");
break;
#ifndef KERNEL
case Type::Double:
builder.appendf("%g", m_value.as_double);
break;
#endif
case Type::Int:
builder.appendf("%d", m_value.as_int);
break;
case Type::UnsignedInt:
builder.appendf("%u", m_value.as_uint);
break;
case Type::Undefined:
builder.append("undefined");
break;