X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils-systemd.c;h=0c22810f90170f041b17032b3f027b5db38c12f7;hb=f8f2338aba84394e132fff55b6ebdef7d884292b;hp=df9b89f9f9f489b28d69cca2833a6a9c9a8d6da4;hpb=1a673de307982e7f2abfb362d2927e8e5e16be55;p=src%2Fapp-framework-main.git

diff --git a/src/utils-systemd.c b/src/utils-systemd.c
index df9b89f..0c22810 100644
--- a/src/utils-systemd.c
+++ b/src/utils-systemd.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2017 IoT.bzh
+ Copyright (C) 2015-2020 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -34,6 +34,7 @@
   struct sd_bus;
   struct sd_bus_message;
   typedef struct { const char *name; const char *message; } sd_bus_error;
+# define sd_bus_unref(...)                ((void)0)
 # define sd_bus_default_user(p)           ((*(p)=NULL),(-ENOTSUP))
 # define sd_bus_default_system(p)         ((*(p)=NULL),(-ENOTSUP))
 # define sd_bus_call_method(...)          (-ENOTSUP)
@@ -68,12 +69,15 @@ static const char sdbm_load_unit[] = "LoadUnit";
 static const char sdbp_active_state[] = "ActiveState";
 static const char sdbp_exec_main_pid[] = "ExecMainPID";
 
-const char SysD_State_Inactive[] = "inactive";
-const char SysD_State_Activating[] = "activating";
-const char SysD_State_Active[] = "active";
-const char SysD_State_Deactivating[] = "deactivating";
-const char SysD_State_Reloading[] = "reloading";
-const char SysD_State_Failed[] = "failed";
+static const char *sds_state_names[] = {
+	NULL,
+	"inactive",
+	"activating",
+	"active",
+	"deactivating",
+	"reloading",
+	"failed"
+};
 
 static struct sd_bus *sysbus;
 static struct sd_bus *usrbus;
@@ -97,11 +101,12 @@ static int errno2sderr(int rc)
 	return rc < 0 ? -errno : rc;
 }
 
-/* Returns in 'ret' either the system bus (if isuser==0)
+/*
+ * Returns in 'ret' either the system bus (if isuser==0)
  * or the user bus (if isuser!=0).
  * Returns 0 in case of success or -1 in case of error
  */
-static int get_bus(int isuser, struct sd_bus **ret)
+int systemd_get_bus(int isuser, struct sd_bus **ret)
 {
 	int rc;
 	struct sd_bus *bus;
@@ -125,6 +130,14 @@ error:
 	return sderr2errno(rc);
 }
 
+void systemd_set_bus(int isuser, struct sd_bus *bus)
+{
+	struct sd_bus **target = isuser ? &usrbus : &sysbus;
+	if (*target)
+		sd_bus_unref(*target);
+	*target = bus;
+}
+
 #if 0
 /********************************************************************
  * routines for escaping unit names to compute dbus path of units
@@ -247,34 +260,46 @@ static int unit_pid(struct sd_bus *bus, const char *dpath)
 	return rc < 0 ? rc : (int)u;
 }
 
-static const char *unit_state(struct sd_bus *bus, const char *dpath)
+static enum SysD_State unit_state(struct sd_bus *bus, const char *dpath)
 {
 	int rc;
 	char *st;
-	const char *resu;
+	enum SysD_State resu;
 	sd_bus_error err = SD_BUS_ERROR_NULL;
 
+	resu = SysD_State_INVALID;
 	rc = sd_bus_get_property_string(bus, sdb_destination, dpath, sdbi_unit, sdbp_active_state, &err, &st);
 	if (rc < 0) {
 		errno = -rc;
-		resu = NULL;
 	} else {
-		if (!strcmp(st, SysD_State_Active))
-			resu = SysD_State_Active;
-		else if (!strcmp(st, SysD_State_Reloading))
-			resu = SysD_State_Reloading;
-		else if (!strcmp(st, SysD_State_Inactive))
-			resu = SysD_State_Inactive;
-		else if (!strcmp(st, SysD_State_Failed))
-			resu = SysD_State_Failed;
-		else if (!strcmp(st, SysD_State_Activating))
-			resu = SysD_State_Activating;
-		else if (!strcmp(st, SysD_State_Deactivating))
-			resu = SysD_State_Deactivating;
-		else {
-			errno = EBADMSG;
-			resu = NULL;
+		switch (st[0]) {
+		case 'a':
+			if (!strcmp(st, sds_state_names[SysD_State_Active]))
+				resu = SysD_State_Active;
+			else if (!strcmp(st, sds_state_names[SysD_State_Activating]))
+				resu = SysD_State_Activating;
+			break;
+		case 'd':
+			if (!strcmp(st, sds_state_names[SysD_State_Deactivating]))
+				resu = SysD_State_Deactivating;
+			break;
+		case 'f':
+			if (!strcmp(st, sds_state_names[SysD_State_Failed]))
+				resu = SysD_State_Failed;
+			break;
+		case 'i':
+			if (!strcmp(st, sds_state_names[SysD_State_Inactive]))
+				resu = SysD_State_Inactive;
+			break;
+		case 'r':
+			if (!strcmp(st, sds_state_names[SysD_State_Reloading]))
+				resu = SysD_State_Reloading;
+			break;
+		default:
+			break;
 		}
+		if (resu == NULL)
+			errno = EBADMSG;
 		free(st);
 	}
 	return resu;
@@ -401,7 +426,7 @@ int systemd_daemon_reload(int isuser)
 	struct sd_bus_message *ret = NULL;
 	sd_bus_error err = SD_BUS_ERROR_NULL;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	if (rc >= 0) {
 		/* TODO: asynchronous bind... */
 		/* TODO: more diagnostic... */
@@ -483,14 +508,14 @@ char *systemd_unit_dpath_by_name(int isuser, const char *name, int load)
 {
 	struct sd_bus *bus;
 
-	return get_bus(isuser, &bus) < 0 ? NULL : get_unit_dpath(bus, name, load);
+	return systemd_get_bus(isuser, &bus) < 0 ? NULL : get_unit_dpath(bus, name, load);
 }
 
 char *systemd_unit_dpath_by_pid(int isuser, unsigned pid)
 {
 	struct sd_bus *bus;
 
-	return get_bus(isuser, &bus) < 0 ? NULL : get_unit_dpath_by_pid(bus, pid);
+	return systemd_get_bus(isuser, &bus) < 0 ? NULL : get_unit_dpath_by_pid(bus, pid);
 }
 
 int systemd_unit_start_dpath(int isuser, const char *dpath)
@@ -498,7 +523,7 @@ int systemd_unit_start_dpath(int isuser, const char *dpath)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	return rc < 0 ? rc : unit_start(bus, dpath);
 }
 
@@ -507,7 +532,7 @@ int systemd_unit_restart_dpath(int isuser, const char *dpath)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	return rc < 0 ? rc : unit_restart(bus, dpath);
 }
 
@@ -516,7 +541,7 @@ int systemd_unit_stop_dpath(int isuser, const char *dpath)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	return rc < 0 ? rc : unit_stop(bus, dpath);
 }
 
@@ -525,7 +550,7 @@ int systemd_unit_start_name(int isuser, const char *name)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	if (rc >= 0)
 		rc = unit_start_name(bus, name);
 	return rc;
@@ -536,7 +561,7 @@ int systemd_unit_restart_name(int isuser, const char *name)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	if (rc >= 0)
 		rc = unit_restart_name(bus, name);
 	return rc;
@@ -547,7 +572,7 @@ int systemd_unit_stop_name(int isuser, const char *name)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	if (rc >= 0)
 		rc = unit_stop_name(bus, name);
 	return rc;
@@ -559,7 +584,7 @@ int systemd_unit_stop_pid(int isuser, unsigned pid)
 	struct sd_bus *bus;
 	char *dpath;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	if (rc >= 0) {
 		dpath = get_unit_dpath_by_pid(bus, pid);
 		if (!dpath)
@@ -577,16 +602,20 @@ int systemd_unit_pid_of_dpath(int isuser, const char *dpath)
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
+	rc = systemd_get_bus(isuser, &bus);
 	return rc < 0 ? rc : unit_pid(bus, dpath);
 }
 
-const char *systemd_unit_state_of_dpath(int isuser, const char *dpath)
+enum SysD_State systemd_unit_state_of_dpath(int isuser, const char *dpath)
 {
 	int rc;
 	struct sd_bus *bus;
 
-	rc = get_bus(isuser, &bus);
-	return rc < 0 ? NULL : unit_state(bus, dpath);
+	rc = systemd_get_bus(isuser, &bus);
+	return rc < 0 ? SysD_State_INVALID : unit_state(bus, dpath);
 }
 
+const char *systemd_state_name(enum SysD_State state)
+{
+	return sds_state_names[state];
+}