Misc improvements

Author: palemieux

src/bin/exrperf/main.cpp

@@ -146,8 +146,7 @@ class WritingTask : public Task
         , buffer (buffer)
         , header (header)
         , part_num (part_num)
-    {
-    }
+    {}
 
     void execute ()
     {
@@ -226,9 +225,6 @@ main (int argc, char* argv[])
         exit (-1);
     }
 
-    if (args["verbose"].as<bool> ())
-        std::cout << "Recommended # of I/O threads: " << ThreadPool::estimateThreadCountForFileIO() << std::endl;
-
     if (args.count ("compression") != 1 || args.count ("file") != 1)
     {
         std::cout << options.help () << std::endl;
@@ -239,13 +235,18 @@ main (int argc, char* argv[])
 
     auto& src_fn = args["file"].as<std::string> ();
 
-    /* encoding/decoding thread count */
+    /* thread count */
+
+    int global_thread_count = args["threads"].as<int> ();
+    int part_thread_count   = args["part_threads"].as<int> ();
+    int proc_thread_count =
+        (global_thread_count + part_thread_count - 1) / part_thread_count;
 
-    setGlobalThreadCount (args["threads"].as<int> ());
+    setGlobalThreadCount (global_thread_count);
 
     /* load src image */
 
-    MultiPartInputFile src_file (src_fn.c_str ());
+    MultiPartInputFile src_file (src_fn.c_str (), proc_thread_count);
 
     size_t decoded_size = 0;
 
@@ -337,13 +338,17 @@ main (int argc, char* argv[])
         OMemStream o_memfile (&mem_file);
 
         MultiPartOutputFile o_file (
-            o_memfile, headers.data (), headers.size ());
+            o_memfile,
+            headers.data (),
+            headers.size (),
+            false,
+            proc_thread_count);
 
         /*MultiPartOutputFile o_file (
             "/var/tmp/out.exr", headers.data (), headers.size ());*/
 
         ThreadPool* thread_pool =
-            new ThreadPool (args["part_threads"].as<int> ());
+            new ThreadPool (part_thread_count);
         TaskGroup task_group;
 
         auto start = std::chrono::high_resolution_clock::now ();
@@ -373,10 +378,10 @@ main (int argc, char* argv[])
 
         IMemStream i_memfile (&mem_file);
 
-        MultiPartInputFile i_file (i_memfile);
+        MultiPartInputFile i_file (i_memfile, proc_thread_count);
 
         ThreadPool* thread_pool =
-            new ThreadPool (args["part_threads"].as<int> ());
+            new ThreadPool (part_thread_count);
         TaskGroup task_group;
 
         auto start = std::chrono::high_resolution_clock::now ();