X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-user-daemon.c;h=f9d74e9f65931f6c3675493894e5aa29312a16f5;hb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;hp=d0bef188f4a8ea57fd14176849ce09f41b7453af;hpb=c31038db1cff938d7fa1f12f757c1c57ab51c0bd;p=src%2Fapp-framework-main.git

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index d0bef18..f9d74e9 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -185,7 +185,6 @@ static void on_detail(struct sd_bus_message *smsg, struct json_object *obj, void
 	json_object_put(resp);
 }
 
-
 /*
  * On query "start" from 'smsg' with parameters of 'obj'.
  */
@@ -246,7 +245,7 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
 					&& j_add_string(resp, "uri", uri))
 		jbus_reply_j(smsg, resp);
 	else {
-		afm_run_stop(runid);
+		afm_run_terminate(runid);
 		jbus_reply_error_s(smsg, error_system);
 	}
 	json_object_put(resp);
@@ -254,29 +253,83 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
 }
 
 /*
- * On query "stop" from 'smsg' with parameters of 'obj'.
+ * On query "once" from 'smsg' with parameters of 'obj'.
  */
-static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+static void on_once(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+{
+	const char *appid;
+	struct json_object *appli, *resp;
+	int runid;
+
+	/* get the parameters */
+	if (!j_read_string(obj, &appid) && !j_read_string_at(obj, "id", &appid)) {
+		jbus_reply_error_s(smsg, error_bad_request);
+		return;
+	}
+
+	/* get the application */
+	INFO("method once called for %s", appid);
+	appli = afm_db_get_application(afdb, appid);
+	if (appli == NULL) {
+		jbus_reply_error_s(smsg, error_not_found);
+		return;
+	}
+
+	/* launch the application */
+	runid = afm_run_once(appli);
+	if (runid <= 0) {
+		jbus_reply_error_s(smsg, error_cant_start);
+		return;
+	}
+
+	/* returns the state */
+	resp = afm_run_state(runid);
+	reply(smsg, resp, error_not_found);
+	json_object_put(resp);
+}
+
+/*
+ * On query "pause" from 'smsg' with parameters of 'obj'.
+ */
+static void on_pause(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
 {
 	int runid, status;
-	if (onrunid(smsg, obj, "stop", &runid)) {
-		status = afm_run_stop(runid);
+	if (onrunid(smsg, obj, "pause", &runid)) {
+		status = afm_run_pause(runid);
 		reply_status(smsg, status, error_not_found);
 	}
 }
 
 /*
- * On query "continue" from 'smsg' with parameters of 'obj'.
+ * On query "resume" from 'smsg' with parameters of 'obj'.
  */
-static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+static void on_resume(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
 {
 	int runid, status;
-	if (onrunid(smsg, obj, "continue", &runid)) {
-		status = afm_run_continue(runid);
+	if (onrunid(smsg, obj, "resume", &runid)) {
+		status = afm_run_resume(runid);
 		reply_status(smsg, status, error_not_found);
 	}
 }
 
+/*
+ * On query "stop" from 'smsg' with parameters of 'obj'.
+ */
+static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+{
+	NOTICE("call to obsolete 'stop'");
+	on_pause(smsg, obj, unused);
+}
+
+/*
+ * On query "continue" from 'smsg' with parameters of 'obj'.
+ */
+static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
+{
+	NOTICE("call to obsolete 'continue'");
+	on_resume(smsg, obj, unused);
+}
+
 /*
  * On query "terminate" from 'smsg' with parameters of 'obj'.
  */
@@ -582,18 +635,22 @@ int main(int ac, char **av)
 	if (jbus_add_service_j(user_bus, "runnables", on_runnables, NULL)
 	 || jbus_add_service_j(user_bus, "detail",    on_detail, NULL)
 	 || jbus_add_service_j(user_bus, "start",     on_start, NULL)
+	 || jbus_add_service_j(user_bus, "once",      on_once, NULL)
 	 || jbus_add_service_j(user_bus, "terminate", on_terminate, NULL)
+	 || jbus_add_service_j(user_bus, "pause",     on_pause, NULL)
+	 || jbus_add_service_j(user_bus, "resume",    on_resume, NULL)
 	 || jbus_add_service_j(user_bus, "stop",      on_stop, NULL)
 	 || jbus_add_service_j(user_bus, "continue",  on_continue, NULL)
 	 || jbus_add_service_j(user_bus, "runners",   on_runners, NULL)
 	 || jbus_add_service_j(user_bus, "state",     on_state, NULL)
 #if defined(EXPLICIT_CALL)
 	 || jbus_add_service_s(user_bus, "install",   on_install, NULL)
-	 || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) {
+	 || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)
 #else
 	 || jbus_add_service_s(user_bus, "install",   (void (*)(struct sd_bus_message *, const char *, void *))propagate, "install")
-	 || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall")) {
+	 || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall")
 #endif
+	 ) {
 		ERROR("adding services failed");
 		return 1;
 	}