RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:47:44 +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

29
AK/JsonValue.h
View file

@ -14,7 +14,10 @@ public:
Undefined,
Null,
Int,
UnsignedInt,
#ifndef KERNEL
Double,
#endif
Bool,
String,
Array,
@ -34,7 +37,10 @@ public:
JsonValue(int);
JsonValue(unsigned);
JsonValue(long unsigned);
#ifndef KERNEL
JsonValue(double);
#endif
JsonValue(bool);
JsonValue(const char*);
JsonValue(const String&);
@ -75,18 +81,36 @@ public:
bool is_undefined() const { return m_type == Type::Undefined; }
bool is_string() const { return m_type == Type::String; }
bool is_int() const { return m_type == Type::Int; }
bool is_uint() const { return m_type == Type::UnsignedInt; }
#ifndef KERNEL
bool is_double() const { return m_type == Type::Double; }
#endif
bool is_array() const { return m_type == Type::Array; }
bool is_object() const { return m_type == Type::Object; }
bool is_number() const { return m_type == Type::Int || m_type == Type::Double; }
bool is_number() const
{
if (m_type == Type::Int || m_type == Type::UnsignedInt)
return true;
#ifdef KERNEL
return false;
#else
return m_type == Type::Double;
#endif
}
dword to_dword(dword default_value = 0) const
{
if (!is_number())
return default_value;
#ifdef KERNEL
return (dword)m_value.as_int;
#else
if (type() == Type::Int)
return (dword)m_value.as_int;
if (type() == Type::UnsignedInt)
return m_value.as_uint;
return (dword)m_value.as_double;
#endif
}
private:
@ -99,8 +123,11 @@ private:
StringImpl* as_string { nullptr };
JsonArray* as_array;
JsonObject* as_object;
#ifndef KERNEL
double as_double;
#endif
int as_int;
unsigned int as_uint;
bool as_bool;
} m_value;
};