speed up startup and shutdown of nip4-batch

Author: jcupitt

TODO

@@ -1,11 +1,3 @@
-- main_shutdown() takes a LONG time
-
-	can we just del temp files maybe? just call vips_shutdown()?
-
-- stop menu loading when we're not in workspace mode?
-
- 	or maybe we do this already?
-
 - add tab completion ... somewhat like VS intellisense
 
 	should work in workspace entry box, and in program window

src/main-batch.c

@@ -417,9 +417,10 @@ main(int argc, char **argv)
     if (main_option_test)
         main_option_verbose = TRUE;
 
-    if (main_option_i18n)
-        /* We'll need to load all menus.
-         */
+	/* We'll need to load all menus for workspace mode, or to gen i18n.
+	 */
+    if (main_option_i18n ||
+		main_option_workspace)
         main_option_no_load_menus = FALSE;
 
 	/* On Windows, argv is ascii-only ... use this to get a utf-8 version of

src/main.c

@@ -127,12 +127,17 @@ main_mkdir(const char *dir)
 static void *
 main_load_def(const char *filename)
 {
-	Toolkit *kit;
+	g_autofree char *basename = g_path_get_basename(filename);
 
-	if (!(kit = toolkit_new_from_file(main_toolkitgroup, filename)))
-		error_alert(NULL);
-	else
-		filemodel_set_auto_load(FILEMODEL(kit));
+	if (!main_option_no_load_menus ||
+		basename[0] == '_') {
+		Toolkit *kit;
+
+		if (!(kit = toolkit_new_from_file(main_toolkitgroup, filename)))
+			error_alert(NULL);
+		else
+			filemodel_set_auto_load(FILEMODEL(kit));
+	}
 
 	return NULL;
 }
@@ -398,6 +403,10 @@ main_startup(int argc, char **argv)
 void
 main_shutdown(void)
 {
+#ifdef DEBUG
+	/* Do a careful shutdown (very slow) in DEBUG
+	 */
+
 	/* Junk all symbols. This may remove a bunch of intermediate images
 	 * too.
 	 */
@@ -419,8 +428,13 @@ main_shutdown(void)
 	 */
 	VIPS_UNREF(main_imageinfogroup);
 	heap_check_all_destroyed();
-	vips_shutdown();
 	managed_check_all_destroyed();
 	util_check_all_destroyed();
 	view_dump();
+#endif /*DEBUG*/
+
+	/* Can we leave files in tmp after ^C/^V?
+	 */
+
+	vips_shutdown();
 }

src/main.h

@@ -29,11 +29,9 @@ extern Imageinfogroup *main_imageinfogroup;
 extern void *main_c_stack_base;
 extern const char *main_argv0;
 
-extern gboolean main_option_time_save;
-extern gboolean main_option_profile;
 extern gboolean main_option_i18n;
-extern gboolean main_option_batch;
 extern gboolean main_option_no_load_menus;
+extern gboolean main_option_batch;
 
 void set_prefix(const char *prefix);
 const char *get_prefix(void);

src/row.c

@@ -1662,13 +1662,6 @@ row_recomp(Row *row)
 {
 	Row *top_row = row->top_row;
 
-	static GTimer *recomp_timer = NULL;
-
-	if (!recomp_timer)
-		recomp_timer = g_timer_new();
-
-	g_timer_reset(recomp_timer);
-
 	/* Sort dirties into recomp order.
 	 */
 	row_recomp_sort(top_row);
@@ -1766,16 +1759,6 @@ row_recomp(Row *row)
 			(icontainer_map_fn) heapmodel_update_model, NULL))
 			expr_error_set(top_row->expr);
 
-	if (main_option_profile) {
-		char txt[100];
-		VipsBuf buf = VIPS_BUF_STATIC(txt);
-		Symbol *context = symbol_get_parent(top_row->ws->sym);
-
-		row_qualified_name_relative(context, top_row, &buf);
-		printf("%s\t%g\n", vips_buf_all(&buf),
-			g_timer_elapsed(recomp_timer, NULL));
-	}
-
 #ifdef DEBUG
 	printf("row_recomp: value of ");
 	row_name_print(top_row);