X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-urun.c;h=051ce7e19b01354da00339f6da907babe9ccc8f8;hb=f8f2338aba84394e132fff55b6ebdef7d884292b;hp=b6418ac16714b69cf5a91e94add0a8b5bd2e8d42;hpb=dd87fc32c026b4fba9b13ab52f032e3b403b04bf;p=src%2Fapp-framework-main.git diff --git a/src/afm-urun.c b/src/afm-urun.c index b6418ac..051ce7e 100644 --- a/src/afm-urun.c +++ b/src/afm-urun.c @@ -1,5 +1,5 @@ /* - Copyright 2015, 2016, 2017 IoT.bzh + Copyright (C) 2015-2020 IoT.bzh author: José Bollo @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -40,7 +41,7 @@ static const char key_unit_d_path[] = "-unit-dpath-"; /**************** get appli basis *********************/ -static int get_basis(struct json_object *appli, int *isuser, const char **dpath, int load, int uid) +static int get_basis(struct json_object *appli, int *isuser, const char **dpath, int uid) { char userid[40]; char *dp, *arodot, *nun; @@ -76,12 +77,6 @@ static int get_basis(struct json_object *appli, int *isuser, const char **dpath, return 0; } - /* not here. load it? */ - if (!load) { - errno = ENOENT; - goto error; - } - /* get uname */ if (!j_read_string_at(appli, "unit-name", &uname)) { ERROR("'unit-name' missing in appli description %s", json_object_get_string(appli)); @@ -110,9 +105,9 @@ static int get_basis(struct json_object *appli, int *isuser, const char **dpath, /* get dpath of userid */ nun = alloca((size_t)(arodot - uname) + strlen(userid) + strlen(arodot) + 1); stpcpy(stpcpy(stpncpy(nun, uname, (size_t)(arodot - uname)), userid), arodot); - dp = systemd_unit_dpath_by_name(*isuser, uname, 1); + dp = systemd_unit_dpath_by_name(*isuser, nun, 1); if (dp == NULL) { - ERROR("Can't load unit of name %s for %s: %m", uname, uscope); + ERROR("Can't load unit of name %s for %s: %m", nun, uscope); goto error; } /* record the dpath */ @@ -150,17 +145,31 @@ error: return -1; } -static const char *wait_state_stable(int isuser, const char *dpath) +static enum SysD_State wait_state_stable(int isuser, const char *dpath) { - const char *state; - - for (;;) { + int trial; + enum SysD_State state = SysD_State_INVALID; + struct timespec tispec; + const int period_ms = 10; + const int trial_s = 10; + const int trial_count = (trial_s * 1000) / period_ms; + const int period_ns = period_ms * 1000000; + + for (trial = 1 ; trial <= trial_count ; trial++) { state = systemd_unit_state_of_dpath(isuser, dpath); - if (state == NULL || state == SysD_State_Active - || state == SysD_State_Failed) + switch (state) { + case SysD_State_Active: + case SysD_State_Failed: + case SysD_State_Inactive: return state; - /* TODO: sleep */ + default: + tispec.tv_sec = 0; + tispec.tv_nsec = period_ns; + nanosleep(&tispec, NULL); + break; + } } + return state; } /* @@ -172,7 +181,7 @@ static const char *wait_state_stable(int isuser, const char *dpath) * * Returns the created object or NULL in case of error. */ -static json_object *mkstate(const char *id, int runid, int pid, const char *state) +static json_object *mkstate(const char *id, int runid, int pid, enum SysD_State state) { struct json_object *result, *pids; @@ -242,11 +251,12 @@ int afm_urun_start(struct json_object *appli, int uid) */ int afm_urun_once(struct json_object *appli, int uid) { - const char *udpath, *state, *uscope, *uname; + const char *udpath, *uscope, *uname; + enum SysD_State state; int rc, isuser; /* retrieve basis */ - rc = get_basis(appli, &isuser, &udpath, 1, uid); + rc = get_basis(appli, &isuser, &udpath, uid); if (rc < 0) goto error; @@ -255,21 +265,25 @@ int afm_urun_once(struct json_object *appli, int uid) if (rc < 0) { j_read_string_at(appli, "unit-scope", &uscope); j_read_string_at(appli, "unit-name", &uname); - ERROR("can't start %s unit %s", uscope, uname); + ERROR("can't start %s unit %s for uid %d", uscope, uname, uid); goto error; } state = wait_state_stable(isuser, udpath); - if (state == NULL) { + switch (state) { + case SysD_State_Active: + case SysD_State_Inactive: + break; + case SysD_State_Failed: j_read_string_at(appli, "unit-scope", &uscope); j_read_string_at(appli, "unit-name", &uname); - ERROR("can't wait %s unit %s: %m", uscope, uname); + ERROR("start error %s unit %s for uid %d: %s", uscope, uname, uid, + systemd_state_name(state)); goto error; - } - if (state != SysD_State_Active) { + default: j_read_string_at(appli, "unit-scope", &uscope); j_read_string_at(appli, "unit-name", &uname); - ERROR("start error %s unit %s: %s", uscope, uname, state); + ERROR("can't wait %s unit %s for uid %d: %m", uscope, uname, uid); goto error; } @@ -277,10 +291,10 @@ int afm_urun_once(struct json_object *appli, int uid) if (rc < 0) { j_read_string_at(appli, "unit-scope", &uscope); j_read_string_at(appli, "unit-name", &uname); - ERROR("can't getpid of %s unit %s: %m", uscope, uname); + ERROR("can't get pid of %s unit %s for uid %d: %m", uscope, uname, uid); goto error; } - + return rc; error: @@ -332,12 +346,12 @@ int afm_urun_resume(int runid, int uid) * * Returns the list or NULL in case of error. */ -struct json_object *afm_urun_list(struct afm_udb *db, int uid) +struct json_object *afm_urun_list(struct afm_udb *db, int all, int uid) { int i, n, isuser, pid; const char *udpath; const char *id; - const char *state; + enum SysD_State state; struct json_object *desc; struct json_object *appli; struct json_object *apps; @@ -348,11 +362,11 @@ struct json_object *afm_urun_list(struct afm_udb *db, int uid) if (result == NULL) goto error; - apps = afm_udb_applications_private(db, uid); + apps = afm_udb_applications_private(db, all, uid); n = json_object_array_length(apps); for (i = 0 ; i < n ; i++) { appli = json_object_array_get_idx(apps, i); - if (appli && get_basis(appli, &isuser, &udpath, 0, uid) >= 0) { + if (appli && get_basis(appli, &isuser, &udpath, uid) >= 0) { pid = systemd_unit_pid_of_dpath(isuser, udpath); if (pid > 0 && j_read_string_at(appli, "id", &id)) { state = systemd_unit_state_of_dpath(isuser, udpath); @@ -383,7 +397,7 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid, int uid) char *dpath; const char *udpath; const char *id; - const char *state; + enum SysD_State state; struct json_object *appli; struct json_object *apps; struct json_object *result; @@ -399,17 +413,17 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid, int uid) WARNING("searched runid %d not found", runid); } else { /* search in the base */ - apps = afm_udb_applications_private(db, uid); + apps = afm_udb_applications_private(db, 1, uid); n = json_object_array_length(apps); for (i = 0 ; i < n ; i++) { appli = json_object_array_get_idx(apps, i); if (appli - && get_basis(appli, &isuser, &udpath, 0, uid) >= 0 + && get_basis(appli, &isuser, &udpath, uid) >= 0 && !strcmp(dpath, udpath) && j_read_string_at(appli, "id", &id)) { pid = systemd_unit_pid_of_dpath(isuser, udpath); state = systemd_unit_state_of_dpath(isuser, dpath); - if (state == SysD_State_Active) + if (pid > 0 && state == SysD_State_Active) result = mkstate(id, runid, pid, state); goto end; } @@ -418,9 +432,36 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid, int uid) WARNING("searched runid %d of dpath %s isn't an applications", runid, dpath); end: json_object_put(apps); - free(dpath); + free(dpath); } return result; } +/* + * Search the runid, if any, of the application of 'id' for the user 'uid'. + * Returns the pid (a positive not null number) or -1 in case of error. + */ +int afm_urun_search_runid(struct afm_udb *db, const char *id, int uid) +{ + int isuser, pid; + const char *udpath; + struct json_object *appli; + + appli = afm_udb_get_application_private(db, id, uid); + if (!appli) { + NOTICE("Unknown appid %s", id); + errno = ENOENT; + pid = -1; + } else if (get_basis(appli, &isuser, &udpath, uid) < 0) { + pid = -1; + } else { + pid = systemd_unit_pid_of_dpath(isuser, udpath); + if (pid == 0) { + errno = ESRCH; + pid = -1; + } + } + return pid; +} +