From 667e633e829760b5a1e9591227ec5437cac1995d Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 18 Feb 2017 19:29:15 +0100
Subject: Improve parallel analysis and execution algorithms

---
 src/World.cpp | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index 38b27a9a..d6a1fc1c 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -98,14 +98,12 @@ ingen_load_module(Log& log, const string& name)
 
 class World::Impl {
 public:
-	Impl(int&            a_argc,
-	     char**&         a_argv,
-	     LV2_URID_Map*   map,
+	Impl(LV2_URID_Map*   map,
 	     LV2_URID_Unmap* unmap,
 	     LV2_Log_Log*    lv2_log)
-		: argc(a_argc)
-		, argv(a_argv)
-		, lv2_features(NULL)
+		: argc(nullptr)
+		, argv(nullptr)
+		, lv2_features(nullptr)
 		, rdf_world(new Sord::World())
 		, lilv_world(lilv_world_new())
 		, uri_map(new URIMap(log, map, unmap))
@@ -114,17 +112,6 @@ public:
 		, conf(*forge)
 		, log(lv2_log, *uris)
 	{
-		// Parse default configuration files
-		std::list<std::string> files = conf.load_default("ingen", "options.ttl");
-		for (const auto& f : files) {
-			log.info(fmt("Loaded configuration %1%\n") % f);
-		}
-
-		// Parse command line options, overriding configuration file values
-		conf.parse(argc, argv);
-		log.set_flush(conf.option("flush-log").get<int32_t>());
-		log.set_trace(conf.option("trace").get<int32_t>());
-
 		lv2_features = new LV2Features();
 		lv2_features->add_feature(uri_map->urid_map_feature());
 		lv2_features->add_feature(uri_map->urid_unmap_feature());
@@ -208,8 +195,8 @@ public:
 	typedef std::map<const std::string, ScriptRunner> ScriptRunners;
 	ScriptRunners script_runners;
 
-	int&             argc;
-	char**&          argv;
+	int*             argc;
+	char***          argv;
 	LV2Features*     lv2_features;
 	Sord::World*     rdf_world;
 	LilvWorld*       lilv_world;
@@ -228,12 +215,8 @@ public:
 	std::string      jack_uuid;
 };
 
-World::World(int&                 argc,
-             char**&              argv,
-             LV2_URID_Map*        map,
-             LV2_URID_Unmap*      unmap,
-             LV2_Log_Log*         log)
-	: _impl(new Impl(argc, argv, map, unmap, log))
+World::World(LV2_URID_Map* map, LV2_URID_Unmap* unmap, LV2_Log_Log* log)
+	: _impl(new Impl(map, unmap, log))
 {
 	_impl->serialiser = SPtr<Serialiser>(new Serialiser(*this));
 	_impl->parser     = SPtr<Parser>(new Parser());
@@ -244,6 +227,24 @@ World::~World()
 	delete _impl;
 }
 
+void
+World::load_configuration(int& argc, char**& argv)
+{
+	_impl->argc = &argc;
+	_impl->argv = &argv;
+
+	// Parse default configuration files
+	const auto files = _impl->conf.load_default("ingen", "options.ttl");
+	for (const auto& f : files) {
+		_impl->log.info(fmt("Loaded configuration %1%\n") % f);
+	}
+
+	// Parse command line options, overriding configuration file values
+	_impl->conf.parse(argc, argv);
+	_impl->log.set_flush(_impl->conf.option("flush-log").get<int32_t>());
+	_impl->log.set_trace(_impl->conf.option("trace").get<int32_t>());
+}
+
 void World::set_engine(SPtr<EngineBase> e)   { _impl->engine     = e; }
 void World::set_interface(SPtr<Interface> i) { _impl->interface  = i; }
 void World::set_store(SPtr<Store> s)         { _impl->store      = s; }
@@ -254,8 +255,8 @@ SPtr<Parser>     World::parser()     { return _impl->parser; }
 SPtr<Serialiser> World::serialiser() { return _impl->serialiser; }
 SPtr<Store>      World::store()      { return _impl->store; }
 
-int&           World::argc() { return _impl->argc; }
-char**&        World::argv() { return _impl->argv; }
+int&           World::argc() { return *_impl->argc; }
+char**&        World::argv() { return *_impl->argv; }
 Configuration& World::conf() { return _impl->conf; }
 Log&           World::log()  { return _impl->log; }
 
-- 
cgit v1.2.1