renaming of verbs

[src/app-framework-main.git] / src / afm-run.c

diff --git a/src/afm-run.c b/src/afm-run.c
index 91e2a0b..131f9cb 100644 (file)
--- a/src/afm-run.c
+++ b/src/afm-run.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -16,6 +16,8 @@
  limitations under the License.
 */
 
+#define _GNU_SOURCE
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
@@ -27,7 +29,14 @@
 #include <limits.h>
 #include <string.h>
 
-#include <json.h>
+#include <linux/xattr.h>
+#if SIMULATE_LIBSMACK
+#include "simulation/smack.h"
+#else
+#include <sys/smack.h>
+#endif
+
+#include <json-c/json.h>
 
 #include "verbose.h"
 #include "utils-dir.h"
@@ -42,7 +51,7 @@
 enum appstate {
        as_starting,    /* start in progress */
        as_running,     /* started and running */
-       as_stopped,     /* stopped */
+       as_paused,      /* paused */
        as_terminating, /* termination in progress */
        as_terminated   /* terminated */
 };
@@ -95,6 +104,7 @@ static int runnerid = 0;
  * home directory of the user.
  */
 static const char fwk_user_app_dir[] = FWK_USER_APP_DIR;
+static const char fwk_user_app_label[] = FWK_USER_APP_DIR_LABEL;
 
 /*
  * Path of the root directory for applications of the
@@ -269,11 +279,11 @@ static void started(int runid)
 {
 }
 
-static void stopped(int runid)
+static void paused(int runid)
 {
 }
 
-static void continued(int runid)
+static void resumed(int runid)
 {
 }
 
@@ -292,7 +302,7 @@ static void removed(int runid)
  * for 'runid' and put the runner's state to 'tostate'
  * in case of success.
  *
- * Only processes in the state 'as_running' or 'as_stopped'
+ * Only processes in the state 'as_running' or 'as_paused'
  * can be signalled.
  *
  * Returns 0 in case of success or -1 in case of error.
@@ -305,7 +315,7 @@ static int killrunner(int runid, int sig, enum appstate tostate)
                errno = ENOENT;
                rc = -1;
        }
-       else if (runner->state != as_running && runner->state != as_stopped) {
+       else if (runner->state != as_running && runner->state != as_paused) {
                errno = EINVAL;
                rc = -1;
        }
@@ -344,13 +354,13 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctxt)
                pgid_remove(runner);
                runner->next_by_pgid = terminated_runners;
                terminated_runners = runner;
-               /* ensures that all the group stops */
+               /* ensures that all the group terminates */
                killpg(runner->pids[0], SIGKILL);
                break;
 
        case CLD_STOPPED:
                /* update the state */
-               runner->state = as_stopped;
+               runner->state = as_paused;
                break;
 
        case CLD_CONTINUED:
@@ -388,18 +398,18 @@ static int fill_launch_desc(struct json_object *appli,
                return -1;
        }
 
-       /* plugins */
+       /* bindings */
        {
                /* TODO */
                static const char *null = NULL;
-               desc->plugins = &null;
+               desc->bindings = &null;
        }
 
        /* finaly */
        desc->home = homeappdir;
        desc->mode = mode;
        return 0;
-};
+}
 
 /**************** report state of runner *********************/
 
@@ -411,7 +421,7 @@ static int fill_launch_desc(struct json_object *appli,
 static json_object *mkstate(struct apprun *runner)
 {
        const char *state;
-       struct json_object *result, *obj;
+       struct json_object *result, *obj, *pids;
        int rc;
 
        /* the structure */
@@ -423,14 +433,31 @@ static json_object *mkstate(struct apprun *runner)
        if (!j_add_integer(result, "runid", runner->runid))
                goto error2;
 
+       /* the pids */
+       switch(runner->state) {
+       case as_starting:
+       case as_running:
+       case as_paused:
+               pids = j_add_new_array(result, "pids");
+               if (!pids)
+                       goto error2;
+               if (!j_add_integer(pids, NULL, runner->pids[0]))
+                       goto error2;
+               if (runner->pids[1] && !j_add_integer(pids, NULL, runner->pids[1]))
+                       goto error2;
+               break;
+       default:
+               break;
+       }
+
        /* the state */
        switch(runner->state) {
        case as_starting:
        case as_running:
                state = "running";
                break;
-       case as_stopped:
-               state = "stopped";
+       case as_paused:
+               state = "paused";
                break;
        default:
                state = "terminated";
@@ -531,9 +558,9 @@ int afm_run_terminate(int runid)
  *
  * Returns 0 in case of success or -1 in case of error
  */
-int afm_run_stop(int runid)
+int afm_run_pause(int runid)
 {
-       return killrunner(runid, SIGSTOP, as_stopped);
+       return killrunner(runid, SIGSTOP, as_paused);
 }
 
 /*
@@ -541,7 +568,7 @@ int afm_run_stop(int runid)
  *
  * Returns 0 in case of success or -1 in case of error
  */
-int afm_run_continue(int runid)
+int afm_run_resume(int runid)
 {
        return killrunner(runid, SIGCONT, as_running);
 }
@@ -613,7 +640,6 @@ struct json_object *afm_run_state(int runid)
 int afm_run_init()
 {
        char buf[2048];
-       char dir[PATH_MAX];
        int rc;
        uid_t me;
        struct passwd passwd, *pw;
@@ -632,25 +658,34 @@ int afm_run_init()
                ERROR("getpwuid_r failed for uid=%d: %m",(int)me);
                return -1;
        }
-       rc = snprintf(dir, sizeof dir, "%s/%s", passwd.pw_dir,
-                                                       fwk_user_app_dir);
-       if (rc >= sizeof dir) {
-               ERROR("buffer overflow in user_app_dir for uid=%d",(int)me);
+       rc = asprintf(&homeappdir, "%s/%s", passwd.pw_dir, fwk_user_app_dir);
+       if (rc < 0) {
+               errno = ENOMEM;
+               ERROR("allocating homeappdir for uid=%d failed", (int)me);
                return -1;
        }
-       rc = create_directory(dir, 0755, 1);
+       rc = create_directory(homeappdir, 0755, 1);
        if (rc && errno != EEXIST) {
-               ERROR("creation of directory %s failed in user_app_dir: %m",
-                                                                       dir);
+               ERROR("creation of directory %s failed: %m", homeappdir);
+               free(homeappdir);
                return -1;
        }
-       homeappdir = strdup(dir);
-       if (homeappdir == NULL) {
-               errno = ENOMEM;
-               ERROR("out of memory in user_app_dir for %s : %m", dir);
+       rc = smack_remove_label_for_path(homeappdir,
+                                               XATTR_NAME_SMACKTRANSMUTE, 0);
+       if (rc < 0 && errno != ENODATA) {
+               ERROR("can't remove smack transmutation of directory %s: %m",
+                                                               homeappdir);
+               free(homeappdir);
+               return -1;
+       }
+       rc = smack_set_label_for_path(homeappdir, XATTR_NAME_SMACK, 0,
+                                                       fwk_user_app_label);
+       if (rc < 0) {
+               ERROR("can't set smack label %s to directory %s: %m",
+                                       fwk_user_app_label, homeappdir);
+               free(homeappdir);
                return -1;
        }
-
        /* install signal handlers */
        siga.sa_flags = SA_SIGINFO | SA_NOCLDWAIT;
        sigemptyset(&siga.sa_mask);