herdd: update kernel and fx usage

services/herdd/runlevel.c

@@ -4,11 +4,12 @@
 #include "service.h"
 
 #include <errno.h>
-#include <fx/core/stringstream.h>
-#include <fx/ds/array.h>
-#include <fx/ds/dict.h>
+#include <fx/collections/array.h>
+#include <fx/collections/hashtable.h>
 #include <fx/serial.h>
-#include <mango/log.h>
+#include <fx/string.h>
+#include <fx/stringstream.h>
+#include <magenta/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,36 +23,48 @@ struct queue *global_runlevels(void)
 
 static int parse_runlevel_data(fx_object *in, struct runlevel *out)
 {
-	if (!fx_object_is_type(in, FX_TYPE_DICT)) {
+	if (!fx_object_is_type(in, FX_TYPE_HASHTABLE)) {
 		return -1;
 	}
 
-	fx_dict *in_runlevel = fx_dict_at(in, "runlevel");
-	if (!in_runlevel || !fx_object_is_type(in_runlevel, FX_TYPE_DICT)) {
+	const fx_value *runlevel_v = fx_hashtable_get(in, &FX_CSTR("runlevel"));
+	if (!runlevel_v || !fx_value_is_type(runlevel_v, FX_TYPE_HASHTABLE)) {
 		return -1;
 	}
+	fx_hashtable *in_runlevel = NULL;
+	fx_value_get_object(runlevel_v, &in_runlevel);
 
-	fx_string *name = fx_dict_at(in_runlevel, "name");
-	if (!name || !fx_object_is_type(name, FX_TYPE_STRING)) {
+	const fx_value *name_v
+		= fx_hashtable_get(in_runlevel, &FX_CSTR("name"));
+	if (!name_v || !fx_value_is_type(name_v, FX_TYPE_STRING)) {
 		return -1;
 	}
+	fx_string *name = NULL;
+	fx_value_get_object(name_v, &name);
 
-	fx_string *description = fx_dict_at(in_runlevel, "description");
-	if (!description || !fx_object_is_type(description, FX_TYPE_STRING)) {
+	const fx_value *description_v
+		= fx_hashtable_get(in_runlevel, &FX_CSTR("description"));
+	if (!description_v
+	    || !fx_value_is_type(description_v, FX_TYPE_STRING)) {
 		return -1;
 	}
+	fx_string *description = NULL;
+	fx_value_get_object(description_v, &description);
 
-	fx_array *deps = fx_dict_at(in_runlevel, "requires");
-	if (deps && !fx_object_is_type(deps, FX_TYPE_ARRAY)) {
+	const fx_value *deps_v
+		= fx_hashtable_get(in_runlevel, &FX_CSTR("requires"));
+	if (deps_v && !fx_value_is_type(deps_v, FX_TYPE_ARRAY)) {
 		return -1;
 	}
+	fx_array *deps = NULL;
+	fx_value_get_object(deps_v, &deps);
 
 	int ret = 0;
-	size_t dep_count = fx_array_size(deps);
-	fx_iterator *it = fx_iterator_begin(deps);
-	fx_foreach_ptr(fx_string, dep, it)
+	size_t dep_count = fx_array_get_size(deps);
+	const fx_iterator *it = fx_iterator_begin(deps);
+	fx_foreach(dep, it)
 	{
-		if (!fx_object_is_type(dep, FX_TYPE_STRING)) {
+		if (!fx_value_is_type(dep, FX_TYPE_STRING)) {
 			ret = -1;
 			break;
 		}
@@ -66,9 +79,11 @@ static int parse_runlevel_data(fx_object *in, struct runlevel *out)
 	out->rl_requires = calloc(dep_count, sizeof(char *));
 	it = fx_iterator_begin(deps);
 	size_t i = 0;
-	fx_foreach_ptr(fx_string, dep, it)
+	fx_foreach(dep, it)
 	{
-		out->rl_requires[i++] = fx_string_steal(dep);
+		fx_string *str = NULL;
+		fx_value_get_object(dep, &str);
+		out->rl_requires[i++] = fx_string_steal(str);
 	}
 	fx_iterator_unref(it);
 
@@ -94,7 +109,7 @@ int runlevel_load(const char *path, struct runlevel **out)
 
 	fx_stream *in = fx_stream_open_fp(fp);
 	fx_serial_ctx *ctx = fx_toml_serial_ctx_create();
-	fx_object *data;
+	fx_value data;
 	fx_result result = fx_serial_ctx_deserialise(ctx, in, &data, 0);
 	if (fx_result_is_error(result)) {
 		fx_throw(result);
@@ -103,14 +118,20 @@ int runlevel_load(const char *path, struct runlevel **out)
 		return -1;
 	}
 
-	if (parse_runlevel_data(data, rl) != 0) {
+	if (!fx_value_is_type(&data, FX_TYPE_HASHTABLE)) {
+		free(rl);
+		errno = EFTYPE;
+		return -1;
+	}
+
+	if (parse_runlevel_data(data.v_object, rl) != 0) {
 		free(rl);
 		errno = EFTYPE;
 		return -1;
 	}
 
 	fx_stream_unref(in);
-	fx_object_unref(data);
+	fx_value_unset(&data);
 
 	fclose(fp);