X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=cad8a42703f1a7bac0f88298a138e012af8f6b47;hb=f235042e4cd88197ade414795382ba227f924332;hp=df97b2482dd4256581d8c81ecc32b7eb07aaa9cf;hpb=5ce0b5d5200f8d5e21e15981b0179fd429ee836d;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index df97b24..cad8a42 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,6 +52,9 @@
 
 #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)
 {
@@ -981,36 +984,45 @@ load_config(struct weston_config **config, bool no_config,
 
 static FILE *logfile;
 
-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
@@ -1040,18 +1052,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
@@ -1099,20 +1126,6 @@ usage(int error_code)
 	exit(error_code);
 }
 
-static void
-ivi_compositor_get_quirks(struct ivi_compositor *ivi)
-{
-	struct weston_config_section *section;
-
-	if (!ivi->config)
-		return;
-
-	section = weston_config_get_section(ivi->config, "shell", NULL, NULL);
-	weston_config_section_get_bool(section, "activate-by-default",
-			&ivi->quirks.activate_apps_by_default, 0);
-
-}
-
 int main(int argc, char *argv[])
 {
 	struct ivi_compositor ivi = { 0 };
@@ -1128,10 +1141,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_scope *log_scope;
 	struct weston_log_subscriber *logger;
+	int ret = EXIT_FAILURE;
 
 	const struct weston_option core_options[] = {
 		{ WESTON_OPTION_STRING, "backend", 'B', &backend },
@@ -1141,13 +1153,15 @@ 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.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 */
@@ -1166,7 +1180,7 @@ int main(int argc, char *argv[])
 	log_ctx = weston_log_ctx_compositor_create();
 	if (!log_ctx) {
 		fprintf(stderr, "Failed to initialize weston debug framework.\n");
-		return EXIT_FAILURE;
+		return ret;
 	}
 
         log_scope = weston_compositor_add_log_scope(log_ctx, "log",
@@ -1177,6 +1191,7 @@ int main(int argc, char *argv[])
 	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;
@@ -1188,8 +1203,6 @@ int main(int argc, char *argv[])
 			backend = choose_default_backend();
 	}
 
-	ivi_compositor_get_quirks(&ivi);
-
 	display = wl_display_create();
 	loop = wl_display_get_event_loop(display);
 
@@ -1255,6 +1268,8 @@ int main(int argc, char *argv[])
 
 	wl_display_run(display);
 
+	ret = ivi.compositor->exit_code;
+
 	wl_display_destroy_clients(display);
 
 error_compositor:
@@ -1280,4 +1295,6 @@ error_signals:
 	log_file_close();
 	if (ivi.config)
 		weston_config_destroy(ivi.config);
+
+	return ret;
 }