X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=2bbb800626e0776ead90ca63364cc537d79e60c4;hb=7af3d3760c29157282348648d893af285b7efb34;hp=71a99eaf99d4adc153aeef3e07ed6609fdf96005;hpb=aa4ba5d283d641da25722af7a966c31d61a9686b;p=src%2Fagl-compositor.git diff --git a/src/main.c b/src/main.c index 71a99ea..2bbb800 100644 --- a/src/main.c +++ b/src/main.c @@ -24,6 +24,7 @@ */ #include "ivi-compositor.h" +#include "policy.h" #include #include @@ -36,17 +37,25 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#ifdef HAVE_BACKEND_X11 +#include +#endif +#include +#include +#include +#include +#include #include "shared/os-compatibility.h" +#include "shared/helpers.h" #include "agl-shell-server-protocol.h" +static int cached_tm_mday = -1; +static struct weston_log_scope *log_scope; + struct ivi_compositor * to_ivi_compositor(struct weston_compositor *ec) { @@ -77,6 +86,20 @@ to_ivi_output(struct weston_output *o) return output; } +static void +ivi_output_configure_app_id(struct ivi_output *ivi_output) +{ + if (ivi_output->config) { + if (ivi_output->app_id != NULL) + return; + + weston_config_section_get_string(ivi_output->config, + "agl-shell-app-id", + &ivi_output->app_id, + NULL); + } +} + static struct ivi_output * ivi_ensure_output(struct ivi_compositor *ivi, char *name, struct weston_config_section *config) @@ -111,18 +134,10 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name, &output->output_destroy); wl_list_insert(&ivi->outputs, &output->link); + ivi_output_configure_app_id(output); return output; } -static void -ivi_output_destroy(struct ivi_output *output) -{ - weston_output_destroy(output->output); - free(output->name); - wl_list_remove(&output->link); - free(output); -} - static int count_heads(struct weston_output *output) { @@ -421,7 +436,6 @@ head_disable(struct ivi_compositor *ivi, struct weston_head *head) weston_head_detach(head); if (count_heads(ivi_output->output) == 0) { - ivi_output_destroy(ivi_output); weston_output_disable(ivi_output->output); } } @@ -546,7 +560,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) struct weston_config_section *section; int use_current_mode = 0; int use_pixman = 0; - int use_shadow; + bool use_shadow; int ret; const struct weston_option options[] = { @@ -592,7 +606,7 @@ windowed_parse_common_options(struct ivi_compositor *ivi, int *argc, char *argv[ bool *use_pixman, bool *fullscreen, int *output_count) { struct weston_config_section *section; - int pixman; + bool pixman; int fs = 0; const struct weston_option options[] = { @@ -719,6 +733,7 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) return windowed_create_outputs(ivi, output_count, "WL", "wayland"); } +#ifdef HAVE_BACKEND_X11 static int load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) { @@ -756,6 +771,13 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) return windowed_create_outputs(ivi, output_count, "X", "screen"); } +#else +static int +load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) +{ + return -1; +} +#endif static int load_backend(struct ivi_compositor *ivi, const char *backend, @@ -795,8 +817,8 @@ compositor_init_config(struct weston_compositor *compositor, struct xkb_rule_names xkb_names; struct weston_config_section *section; int repaint_msec; - int vt_switching; - int require_input; + bool vt_switching; + bool require_input; /* agl-compositor.ini [keyboard] */ section = weston_config_get_section(config, "keyboard", NULL, NULL); @@ -865,7 +887,7 @@ activate_binding(struct weston_seat *seat, struct ivi_surface *surface; surface = to_ivi_surface(main_surface); - if (!surface || surface->role != IVI_SURFACE_ROLE_DESKTOP) + if (!surface) return; weston_seat_set_keyboard_focus(seat, focus); @@ -938,14 +960,6 @@ static bool global_filter(const struct wl_client *client, const struct wl_global *global, void *data) { -#if 0 - struct ivi_compositor *ivi = data; - const struct wl_interface *iface = wl_global_get_interface(global); - - if (iface == &agl_shell_interface) - return client == ivi->shell_client.client; -#endif - return true; } @@ -985,39 +999,46 @@ load_config(struct weston_config **config, bool no_config, } static FILE *logfile; -//static struct weston_log_scope *log_scope; -//static struct weston_log_scope *protocol_scope; -static int -log_timestamp(void) +static char * +log_timestamp(char *buf, size_t len) { - static int cached_tm_mday = -1; - struct timespec ts; - struct tm brokendown_time; - char buf[128]; + struct timeval tv; + struct tm *brokendown_time; + char datestr[128]; + char timestr[128]; - clock_gettime(CLOCK_REALTIME, &ts); - if (!localtime_r(&ts.tv_sec, &brokendown_time)) - return fprintf(logfile, "[(NULL)localtime] "); + gettimeofday(&tv, NULL); - if (brokendown_time.tm_mday != cached_tm_mday) { - strftime(buf, sizeof buf, "%Y-%m-%d %Z", &brokendown_time); - fprintf(logfile, "Date: %s\n", buf); + brokendown_time = localtime(&tv.tv_sec); + if (brokendown_time == NULL) { + snprintf(buf, len, "%s", "[(NULL)localtime] "); + return buf; + } - cached_tm_mday = brokendown_time.tm_mday; + memset(datestr, 0, sizeof(datestr)); + if (brokendown_time->tm_mday != cached_tm_mday) { + strftime(datestr, sizeof(datestr), "Date: %Y-%m-%d %Z\n", + brokendown_time); + cached_tm_mday = brokendown_time->tm_mday; } - strftime(buf, sizeof buf, "%H:%M:%S", &brokendown_time); + strftime(timestr, sizeof(timestr), "%H:%M:%S", brokendown_time); + /* if datestr is empty it prints only timestr*/ + snprintf(buf, len, "%s[%s.%03li]", datestr, + timestr, (tv.tv_usec / 1000)); - return fprintf(logfile, "[%s.%03ld] ", buf, ts.tv_nsec / 1000000); + return buf; } static void custom_handler(const char *fmt, va_list arg) { - log_timestamp(); - fprintf(logfile, "libwayland: "); - vfprintf(logfile, fmt, arg); + char timestr[512]; + + weston_log_scope_printf(log_scope, "%s libwayland: ", + log_timestamp(timestr, sizeof(timestr))); + weston_log_scope_vprintf(log_scope, fmt, arg); } static void @@ -1047,18 +1068,33 @@ log_file_close(void) static int vlog(const char *fmt, va_list ap) { - int l; - - l = log_timestamp(); - l += vfprintf(logfile, fmt, ap); + const char *oom = "Out of memory"; + char timestr[128]; + int len = 0; + char *str; + + if (weston_log_scope_is_enabled(log_scope)) { + int len_va; + char *xlog_timestamp = log_timestamp(timestr, sizeof(timestr)); + len_va = vasprintf(&str, fmt, ap); + if (len_va >= 0) { + len = weston_log_scope_printf(log_scope, "%s %s", + xlog_timestamp, str); + free(str); + } else { + len = weston_log_scope_printf(log_scope, "%s %s", + xlog_timestamp, oom); + } + } - return l; + return len; } + static int vlog_continue(const char *fmt, va_list ap) { - return vfprintf(logfile, fmt, ap); + return weston_log_scope_vprintf(log_scope, fmt, ap); } static int @@ -1109,7 +1145,7 @@ usage(int error_code) int main(int argc, char *argv[]) { struct ivi_compositor ivi = { 0 }; - struct wl_display *display; + struct wl_display *display = NULL; struct wl_event_loop *loop; struct wl_event_source *signals[3] = { 0 }; struct weston_config_section *section; @@ -1121,7 +1157,9 @@ int main(int argc, char *argv[]) int version = 0; int no_config = 0; char *config_file = NULL; - int debug_protocol = 0; + struct weston_log_context *log_ctx = NULL; + struct weston_log_subscriber *logger; + int ret = EXIT_FAILURE; const struct weston_option core_options[] = { { WESTON_OPTION_STRING, "backend", 'B', &backend }, @@ -1131,13 +1169,16 @@ int main(int argc, char *argv[]) { WESTON_OPTION_BOOLEAN, "version", 0, &version }, { WESTON_OPTION_BOOLEAN, "no-config", 0, &no_config }, { WESTON_OPTION_STRING, "config", 'c', &config_file }, - { WESTON_OPTION_BOOLEAN, "debug", 0, &debug_protocol }, }; wl_list_init(&ivi.outputs); wl_list_init(&ivi.surfaces); - wl_list_init(&ivi.shell_clients); wl_list_init(&ivi.pending_surfaces); + wl_list_init(&ivi.popup_pending_apps); + wl_list_init(&ivi.fullscreen_pending_apps); + wl_list_init(&ivi.split_pending_apps); + wl_list_init(&ivi.remote_pending_apps); + wl_list_init(&ivi.desktop_clients); /* Prevent any clients we spawn getting our stdin */ os_fd_set_cloexec(STDIN_FILENO); @@ -1152,9 +1193,22 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } + log_ctx = weston_log_ctx_compositor_create(); + if (!log_ctx) { + fprintf(stderr, "Failed to initialize weston debug framework.\n"); + return ret; + } + + log_scope = weston_compositor_add_log_scope(log_ctx, "log", + "agl-compositor log\n", + NULL, NULL, NULL); + log_file_open(log); weston_log_set_handler(vlog, vlog_continue); + logger = weston_log_subscriber_create_log(logfile); + weston_log_subscribe(log_ctx, logger, "log"); + if (load_config(&ivi.config, no_config, config_file) < 0) goto error_signals; section = weston_config_get_section(ivi.config, "core", NULL, NULL); @@ -1184,25 +1238,12 @@ int main(int argc, char *argv[]) if (!signals[i]) goto error_signals; -#if 0 - log_ctx = weston_log_ctx_compositor_create(); - if (!log_ctx) { - weston_log("Failed to initialize weston debug framework.\n"); - goto error_signals; - } -#endif - - ivi.compositor = weston_compositor_create(display, &ivi); + ivi.compositor = weston_compositor_create(display, log_ctx, &ivi); if (!ivi.compositor) { weston_log("fatal: failed to create compositor.\n"); goto error_signals; } -#if 0 - if (debug_protocol) - weston_compositor_enable_debug_protocol(ivi.compositor); -#endif - if (compositor_init_config(ivi.compositor, ivi.config) < 0) goto error_compositor; @@ -1218,6 +1259,9 @@ int main(int argc, char *argv[]) if (ivi_desktop_init(&ivi) < 0) goto error_compositor; + if (ivi_policy_init(&ivi) < 0) + goto error_compositor; + if (ivi_shell_init(&ivi) < 0) goto error_compositor; @@ -1225,6 +1269,8 @@ int main(int argc, char *argv[]) weston_compositor_flush_heads_changed(ivi.compositor); + ivi_shell_init_black_fs(&ivi); + if (create_listening_socket(display, socket_name) < 0) goto error_compositor; @@ -1234,14 +1280,27 @@ int main(int argc, char *argv[]) ivi_shell_create_global(&ivi); ivi_launch_shell_client(&ivi); + ivi_agl_systemd_notify(&ivi); wl_display_run(display); + ret = ivi.compositor->exit_code; + wl_display_destroy_clients(display); error_compositor: + weston_compositor_tear_down(ivi.compositor); + + weston_compositor_log_scope_destroy(log_scope); + log_scope = NULL; + + weston_log_ctx_compositor_destroy(ivi.compositor); weston_compositor_destroy(ivi.compositor); + weston_log_subscriber_destroy_log(logger); + + ivi_policy_destroy(ivi.policy); + error_signals: for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i) if (signals[i]) @@ -1252,4 +1311,6 @@ error_signals: log_file_close(); if (ivi.config) weston_config_destroy(ivi.config); + + return ret; }