<chapter>
<title>Public API</title>
- <xi:include href="../../../node-startup-controller/boot-manager-dbus-doc-org.genivi.BootManager1.BootManager.xml"/>
+ <xi:include href="../../../node-startup-controller/doc-org.genivi.NodeStartupController1.NodeStartupController.xml"/>
<xi:include href="legacy-app-handler.xml"/>
</chapter>
<chapter id="node-startup-controller-classes">
<title>Main Classes of the Node Startup Controller</title>
<xi:include href="xml/boot-manager-application.xml"/>
- <xi:include href="xml/boot-manager-service.xml"/>
<xi:include href="xml/job-manager.xml"/>
<xi:include href="xml/la-handler-service.xml"/>
<xi:include href="xml/luc-starter.xml"/>
+ <xi:include href="xml/node-startup-controller-service.xml"/>
<xi:include href="xml/target-startup-monitor.xml"/>
</chapter>
boot_manager_PROGRAMS = \
boot-manager
-boot_manager_built_sources = \
- boot-manager-dbus.h \
- boot-manager-dbus.c
+node_startup_controller_built_sources = \
+ node-startup-controller-dbus.h \
+ node-startup-controller-dbus.c
systemd_manager_built_sources = \
systemd-manager-dbus.h \
boot_manager_SOURCES = \
boot-manager-application.c \
boot-manager-application.h \
- boot-manager-service.c \
- boot-manager-service.h \
glib-extensions.c \
glib-extensions.h \
job-manager.c \
la-handler-service.h \
luc-starter.c \
luc-starter.h \
+ node-startup-controller-service.c \
+ node-startup-controller-service.h \
target-startup-monitor.c \
target-startup-monitor.h \
main.c \
- $(boot_manager_built_sources) \
+ $(node_startup_controller_built_sources) \
$(systemd_manager_built_sources) \
$(systemd_unit_built_sources)
CLEANFILES = \
$(dbus_service_DATA) \
$(systemd_service_DATA) \
- boot-manager-dbus-doc-*.xml
+ node-startup-controller-dbus-doc-*.xml
EXTRA_DIST = \
- boot-manager-dbus.xml \
+ node-startup-controller-dbus.xml \
systemd-manager-dbus.xml \
$(dbus_service_in_files) \
$(systemd_service_in_files)
DISTCLEANFILES = \
- $(boot_manager_built_sources) \
+ $(node_startup_controller_built_sources) \
$(systemd_manager_built_sources) \
$(systemd_unit_built_sources)
BUILT_SOURCES = \
- $(boot_manager_built_sources) \
+ $(node_startup_controller_built_sources) \
$(systemd_manager_built_sources) \
$(systemd_unit_built_sources)
-$(boot_manager_built_sources): boot-manager-dbus.xml Makefile
+$(node_startup_controller_built_sources): node-startup-controller-dbus.xml Makefile
$(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix org.genivi \
--c-namespace "" \
- --generate-c-code boot-manager-dbus \
- --generate-docbook boot-manager-dbus-doc \
- --annotate org.genivi.BootManager1.BootManager org.gtk.GDBus.C.Name \
- Boot_Manager $<
+ --generate-c-code node-startup-controller-dbus \
+ --generate-docbook doc \
+ --annotate \
+ org.genivi.NodeStartupController1.NodeStartupController \
+ org.gtk.GDBus.C.Name Node_Startup_Controller $<
$(systemd_manager_built_sources): systemd-manager-dbus.xml Makefile
$(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix org.freedesktop.systemd1 \
--c-namespace "" \
--generate-c-code systemd-manager-dbus \
- --annotate org.freedesktop.systemd1.Manager org.gtk.GDBus.C.Name \
- SystemdManager $<
+ --annotate org.freedesktop.systemd1.Manager \
+ org.gtk.GDBus.C.Name SystemdManager $<
$(systemd_unit_built_sources): systemd-unit-dbus.xml Makefile
$(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix org.freedesktop.systemd1 \
--c-namespace "" \
--generate-c-code systemd-unit-dbus \
- --annotate org.freedesktop.systemd1.Unit org.gtk.GDBus.C.Name \
- SystemdUnit $<
+ --annotate org.freedesktop.systemd1.Unit \
+ org.gtk.GDBus.C.Name SystemdUnit $<
#include <common/watchdog-client.h>
#include <node-startup-controller/boot-manager-application.h>
-#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/node-startup-controller-service.h>
#include <node-startup-controller/job-manager.h>
#include <node-startup-controller/la-handler-service.h>
#include <node-startup-controller/luc-starter.h>
PROP_0,
PROP_CONNECTION,
PROP_JOB_MANAGER,
- PROP_BOOT_MANAGER_SERVICE,
PROP_LUC_STARTER,
PROP_LA_HANDLER,
PROP_MAIN_LOOP,
+ PROP_NODE_STARTUP_CONTROLLER,
};
struct _BootManagerApplication
{
- GObject __parent__;
+ GObject __parent__;
/* the connection to D-Bus */
- GDBusConnection *connection;
+ GDBusConnection *connection;
/* systemd watchdog client that repeatedly asks systemd to update
* the watchdog timestamp */
- WatchdogClient *watchdog_client;
+ WatchdogClient *watchdog_client;
/* manager of unit start and stop operations */
- JobManager *job_manager;
+ JobManager *job_manager;
- /* boot manager service */
- BootManagerService *boot_manager_service;
+ /* implementation of the node startup controller service */
+ NodeStartupControllerService *node_startup_controller;
/* LUC starter to restore the LUC */
- LUCStarter *luc_starter;
+ LUCStarter *luc_starter;
/* Legacy App Handler to register apps with the Node State Manager */
- LAHandlerService *la_handler;
+ LAHandlerService *la_handler;
/* the application's main loop */
- GMainLoop *main_loop;
+ GMainLoop *main_loop;
/* identifier for the registered bus name */
- guint bus_name_id;
+ guint bus_name_id;
/* shutdown client for the boot manager itself */
- ShutdownClient *client;
+ ShutdownClient *client;
};
G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
- PROP_BOOT_MANAGER_SERVICE,
- g_param_spec_object ("boot-manager-service",
- "boot-manager-service",
- "boot-manager-service",
- BOOT_MANAGER_TYPE_SERVICE,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
PROP_LUC_STARTER,
g_param_spec_object ("luc-starter",
"luc-starter",
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class,
+ PROP_NODE_STARTUP_CONTROLLER,
+ g_param_spec_object ("node-startup-controller",
+ "node-startup-controller",
+ "node-startup-controller",
+ TYPE_NODE_STARTUP_CONTROLLER_SERVICE,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
}
if (application->watchdog_client != NULL)
g_object_unref (application->watchdog_client);
- /* release the boot manager */
- g_object_unref (application->boot_manager_service);
+ /* release the node startup controller */
+ g_object_unref (application->node_startup_controller);
/* release the LUC starter */
g_object_unref (application->luc_starter);
/* instantiate the LUC starter */
application->luc_starter = luc_starter_new (application->job_manager,
- application->boot_manager_service);
+ application->node_startup_controller);
/* be notified when LUC groups have started so that we can hand
* control over to systemd again */
case PROP_JOB_MANAGER:
g_value_set_object (value, application->job_manager);
break;
- case PROP_BOOT_MANAGER_SERVICE:
- g_value_set_object (value, application->boot_manager_service);
+ case PROP_NODE_STARTUP_CONTROLLER:
+ g_value_set_object (value, application->node_startup_controller);
case PROP_LA_HANDLER:
g_value_set_object (value, application->la_handler);
break;
case PROP_JOB_MANAGER:
application->job_manager = g_value_dup_object (value);
break;
- case PROP_BOOT_MANAGER_SERVICE:
- application->boot_manager_service = g_value_dup_object (value);
+ case PROP_NODE_STARTUP_CONTROLLER:
+ application->node_startup_controller = g_value_dup_object (value);
break;
case PROP_LA_HANDLER:
application->la_handler = g_value_dup_object (value);
BootManagerApplication *
-boot_manager_application_new (GMainLoop *main_loop,
- GDBusConnection *connection,
- JobManager *job_manager,
- LAHandlerService *la_handler,
- BootManagerService *boot_manager_service)
+boot_manager_application_new (GMainLoop *main_loop,
+ GDBusConnection *connection,
+ JobManager *job_manager,
+ LAHandlerService *la_handler,
+ NodeStartupControllerService *node_startup_controller)
{
g_return_val_if_fail (main_loop != NULL, NULL);
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (IS_JOB_MANAGER (job_manager), NULL);
g_return_val_if_fail (LA_HANDLER_IS_SERVICE (la_handler), NULL);
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (boot_manager_service), NULL);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (node_startup_controller), NULL);
return g_object_new (BOOT_MANAGER_TYPE_APPLICATION,
"connection", connection,
- "boot-manager-service", boot_manager_service,
+ "node-startup-controller", node_startup_controller,
"job-manager", job_manager,
"la-handler", la_handler,
"main-loop", main_loop,
#include <gio/gio.h>
-#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/node-startup-controller-service.h>
#include <node-startup-controller/job-manager.h>
#include <node-startup-controller/la-handler-service.h>
GType boot_manager_application_get_type (void) G_GNUC_CONST;
-BootManagerApplication *boot_manager_application_new (GMainLoop *main_loop,
- GDBusConnection *connection,
- JobManager *job_manager,
- LAHandlerService *la_handler,
- BootManagerService *boot_manager_service) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+BootManagerApplication *boot_manager_application_new (GMainLoop *main_loop,
+ GDBusConnection *connection,
+ JobManager *job_manager,
+ LAHandlerService *la_handler,
+ NodeStartupControllerService *node_startup_controller) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS
+++ /dev/null
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/* -
- * Copyright (c) 2012 GENIVI.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef __BOOT_MANAGER_SERVICE_H__
-#define __BOOT_MANAGER_SERVICE_H__
-
-#include <gio/gio.h>
-
-#include <node-startup-controller/systemd-manager-dbus.h>
-
-G_BEGIN_DECLS
-
-#define BOOT_MANAGER_TYPE_SERVICE (boot_manager_service_get_type ())
-#define BOOT_MANAGER_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BOOT_MANAGER_TYPE_SERVICE, BootManagerService))
-#define BOOT_MANAGER_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BOOT_MANAGER_TYPE_SERVICE, BootManagerServiceClass))
-#define BOOT_MANAGER_IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BOOT_MANAGER_TYPE_SERVICE))
-#define BOOT_MANAGER_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BOOT_MANAGER_TYPE_SERVICE))
-#define BOOT_MANAGER_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BOOT_MANAGER_TYPE_SERVICE, BootManagerServiceClass))
-
-typedef struct _BootManagerServiceClass BootManagerServiceClass;
-typedef struct _BootManagerService BootManagerService;
-
-
-
-GType boot_manager_service_get_type (void) G_GNUC_CONST;
-
-BootManagerService *boot_manager_service_new (GDBusConnection *connection) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gboolean boot_manager_service_start_up (BootManagerService *service,
- GError **error);
-GVariant *boot_manager_service_read_luc (BootManagerService *service,
- GError **error);
-void boot_manager_service_write_luc (BootManagerService *service,
- GError **error);
-
-
-G_END_DECLS
-
-#endif /* !__BOOT_MANAGER_SERVICE_H__ */
-
#include <common/nsm-lifecycle-control-dbus.h>
-#include <node-startup-controller/boot-manager-service.h>
#include <node-startup-controller/job-manager.h>
#include <node-startup-controller/luc-starter.h>
+#include <node-startup-controller/node-startup-controller-service.h>
{
PROP_0,
PROP_JOB_MANAGER,
- PROP_BOOT_MANAGER_SERVICE,
+ PROP_NODE_STARTUP_CONTROLLER,
};
struct _LUCStarter
{
- GObject __parent__;
+ GObject __parent__;
- JobManager *job_manager;
- BootManagerService *boot_manager_service;
- NSMLifecycleControl *nsm_lifecycle_control;
+ JobManager *job_manager;
+ NodeStartupControllerService *node_startup_controller;
+ NSMLifecycleControl *nsm_lifecycle_control;
- GArray *prioritised_types;
+ GArray *prioritised_types;
- GArray *start_order;
- GHashTable *start_groups;
+ GArray *start_order;
+ GHashTable *start_groups;
- GHashTable *cancellables;
+ GHashTable *cancellables;
};
G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
- PROP_BOOT_MANAGER_SERVICE,
- g_param_spec_object ("boot-manager-service",
- "boot-manager-service",
- "boot-manager-service",
- BOOT_MANAGER_TYPE_SERVICE,
+ PROP_NODE_STARTUP_CONTROLLER,
+ g_param_spec_object ("node-startup-controller",
+ "node-startup-controller",
+ "node-startup-controller",
+ TYPE_NODE_STARTUP_CONTROLLER_SERVICE,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
/* release the job manager */
g_object_unref (starter->job_manager);
- /* release the boot manager service */
- g_object_unref (starter->boot_manager_service);
+ /* release the node startup controller service */
+ g_object_unref (starter->node_startup_controller);
(*G_OBJECT_CLASS (luc_starter_parent_class)->finalize) (object);
}
case PROP_JOB_MANAGER:
g_value_set_object (value, starter->job_manager);
break;
- case PROP_BOOT_MANAGER_SERVICE:
- g_value_set_object (value, starter->boot_manager_service);
+ case PROP_NODE_STARTUP_CONTROLLER:
+ g_value_set_object (value, starter->node_startup_controller);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
case PROP_JOB_MANAGER:
starter->job_manager = g_value_dup_object (value);
break;
- case PROP_BOOT_MANAGER_SERVICE:
- starter->boot_manager_service = g_value_dup_object (value);
+ case PROP_NODE_STARTUP_CONTROLLER:
+ starter->node_startup_controller = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
g_hash_table_remove_all (starter->cancellables);
/* get the current last user context */
- context = boot_manager_service_read_luc (starter->boot_manager_service, &error);
+ context = node_startup_controller_service_read_luc (starter->node_startup_controller,
+ &error);
if (error != NULL)
{
if (error->code == G_IO_ERROR_NOT_FOUND)
LUCStarter *
-luc_starter_new (JobManager *job_manager,
- BootManagerService *boot_manager_service)
+luc_starter_new (JobManager *job_manager,
+ NodeStartupControllerService *node_startup_controller)
{
g_return_val_if_fail (IS_JOB_MANAGER (job_manager), NULL);
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (boot_manager_service), NULL);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (node_startup_controller), NULL);
return g_object_new (TYPE_LUC_STARTER,
"job-manager", job_manager,
- "boot-manager-service", boot_manager_service,
+ "node-startup-controller-service", node_startup_controller,
NULL);
}
#ifndef __LUC_STARTER_H__
#define __LUC_STARTER_H__
-#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/node-startup-controller-service.h>
#include <node-startup-controller/job-manager.h>
G_BEGIN_DECLS
GType luc_starter_get_type (void) G_GNUC_CONST;
-LUCStarter *luc_starter_new (JobManager *job_manager,
- BootManagerService *boot_manager_service) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-void luc_starter_start_groups (LUCStarter *starter);
-void luc_starter_cancel (LUCStarter *starter);
+LUCStarter *luc_starter_new (JobManager *job_manager,
+ NodeStartupControllerService *node_startup_controller) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+void luc_starter_start_groups (LUCStarter *starter);
+void luc_starter_cancel (LUCStarter *starter);
G_END_DECLS
#include <dlt/dlt.h>
#include <node-startup-controller/boot-manager-application.h>
-#include <node-startup-controller/boot-manager-dbus.h>
-#include <node-startup-controller/boot-manager-service.h>
#include <node-startup-controller/la-handler-service.h>
+#include <node-startup-controller/node-startup-controller-dbus.h>
+#include <node-startup-controller/node-startup-controller-service.h>
#include <node-startup-controller/systemd-manager-dbus.h>
#include <node-startup-controller/target-startup-monitor.h>
main (int argc,
char **argv)
{
- BootManagerApplication *application;
- TargetStartupMonitor *target_startup_monitor;
- BootManagerService *boot_manager_service;
- LAHandlerService *la_handler_service;
- GDBusConnection *connection;
- SystemdManager *systemd_manager;
- JobManager *job_manager;
- GMainLoop *main_loop;
- GError *error = NULL;
- gchar *msg;
+ NodeStartupControllerService *node_startup_controller;
+ BootManagerApplication *application;
+ TargetStartupMonitor *target_startup_monitor;
+ LAHandlerService *la_handler_service;
+ GDBusConnection *connection;
+ SystemdManager *systemd_manager;
+ JobManager *job_manager;
+ GMainLoop *main_loop;
+ GError *error = NULL;
+ gchar *msg;
/* register the application and context in DLT */
DLT_REGISTER_APP ("BMGR", "GENIVI Boot Manager");
}
/* instantiate the boot manager service implementation */
- boot_manager_service = boot_manager_service_new (connection);
+ node_startup_controller = node_startup_controller_service_new (connection);
/* attempt to start the boot manager service */
- if (!boot_manager_service_start_up (boot_manager_service, &error))
+ if (!node_startup_controller_service_start_up (node_startup_controller, &error))
{
msg = g_strdup_printf ("Failed to start the boot manager service: %s",
error->message);
/* clean up */
g_error_free (error);
- g_object_unref (boot_manager_service);
+ g_object_unref (node_startup_controller);
g_object_unref (systemd_manager);
g_object_unref (connection);
g_clear_error (&error);
g_object_unref (la_handler_service);
g_object_unref (job_manager);
- g_object_unref (boot_manager_service);
+ g_object_unref (node_startup_controller);
g_object_unref (systemd_manager);
g_object_unref (connection);
target_startup_monitor = target_startup_monitor_new (systemd_manager);
/* create and run the main application */
- application = boot_manager_application_new (main_loop, connection, job_manager,
- la_handler_service, boot_manager_service);
+ application = boot_manager_application_new (main_loop, connection,
+ job_manager, la_handler_service,
+ node_startup_controller);
/* run the main loop */
g_main_loop_run (main_loop);
g_object_unref (target_startup_monitor);
g_object_unref (systemd_manager);
g_object_unref (job_manager);
- g_object_unref (boot_manager_service);
+ g_object_unref (node_startup_controller);
g_object_unref (connection);
return EXIT_SUCCESS;
<?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/genivi/BootManager1/BootManager">
+<node name="/org/genivi/NodeStartupController1/NodeStartupController">
<!--
- org.genivi.BootManager1.BootManager:
+ org.genivi.NodeStartupController1.NodeStartupController:
@short_description: Interface for managing the GENIVI LUC (Last User Context)
- The GENIVI Boot Manager remembers applications that were used in the last
- session of a user. It is used in order to restore these applications on
- the next start-up.
+ The GENIVI Node Startup Controller remembers applications that were used
+ in the last session of a user. It is used in order to restore these
+ applications on the next start-up.
- The Boot Manager is a passive component in the sense that it does not
- remember applications on its own; instead, applications need to register
- and deregister themselves proactively.
+ The Node Startup Controller is a passive component in the sense that it
+ does not remember applications on its own; instead, applications need to
+ register and deregister themselves proactively.
Applications can be registered for different LUC types, the standard ones
being "foreground", "background" and "audible".
-->
- <interface name="org.genivi.BootManager1.BootManager">
+ <interface name="org.genivi.NodeStartupController1.NodeStartupController">
<!--
BeginLUCRegistration:
<!--
FinishLUCRegistration:
- Finishes the LUC registration sequence and atomically replaces the previous LUC.
+ Finishes the LUC registration sequence and atomically replaces the
+ previous LUC.
-->
<method name="FinishLUCRegistration">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
#include <dlt/dlt.h>
#include <node-startup-controller/glib-extensions.h>
-#include <node-startup-controller/boot-manager-dbus.h>
-#include <node-startup-controller/boot-manager-service.h>
+#include <node-startup-controller/node-startup-controller-dbus.h>
+#include <node-startup-controller/node-startup-controller-service.h>
-static void boot_manager_service_finalize (GObject *object);
-static void boot_manager_service_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void boot_manager_service_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static gboolean boot_manager_service_handle_begin_luc_registration (BootManager *interface,
- GDBusMethodInvocation *invocation,
- BootManagerService *service);
-static gboolean boot_manager_service_handle_finish_luc_registration (BootManager *interface,
- GDBusMethodInvocation *invocation,
- BootManagerService *service);
-static gboolean boot_manager_service_handle_register_with_luc (BootManager *interface,
- GDBusMethodInvocation *invocation,
- GVariant *apps,
- BootManagerService *service);
+static void node_startup_controller_service_finalize (GObject *object);
+static void node_startup_controller_service_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void node_startup_controller_service_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static gboolean node_startup_controller_service_handle_begin_luc_registration (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ NodeStartupControllerService *service);
+static gboolean node_startup_controller_service_handle_finish_luc_registration (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ NodeStartupControllerService *service);
+static gboolean node_startup_controller_service_handle_register_with_luc (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ GVariant *apps,
+ NodeStartupControllerService *service);
-struct _BootManagerServiceClass
+struct _NodeStartupControllerServiceClass
{
GObjectClass __parent__;
};
-struct _BootManagerService
+struct _NodeStartupControllerService
{
- GObject __parent__;
+ GObject __parent__;
- GDBusConnection *connection;
- BootManager *interface;
+ GDBusConnection *connection;
+ NodeStartupController *interface;
- GVariant *current_user_context;
- gboolean started_registration;
+ GVariant *current_user_context;
+ gboolean started_registration;
};
-G_DEFINE_TYPE (BootManagerService, boot_manager_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE (NodeStartupControllerService,
+ node_startup_controller_service,
+ G_TYPE_OBJECT);
static void
-boot_manager_service_class_init (BootManagerServiceClass *klass)
+node_startup_controller_service_class_init (NodeStartupControllerServiceClass *klass)
{
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = boot_manager_service_finalize;
- gobject_class->get_property = boot_manager_service_get_property;
- gobject_class->set_property = boot_manager_service_set_property;
+ gobject_class->finalize = node_startup_controller_service_finalize;
+ gobject_class->get_property = node_startup_controller_service_get_property;
+ gobject_class->set_property = node_startup_controller_service_set_property;
g_object_class_install_property (gobject_class,
PROP_CONNECTION,
static void
-boot_manager_service_init (BootManagerService *service)
+node_startup_controller_service_init (NodeStartupControllerService *service)
{
- service->interface = boot_manager_skeleton_new ();
+ service->interface = node_startup_controller_skeleton_new ();
/* initially, no registration is assumed to have been started */
service->started_registration = FALSE;
/* implement the RegisterWithLUC() handler */
g_signal_connect (service->interface, "handle-register-with-luc",
- G_CALLBACK (boot_manager_service_handle_register_with_luc),
+ G_CALLBACK (node_startup_controller_service_handle_register_with_luc),
service);
/* implement the BeginLUCRegistration() handler */
g_signal_connect (service->interface, "handle-begin-lucregistration",
- G_CALLBACK (boot_manager_service_handle_begin_luc_registration),
+ G_CALLBACK (node_startup_controller_service_handle_begin_luc_registration),
service);
/* implement the FinishLUCRegistration() handler */
g_signal_connect (service->interface, "handle-finish-lucregistration",
- G_CALLBACK (boot_manager_service_handle_finish_luc_registration),
+ G_CALLBACK (node_startup_controller_service_handle_finish_luc_registration),
service);
}
static void
-boot_manager_service_finalize (GObject *object)
+node_startup_controller_service_finalize (GObject *object)
{
- BootManagerService *service = BOOT_MANAGER_SERVICE (object);
+ NodeStartupControllerService *service = NODE_STARTUP_CONTROLLER_SERVICE (object);
/* release the D-Bus connection object */
g_object_unref (service->connection);
if (service->current_user_context != NULL)
g_variant_unref (service->current_user_context);
- (*G_OBJECT_CLASS (boot_manager_service_parent_class)->finalize) (object);
+ (*G_OBJECT_CLASS (node_startup_controller_service_parent_class)->finalize) (object);
}
static void
-boot_manager_service_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+node_startup_controller_service_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- BootManagerService *service = BOOT_MANAGER_SERVICE (object);
+ NodeStartupControllerService *service = NODE_STARTUP_CONTROLLER_SERVICE (object);
switch (prop_id)
{
static void
-boot_manager_service_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+node_startup_controller_service_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- BootManagerService *service = BOOT_MANAGER_SERVICE (object);
+ NodeStartupControllerService *service = NODE_STARTUP_CONTROLLER_SERVICE (object);
switch (prop_id)
{
static gboolean
-boot_manager_service_handle_begin_luc_registration (BootManager *interface,
- GDBusMethodInvocation *invocation,
- BootManagerService *service)
+node_startup_controller_service_handle_begin_luc_registration (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ NodeStartupControllerService *service)
{
GVariantBuilder builder;
- g_return_val_if_fail (IS_BOOT_MANAGER (interface), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER (interface), FALSE);
g_return_val_if_fail (G_IS_DBUS_METHOD_INVOCATION (invocation), FALSE);
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (service), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service), FALSE);
/* mark the last user context registration as started */
service->started_registration = TRUE;
static gboolean
-boot_manager_service_handle_finish_luc_registration (BootManager *interface,
- GDBusMethodInvocation *invocation,
- BootManagerService *service)
+node_startup_controller_service_handle_finish_luc_registration (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ NodeStartupControllerService *service)
{
GError *error = NULL;
gchar *log_text;
- g_return_val_if_fail (IS_BOOT_MANAGER (interface), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER (interface), FALSE);
g_return_val_if_fail (G_IS_DBUS_METHOD_INVOCATION (invocation), FALSE);
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (service), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service), FALSE);
/* check if last user context registration started */
if (!service->started_registration)
}
/* write the last user context in a file */
- boot_manager_service_write_luc (service, &error);
+ node_startup_controller_service_write_luc (service, &error);
if (error != NULL)
{
log_text = g_strdup_printf ("Failed to finish LUC registration: %s", error->message);
static gboolean
-boot_manager_service_handle_register_with_luc (BootManager *interface,
- GDBusMethodInvocation *invocation,
- GVariant *apps,
- BootManagerService *service)
+node_startup_controller_service_handle_register_with_luc (NodeStartupController *interface,
+ GDBusMethodInvocation *invocation,
+ GVariant *apps,
+ NodeStartupControllerService *service)
{
GVariantBuilder dict_builder;
GHashTableIter hiter;
guint n;
gint luc_type;
- g_return_val_if_fail (IS_BOOT_MANAGER (interface), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER (interface), FALSE);
g_return_val_if_fail (G_IS_DBUS_METHOD_INVOCATION (invocation), FALSE);
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (service), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service), FALSE);
/* check if last user context registration started */
if (!service->started_registration)
-BootManagerService *
-boot_manager_service_new (GDBusConnection *connection)
+NodeStartupControllerService *
+node_startup_controller_service_new (GDBusConnection *connection)
{
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
- return g_object_new (BOOT_MANAGER_TYPE_SERVICE,
+ return g_object_new (TYPE_NODE_STARTUP_CONTROLLER_SERVICE,
"connection", connection,
NULL);
}
gboolean
-boot_manager_service_start_up (BootManagerService *service,
- GError **error)
+node_startup_controller_service_start_up (NodeStartupControllerService *service,
+ GError **error)
{
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (service), FALSE);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* announce the org.genivi.BootManager1.BootManager service on the bus */
+ /* announce the org.genivi.NodeStartupController1.NodeStartupController service on the bus */
return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (service->interface),
service->connection,
- "/org/genivi/BootManager1/BootManager",
+ "/org/genivi/NodeStartupController1/NodeStartupController",
error);
}
GVariant *
-boot_manager_service_read_luc (BootManagerService *service,
- GError **error)
+node_startup_controller_service_read_luc (NodeStartupControllerService *service,
+ GError **error)
{
const gchar *luc_path;
GVariant *context;
char *data;
gsize data_len;
- g_return_val_if_fail (BOOT_MANAGER_IS_SERVICE (service), NULL);
+ g_return_val_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service), NULL);
g_return_val_if_fail ((error == NULL || *error == NULL), NULL);
/* check which configuration file to use; the LUC_PATH environment variable
void
-boot_manager_service_write_luc (BootManagerService *service,
- GError **error)
+node_startup_controller_service_write_luc (NodeStartupControllerService *service,
+ GError **error)
{
const gchar *luc_path;
GError *err = NULL;
GFile *luc_file;
GFile *luc_dir;
- g_return_if_fail (BOOT_MANAGER_IS_SERVICE (service));
+ g_return_if_fail (IS_NODE_STARTUP_CONTROLLER_SERVICE (service));
g_return_if_fail (error == NULL || *error == NULL);
/* check which configuration file to use; the LUC_PATH environment variable
--- /dev/null
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/* -
+ * Copyright (c) 2012 GENIVI.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __NODE_STARTUP_CONTROLLER_SERVICE_H__
+#define __NODE_STARTUP_CONTROLLER_SERVICE_H__
+
+#include <gio/gio.h>
+
+#include <node-startup-controller/systemd-manager-dbus.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_NODE_STARTUP_CONTROLLER_SERVICE (node_startup_controller_service_get_type ())
+#define NODE_STARTUP_CONTROLLER_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NODE_STARTUP_CONTROLLER_SERVICE, NodeStartupControllerService))
+#define NODE_STARTUP_CONTROLLER_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NODE_STARTUP_CONTROLLER_SERVICE, NodeStartupControllerServiceClass))
+#define IS_NODE_STARTUP_CONTROLLER_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NODE_STARTUP_CONTROLLER_SERVICE))
+#define IS_NODE_STARTUP_CONTROLLER_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NODE_STARTUP_CONTROLLER_SERVICE))
+#define NODE_STARTUP_CONTROLLER_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NODE_STARTUP_CONTROLLER_SERVICE, NodeStartupControllerServiceClass))
+
+typedef struct _NodeStartupControllerServiceClass NodeStartupControllerServiceClass;
+typedef struct _NodeStartupControllerService NodeStartupControllerService;
+
+
+
+GType node_startup_controller_service_get_type (void) G_GNUC_CONST;
+
+NodeStartupControllerService *node_startup_controller_service_new (GDBusConnection *connection) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gboolean node_startup_controller_service_start_up (NodeStartupControllerService *service,
+ GError **error);
+GVariant *node_startup_controller_service_read_luc (NodeStartupControllerService *service,
+ GError **error);
+void node_startup_controller_service_write_luc (NodeStartupControllerService *service,
+ GError **error);
+
+
+G_END_DECLS
+
+#endif /* !__NODE_STARTUP_CONTROLLER_SERVICE_H__ */
+
#include <common/nsm-enum-types.h>
#include <common/nsm-lifecycle-control-dbus.h>
-#include <node-startup-controller/boot-manager-dbus.h>
#include <node-startup-controller/target-startup-monitor.h>
#include <node-startup-controller/systemd-unit-dbus.h>
/* set the initial state to base running, which means that
* the mandatory.target has been started (this is done before the
- * boot manager itself is brought up) */
+ * node startup controller itself is brought up) */
target_startup_monitor_set_node_state (monitor, NSM_NODE_STATE_BASE_RUNNING);
/* create the table of targets and their node states */
projects / profile / ivi / node-startup-controller.git / commitdiff