X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=28f99a9ff73b6ffbf84d340c30892b6a1bb10fc7;hb=73f03b54b10a9afa075e8dcf059cb225a038edab;hp=cc5ebe3f644748d130bbe11450f3c5d021ae22f9;hpb=1d139cdc11bf6cb49946323af910eb78d074216e;p=pspp

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index cc5ebe3f64..28f99a9ff7 100644
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2005, 2006, 2010, 2011  Free Software Foundation
+   Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,6 +50,7 @@ enum
     OPT_HELP,
     OPT_VERSION,
     OPT_NO_SPLASH,
+    OPT_MEASURE_STARTUP,
     N_STARTUP_OPTIONS
   };
 
@@ -57,9 +58,15 @@ static const struct argv_option startup_options[N_STARTUP_OPTIONS] =
   {
     {"help",      'h', no_argument, OPT_HELP},
     {"version",   'V', no_argument, OPT_VERSION},
-    {"no-splash", 'q', no_argument, OPT_NO_SPLASH}
+    {"no-splash", 'q', no_argument, OPT_NO_SPLASH},
+    {"measure-startup", 0, no_argument, OPT_MEASURE_STARTUP},
   };
 
+/* --measure-startup: Prints the elapsed time to start up and load any file
+   specified on the command line. */
+static gboolean measure_startup;
+static GTimer *startup;
+
 static void
 usage (void)
 {
@@ -81,7 +88,7 @@ usage (void)
   gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base;
 
   printf (_("\
-PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n\
+PSPPIRE, a GUI for PSPP, a program for statistical analysis of sampled data.\n\
 Usage: %s [OPTION]... FILE\n\
 \n\
 Arguments to long options also apply to equivalent short options.\n\
@@ -106,7 +113,8 @@ Informative output:\n\
   -h, --help                display this help and exit\n\
   -V, --version             output version information and exit\n\
 \n\
-A non-option argument is interpreted as a .sav or .por file to load.\n"),
+A non-option argument is interpreted as a data file in .sav or .zsav or .por\n\
+format or a syntax file to load.\n"),
           program_name, gtk_help, inc_path);
 
   free (inc_path);
@@ -137,6 +145,10 @@ startup_option_callback (int id, void *show_splash_)
       *show_splash = FALSE;
       break;
 
+    case OPT_MEASURE_STARTUP:
+      measure_startup = TRUE;
+      break;
+
     default:
       NOT_REACHED ();
     }
@@ -176,6 +188,16 @@ hide_splash_window (gpointer data)
   return FALSE;
 }
 
+static gboolean
+print_startup_time (gpointer data)
+{
+  g_timer_stop (startup);
+  printf ("%.3f seconds elapsed\n", g_timer_elapsed (startup, NULL));
+  g_timer_destroy (startup);
+  startup = NULL;
+
+  return FALSE;
+}
 
 static gboolean
 quit_one_loop (gpointer data)
@@ -199,6 +221,15 @@ run_inner_loop (gpointer data)
 
   g_timeout_add (500, hide_splash_window, ip->splash_window);
 
+  if (measure_startup)
+    {
+      GSource *source = g_idle_source_new ();
+      g_source_set_priority (source, G_PRIORITY_LOW);
+      g_source_set_callback (source, print_startup_time, NULL, NULL);
+      g_source_attach (source, NULL);
+      g_source_unref (source);
+    }
+
   gtk_main ();
 
   de_initialize ();
@@ -218,25 +249,32 @@ static GMemVTable vtable =
   };
 
 #ifdef __APPLE__
+static const bool apple = true;
+#else
+static const bool apple = false;
+#endif
+
 /* Searches ARGV for the -psn_xxxx option that the desktop application
    launcher passes in, and removes it if it finds it.  Returns the new value
    of ARGC. */
-static int
+static inline int
 remove_psn (int argc, char **argv)
 {
-  int i;
-
-  for (i = 0; i < argc; i++)
+  if (apple)
     {
-      if (!strncmp(argv[i], "-psn", 4))
-        {
-          remove_element (argv, argc + 1, sizeof *argv, i);
-          return argc - 1;
-        }
+      int i;
+
+      for (i = 0; i < argc; i++)
+	{
+	  if (!strncmp (argv[i], "-psn", 4))
+	    {
+	      remove_element (argv, argc + 1, sizeof *argv, i);
+	      return argc - 1;
+	    }
+	}
     }
   return argc;
 }
-#endif  /* __APPLE__ */
 
 int
 main (int argc, char *argv[])
@@ -250,8 +288,16 @@ main (int argc, char *argv[])
 
   g_mem_set_vtable (&vtable);
 
+#if !GLIB_CHECK_VERSION(2,32,0)
+  /* g_thread_init() was required before glib 2.32, but it is deprecated since
+     then and calling it yields a compile-time warning. */
+  g_thread_init (NULL);
+#endif
+
   gtk_disable_setlocale ();
 
+  startup = g_timer_new ();
+  g_timer_start (startup);
 
   if ( ! gtk_parse_args (&argc, &argv) )
     {
@@ -266,9 +312,7 @@ main (int argc, char *argv[])
       g_warning ("%s", vers);
     }
 
-#ifdef __APPLE__
   argc = remove_psn (argc, argv);
-#endif
 
   /* Parse our own options. 
      This must come BEFORE gdk_init otherwise options such as