herdd: update kernel and fx usage

services/herdd/service.c

@@ -3,12 +3,13 @@
 #include "log.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 <fx/string.h>
+#include <fx/stringstream.h>
 #include <launch.h>
-#include <mango/log.h>
+#include <magenta/log.h>
 #include <rosetta/bootstrap.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,45 +24,60 @@ struct queue *global_services(void)
 
 static int parse_service_data(fx_object *in, struct service *out)
 {
-	if (!fx_object_is_type(in, FX_TYPE_DICT)) {
+	if (!fx_object_is_type(in, FX_TYPE_HASHTABLE)) {
 		return -1;
 	}
 
-	fx_dict *in_service = fx_dict_at(in, "service");
-	if (!in_service || !fx_object_is_type(in_service, FX_TYPE_DICT)) {
+	const fx_value *service_v = fx_hashtable_get(in, &FX_CSTR("service"));
+	if (!service_v || !fx_value_is_type(service_v, FX_TYPE_HASHTABLE)) {
 		return -1;
 	}
+	fx_hashtable *in_service = NULL;
+	fx_value_get_object(service_v, &in_service);
 
-	fx_dict *in_unit = fx_dict_at(in, "unit");
-	if (!in_unit || !fx_object_is_type(in_unit, FX_TYPE_DICT)) {
+	const fx_value *unit_v = fx_hashtable_get(in, &FX_CSTR("unit"));
+	if (!unit_v || !fx_value_is_type(unit_v, FX_TYPE_HASHTABLE)) {
 		return -1;
 	}
+	fx_hashtable *in_unit = NULL;
+	fx_value_get_object(unit_v, &in_unit);
 
-	fx_string *name = fx_dict_at(in_unit, "name");
-	if (!name || !fx_object_is_type(name, FX_TYPE_STRING)) {
+	const fx_value *name_v = fx_hashtable_get(in_unit, &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_unit, "description");
-	if (!description || !fx_object_is_type(description, FX_TYPE_STRING)) {
+	const fx_value *description_v
+		= fx_hashtable_get(in_unit, &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_string *exec = fx_dict_at(in_service, "exec");
-	if (!description || !fx_object_is_type(description, FX_TYPE_STRING)) {
+	const fx_value *exec_v = fx_hashtable_get(in_service, &FX_CSTR("exec"));
+	if (!exec_v || !fx_value_is_type(exec_v, FX_TYPE_STRING)) {
 		return -1;
 	}
+	fx_string *exec = NULL;
+	fx_value_get_object(exec_v, &exec);
 
-	fx_array *roles = fx_dict_at(in_service, "roles");
-	if (roles && !fx_object_is_type(roles, FX_TYPE_ARRAY)) {
+	const fx_value *roles_v
+		= fx_hashtable_get(in_service, &FX_CSTR("roles"));
+	if (roles_v && !fx_value_is_type(roles_v, FX_TYPE_ARRAY)) {
 		return -1;
 	}
+	fx_array *roles = NULL;
+	fx_value_get_object(roles_v, &roles);
 
 	int ret = 0;
-	fx_iterator *it = fx_iterator_begin(roles);
-	fx_foreach_ptr(fx_string, role, it)
+	const fx_iterator *it = fx_iterator_begin(roles);
+	fx_foreach(v, it)
 	{
-		if (!fx_object_is_type(role, FX_TYPE_STRING)) {
+		if (!fx_value_is_type(v, FX_TYPE_STRING)) {
 			ret = -1;
 			break;
 		}
@@ -74,9 +90,10 @@ static int parse_service_data(fx_object *in, struct service *out)
 
 	it = fx_iterator_begin(roles);
 	size_t i = 0;
-	fx_foreach_ptr(fx_string, role, it)
+	fx_foreach(role, it)
 	{
-		const char *role_cstr = fx_string_get_cstr(role);
+		const char *role_cstr = NULL;
+		fx_value_get_cstr(role, &role_cstr);
 		if (!strcmp(role_cstr, "NamespaceProvider")) {
 			out->s_roles |= SVC_ROLE_NAMESPACE_PROVIDER;
 		}
@@ -106,7 +123,7 @@ int service_load(const char *path, struct service **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);
@@ -115,14 +132,21 @@ int service_load(const char *path, struct service **out)
 		return -1;
 	}
 
-	if (parse_service_data(data, rl) != 0) {
+	if (!fx_value_is_type(&data, FX_TYPE_HASHTABLE)) {
+		fx_value_unset(&data);
+		free(rl);
+		errno = EFTYPE;
+		return -1;
+	}
+
+	if (parse_service_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);