diff options
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/policy-rba.c | 103 | ||||
| -rw-r--r-- | src/rba_adapter.cpp | 83 | ||||
| -rw-r--r-- | src/rba_adapter.h | 36 |
5 files changed, 230 insertions, 2 deletions
diff --git a/meson.build b/meson.build index e0ec2ae..11ee2c1 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('agl-compositor', - 'c', + 'c','cpp', version: '0.0.18', default_options: [ 'warning_level=3', @@ -15,6 +15,8 @@ libweston_version = 'libweston-8' pkgconfig = import('pkgconfig') cc = meson.get_compiler('c') +cxx = meson.get_compiler('cpp') + add_project_arguments( cc.get_supported_arguments([ '-Wno-unused-parameter', @@ -182,6 +184,10 @@ if policy_to_install == 'auto' or policy_to_install == 'allow-all' elif policy_to_install == 'deny-all' srcs_agl_compositor += 'src/policy-deny.c' message('Installing deny all policy') +elif policy_to_install == 'rba' + srcs_agl_compositor += ['src/policy-rba.c', 'src/rba_adapter.cpp'] + deps_libweston += dependency('librba') + message('Installing rba policy') endif diff --git a/meson_options.txt b/meson_options.txt index 72a0365..dd1f3c0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,7 +1,7 @@ option( 'policy-default', type: 'combo', - choices: [ 'auto', 'allow-all', 'deny-all' ], + choices: [ 'auto', 'allow-all', 'deny-all', 'rba' ], value: 'allow-all', description: 'Default policy when no specific policy was set' ) diff --git a/src/policy-rba.c b/src/policy-rba.c new file mode 100644 index 0000000..3ace75c --- /dev/null +++ b/src/policy-rba.c @@ -0,0 +1,103 @@ +/* + * Copyright © 2020 Collabora, Ltd. + * Copyright (c) 2020 DENSO CORPORATION. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "ivi-compositor.h" +#include "policy.h" +#include "rba_adapter.h" + +#include <string.h> + +static bool +ivi_policy_rba_surface_create(struct ivi_surface *surf, void *user_data) +{ + return true; +} + +static bool +ivi_policy_rba_surface_commmited(struct ivi_surface *surf, void *user_data) +{ + return true; +} + +static bool +ivi_policy_rba_surface_activate(struct ivi_surface *surf, void *user_data) +{ + const char *app_id = NULL; + app_id = weston_desktop_surface_get_app_id(surf->dsurface); + if (app_id == NULL) { + weston_log("app_id is NULL, surface activation failed.\n"); + return false; + } + return rba_adapter_arbitrate(app_id); +} + +static bool +ivi_policy_rba_surface_deactivate(struct ivi_surface *surf, void *user_data) +{ + return true; +} + +static bool +ivi_policy_rba_surface_activate_default(struct ivi_surface *surf, void *user_data) +{ + return true; +} + +static bool +ivi_policy_rba_surface_advertise_state_change(struct ivi_surface *surf, void *user_data) +{ + return true; +} + +static bool +ivi_policy_rba_shell_bind_interface(void *client, void *interface) +{ + return rba_adapter_initialize(); +} + +static const struct ivi_policy_api policy_api = { + .struct_size = sizeof(policy_api), + .surface_create = ivi_policy_rba_surface_create, + .surface_commited = ivi_policy_rba_surface_commmited, + .surface_activate = ivi_policy_rba_surface_activate, + .surface_deactivate = ivi_policy_rba_surface_deactivate, + .surface_activate_by_default = ivi_policy_rba_surface_activate_default, + .surface_advertise_state_change = ivi_policy_rba_surface_advertise_state_change, + .shell_bind_interface = ivi_policy_rba_shell_bind_interface, + .policy_rule_allow_to_add = NULL, + .policy_rule_try_event = NULL, +}; + +int +ivi_policy_init(struct ivi_compositor *ivi) +{ + ivi->policy = ivi_policy_create(ivi, &policy_api, ivi); + if (!ivi->policy) + return -1; + + weston_log("Installing 'rba(Rule Base Arbitration)' policy engine\n"); + return 0; +} diff --git a/src/rba_adapter.cpp b/src/rba_adapter.cpp new file mode 100644 index 0000000..120d032 --- /dev/null +++ b/src/rba_adapter.cpp @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2020 DENSO CORPORATION. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include <string> +#include <iostream> +#include <unistd.h> + +#include "rba_adapter.h" +#include <libweston/libweston.h> + +#include "RBAJsonParser.hpp" +#include "RBAArbitrator.hpp" +using namespace std; + +#define JSONFILE "/etc/rba/RBAModel.json" +rba::RBAJsonParser parser; +rba::RBAModel* model = nullptr; +rba::RBAArbitrator* arb = nullptr; +unique_ptr<rba::RBAResult> result = nullptr; + +bool rba_adapter_initialize(void) +{ + if (arb == nullptr) { + if (access(JSONFILE, F_OK) == -1) { + weston_log("Unable to find %s file!!\n", JSONFILE); + return false; + } + model = parser.parse(JSONFILE); + if (model == nullptr) { + weston_log("RBAmodel is NULL\n"); + return false; + } + arb = new rba::RBAArbitrator(); + if (arb == nullptr) { + weston_log("RBAArbitrator is NULL\n"); + return false; + } + arb->setModel(model); + return true; + } + weston_log("RBAArbitrator model is already created\n"); + return true; +} + +bool rba_adapter_arbitrate(const char *app_id) +{ + string id(app_id); + + result = arb->execute(id+ "/NORMAL", true); + + if (result->getStatusType() == rba::RBAResultStatusType::UNKNOWN_CONTENT_STATE) { + weston_log("ERROR: Unknown context app: %s\n", app_id); + return false; + } + if (result->getStatusType() == rba::RBAResultStatusType::FAILED || + result->getStatusType() == rba::RBAResultStatusType::CANCEL_ERROR) { + weston_log("ERROR: execution failed or cancel for app: %s\n", app_id); + return false; + } + return true; +} diff --git a/src/rba_adapter.h b/src/rba_adapter.h new file mode 100644 index 0000000..596d56e --- /dev/null +++ b/src/rba_adapter.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2020 DENSO CORPORATION. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +//This file is helper file to call c++ func + +#ifdef __cplusplus +extern "C" { +#endif + +bool rba_adapter_initialize(void); +bool rba_adapter_arbitrate(const char *app_id); +#ifdef __cplusplus +} +#endif |