1 files changed, 25 insertions, 30 deletions

diff --git a/tests/ingen_bench.cpp b/tests/ingen_bench.cpp
index 2af53f89..ee890401 100644
--- a/tests/ingen_bench.cpp
+++ b/tests/ingen_bench.cpp
@@ -14,14 +14,14 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Atom.hpp"
-#include "ingen/Clock.hpp"
-#include "ingen/Configuration.hpp"
-#include "ingen/EngineBase.hpp"
-#include "ingen/Forge.hpp"
-#include "ingen/Parser.hpp"
-#include "ingen/World.hpp"
-#include "ingen/runtime_paths.hpp"
+#include <ingen/Atom.hpp>
+#include <ingen/Clock.hpp>
+#include <ingen/Configuration.hpp>
+#include <ingen/EngineBase.hpp>
+#include <ingen/Forge.hpp>
+#include <ingen/Parser.hpp>
+#include <ingen/World.hpp>
+#include <ingen/runtime_paths.hpp>
 
 #include <chrono>
 #include <cstdint>
@@ -32,8 +32,7 @@
 #include <memory>
 #include <string>
 
-namespace ingen {
-namespace bench {
+namespace ingen::bench {
 namespace {
 
 std::unique_ptr<ingen::World> world;
@@ -42,7 +41,7 @@ void
 ingen_try(bool cond, const char* msg)
 {
 	if (!cond) {
-		std::cerr << "ingen: Error: " << msg << std::endl;
+		std::cerr << "ingen: Error: " << msg << "\n";
 		world.reset();
 		exit(EXIT_FAILURE);
 	}
@@ -62,15 +61,14 @@ run(int argc, char** argv)
 {
 	// Create world
 	try {
-		world = std::unique_ptr<ingen::World>{
-		    new ingen::World(nullptr, nullptr, nullptr)};
+		world = std::make_unique<ingen::World>(nullptr, nullptr, nullptr);
 
 		world->conf().add(
 			"output", "output", 'O', "File to write benchmark output",
 			ingen::Configuration::SESSION, world->forge().String, Atom());
 		world->load_configuration(argc, argv);
 	} catch (std::exception& e) {
-		std::cout << "ingen: " << e.what() << std::endl;
+		std::cout << "ingen: " << e.what() << "\n";
 		return EXIT_FAILURE;
 	}
 
@@ -78,9 +76,7 @@ run(int argc, char** argv)
 	const Atom& load = world->conf().option("load");
 	const Atom& out  = world->conf().option("output");
 	if (!load.is_valid() || !out.is_valid()) {
-		std::cerr << "Usage: ingen_bench --load START_GRAPH --output OUT_FILE"
-		          << std::endl;
-
+		std::cerr << "Usage: ingen_bench --load START_GRAPH --output OUT_FILE\n";
 		return EXIT_FAILURE;
 	}
 
@@ -92,7 +88,7 @@ run(int argc, char** argv)
 	if (start_graph.empty()) {
 		std::cerr << "error: initial graph '"
 		          << static_cast<const char*>(load.get_body())
-		          << "' does not exist" << std::endl;
+		          << "' does not exist\n";
 		return EXIT_FAILURE;
 	}
 
@@ -101,7 +97,7 @@ run(int argc, char** argv)
 	          "Unable to load server module");
 
 	// Initialise engine
-	ingen_try(bool(world->engine()),
+	ingen_try(!!world->engine(),
 	          "Unable to create engine");
 	world->engine()->init(48000.0, 4096, 4096);
 	world->engine()->activate();
@@ -109,7 +105,7 @@ run(int argc, char** argv)
 	// Load graph
 	if (!world->parser()->parse_file(*world, *world->interface(), start_graph)) {
 		std::cerr << "error: failed to load initial graph " << start_graph
-		          << std::endl;
+		          << "\n";
 
 		return EXIT_FAILURE;
 	}
@@ -117,10 +113,10 @@ run(int argc, char** argv)
 
 	// Run benchmark
 	// TODO: Set up real-time scheduling for this and worker threads
-	ingen::Clock   clock;
-	const uint32_t n_test_frames = 1 << 20;
-	const uint32_t block_length  = 4096;
-	const uint64_t t_start       = clock.now_microseconds();
+	const ingen::Clock clock;
+	const uint32_t     n_test_frames = 1 << 20;
+	const uint32_t     block_length  = 4096;
+	const uint64_t     t_start       = clock.now_microseconds();
 	for (uint32_t i = 0; i < n_test_frames; i += block_length) {
 		world->engine()->advance(block_length);
 		world->engine()->run(block_length);
@@ -129,14 +125,14 @@ run(int argc, char** argv)
 	const uint64_t t_end = clock.now_microseconds();
 
 	// Write log output
-	std::unique_ptr<FILE, decltype(&fclose)> log{fopen(out_file.c_str(), "a"),
-	                                             &fclose};
+	const std::unique_ptr<FILE, int (*)(FILE*)> log{fopen(out_file.c_str(), "a"),
+	                                                &fclose};
 	if (ftell(log.get()) == 0) {
 		fprintf(log.get(), "# n_threads\trun_time\treal_time\n");
 	}
-	fprintf(log.get(), "%u\t%f\t%f\n",
+	fprintf(log.get(), "%d\t%f\t%f\n",
 	        world->conf().option("threads").get<int32_t>(),
-	        (t_end - t_start) / 1000000.0,
+	        static_cast<double>(t_end - t_start) / 1000000.0,
 	        (n_test_frames / 48000.0));
 
 	// Shut down
@@ -146,8 +142,7 @@ run(int argc, char** argv)
 }
 
 } // namespace
-} // namespace bench
-} // namespace ingen
+} // namespace ingen::bench
 
 int
 main(int argc, char** argv)