Call j_init and j_fini automatically

Keep them public for now. Repeated invocations will simply return immediately.
parcio · Dec 12, 2018 · 7582937 · 7582937
1 parent a9916cb
commit 7582937
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 24 deletions.
diff --git a/benchmark/benchmark.c b/benchmark/benchmark.c
@@ -183,8 +183,6 @@ main (int argc, char** argv)
 		opt_machine_separator = g_strdup("\t");
 	}
 
-	j_init();
-
 	j_benchmark_semantics = j_semantics_new_from_string(opt_template, opt_semantics);
 	j_benchmark_timer = g_timer_new();
 
@@ -214,8 +212,6 @@ main (int argc, char** argv)
 	g_timer_destroy(j_benchmark_timer);
 	j_semantics_unref(j_benchmark_semantics);
 
-	j_fini();
-
 	g_free(opt_machine_separator);
 	g_free(opt_path);
 	g_free(opt_semantics);

diff --git a/cli/cli.c b/cli/cli.c
@@ -98,8 +98,6 @@ main (int argc, char** argv)
 
 	command = argv[1];
 
-	j_init();
-
 	arguments = g_new(gchar const*, argc - 1);
 
 	for (i = 2; i < argc; i++)
@@ -139,7 +137,5 @@ main (int argc, char** argv)
 		j_cmd_usage();
 	}
 
-	j_fini();
-
 	return (success) ? 0 : 1;
 }
diff --git a/fuse/julea-fuse.c b/fuse/julea-fuse.c
@@ -45,11 +45,7 @@ main (int argc, char** argv)
 {
 	gint ret;
 
-	j_init();
-
 	ret = fuse_main(argc, argv, &jfs_vtable, NULL);
 
-	j_fini();
-
 	return ret;
 }
diff --git a/include/jcommon.h b/include/jcommon.h
@@ -43,8 +43,9 @@ G_END_DECLS
 
 G_BEGIN_DECLS
 
-void j_init (void);
-void j_fini (void);
+// FIXME copy and use GLib's G_DEFINE_CONSTRUCTOR/DESTRUCTOR
+void __attribute__((constructor)) j_init (void);
+void __attribute__((destructor)) j_fini (void);
 
 JConfiguration* j_configuration (void);
 

diff --git a/lib/jcommon.c b/lib/jcommon.c
@@ -139,7 +139,10 @@ j_init (void)
 	gchar const* kv_component;
 	gchar const* kv_path;
 
-	g_return_if_fail(!j_is_initialized());
+	if (j_is_initialized())
+	{
+		return;
+	}
 
 	common = g_slice_new(JCommon);
 	common->configuration = NULL;
@@ -218,7 +221,10 @@ j_fini (void)
 {
 	JCommon* common;
 
-	g_return_if_fail(j_is_initialized());
+	if (!j_is_initialized())
+	{
+		return;
+	}
 
 	j_trace_enter(G_STRFUNC, NULL);
 

diff --git a/test/test.c b/test/test.c
@@ -31,8 +31,6 @@ main (int argc, char** argv)
 
 	g_test_init(&argc, &argv, NULL);
 
-	j_init();
-
 	// Core
 	test_background_operation();
 	test_batch();
@@ -53,7 +51,5 @@ main (int argc, char** argv)
 
 	ret = g_test_run();
 
-	j_fini();
-
 	return ret;
 }
diff --git a/tools/statistics.c b/tools/statistics.c
@@ -67,8 +67,6 @@ main (int argc, char** argv)
 	(void)argc;
 	(void)argv;
 
-	j_init();
-
 	get_all = 1;
 	configuration = j_configuration();
 	statistics_total = j_statistics_new(FALSE);
@@ -145,7 +143,5 @@ main (int argc, char** argv)
 
 	j_statistics_free(statistics_total);
 
-	j_fini();
-
 	return 0;
 }