Misc improvements

Author: palemieux

src/bin/exrperf/main.cpp

@@ -17,6 +17,7 @@
 #include <ImfOutputPart.h>
 #include "ImfChannelList.h"
 #include "ImfMisc.h"
+#include "IlmThread.h"
 #include "IlmThreadPool.h"
 #include "ImfFrameBuffer.h"
 #include <ImfNamespace.h>
@@ -140,8 +141,13 @@ class WritingTask : public Task
         Header*              header,
         int                  part_num,
         PartBuffer*          buffer)
-        : Task (group), part (*file, part_num), buffer (buffer), header (header)
-    {}
+        : Task (group)
+        , part (*file, part_num)
+        , buffer (buffer)
+        , header (header)
+        , part_num (part_num)
+    {
+    }
 
     void execute ()
     {
@@ -154,6 +160,7 @@ class WritingTask : public Task
     OutputPart  part;
     PartBuffer* buffer;
     Header*     header;
+    int         part_num;
 };
 
 class ReadingTask : public Task
@@ -193,7 +200,10 @@ main (int argc, char* argv[])
         "Repetition count",
         cxxopts::value<int> ()->default_value ("5")) (
         "t,threads",
-        "Number of threads",
+        "Number of threads to handle encoding and decoding",
+        cxxopts::value<int> ()->default_value ("1")) (
+        "p,part_threads",
+        "Number of threads to handle parts",
         cxxopts::value<int> ()->default_value ("1")) (
         "v,verbose",
         "Output more information",
@@ -210,6 +220,15 @@ main (int argc, char* argv[])
 
     auto args = options.parse (argc, argv);
 
+    if (!supportsThreads ())
+    {
+        std::cout << "Threading not supported!" << std::endl;
+        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;
@@ -220,7 +239,7 @@ main (int argc, char* argv[])
 
     auto& src_fn = args["file"].as<std::string> ();
 
-    /* thread count */
+    /* encoding/decoding thread count */
 
     setGlobalThreadCount (args["threads"].as<int> ());
 
@@ -238,7 +257,7 @@ main (int argc, char* argv[])
     {
         InputPart src_part (src_file, part_index);
 
-        headers[part_index]                = src_part.header ();
+        headers[part_index] = src_part.header ();
         /* set the target compressor */
         headers[part_index].compression () = c;
 
@@ -323,8 +342,9 @@ main (int argc, char* argv[])
         /*MultiPartOutputFile o_file (
             "/var/tmp/out.exr", headers.data (), headers.size ());*/
 
-        ThreadPool* thread_pool = new ThreadPool ();
-        TaskGroup   task_group;
+        ThreadPool* thread_pool =
+            new ThreadPool (args["part_threads"].as<int> ());
+        TaskGroup task_group;
 
         auto start = std::chrono::high_resolution_clock::now ();
         for (int part_index = 0; part_index < src_file.parts (); part_index++)
@@ -355,8 +375,9 @@ main (int argc, char* argv[])
 
         MultiPartInputFile i_file (i_memfile);
 
-        ThreadPool* thread_pool = new ThreadPool ();
-        TaskGroup   task_group;
+        ThreadPool* thread_pool =
+            new ThreadPool (args["part_threads"].as<int> ());
+        TaskGroup task_group;
 
         auto start = std::chrono::high_resolution_clock::now ();
         for (int part_index = 0; part_index < i_file.parts (); part_index++)