multi-thread br-enroll

Josh Klontz
1 parent eed899b5
Showing 6 changed files with 20 additions and 9 deletions
app/br-enroll/br-enroll.cpp
app/br-print/br-print.cpp
app/br-search/br-search.cpp
app/br-select/br-select.cpp
openbr/universal_template.cpp
openbr/universal_template.h
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     Globals->quiet = true;
     Globals->enrollAll = true;
     algorithm = Transform::fromAlgorithm("FaceRecognition");
-    br_iterate_utemplates_file(stdin, enroll_utemplate, NULL);
+    br_iterate_utemplates_file(stdin, enroll_utemplate, NULL, true);
     Context::finalize();
     return EXIT_SUCCESS;
 }
@@ -45,6 +45,6 @@ int main(int argc, char *argv[])
     for (int i=1; i<argc; i++)
         if      (!strcmp(argv[i], "-help")) { help(); exit(EXIT_SUCCESS); }
-    br_iterate_utemplates_file(stdin, print_utemplate, NULL);
+    br_iterate_utemplates_file(stdin, print_utemplate, NULL, false);
     return EXIT_SUCCESS;
 }
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
         galleries.append(MappedGallery(url));
     Globals->quiet = true;
-    br_iterate_utemplates_file(stdin, search_utemplate, NULL);
+    br_iterate_utemplates_file(stdin, search_utemplate, NULL, false);
     Context::finalize();
     return EXIT_SUCCESS;
@@ -49,6 +49,6 @@ int main(int argc, char *argv[])
         else if (!strcmp(argv[i], "-algorithmID")) algorithmID = new int(atoi(argv[++i]));
     }
-    br_iterate_utemplates_file(stdin, select_utemplate, NULL);
+    br_iterate_utemplates_file(stdin, select_utemplate, NULL, false);
     return EXIT_SUCCESS;
 }
 #include <QFile>
+#include <QFutureSynchronizer>
 #include <QMutex>
 #include <QMutexLocker>
+#include <QtConcurrent>
 #include <cstdlib>
 #include <cstring>
@@ -47,8 +49,15 @@ void br_iterate_utemplates(br_const_utemplate begin, br_const_utemplate end, br_
     }
 }
-void br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_callback_context context)
+static void callAndFree(br_utemplate_callback callback, br_utemplate t, br_callback_context context)
 {
+    callback(t, context);
+    free(t);
+}
+
+void br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_callback_context context, bool parallel)
+{
+    QFutureSynchronizer<void> futures;
     while (!feof(file)) {
         br_utemplate t = (br_utemplate) malloc(sizeof(br_universal_template));
@@ -56,9 +65,11 @@ void br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_c
             t = (br_utemplate) realloc(t, sizeof(br_universal_template) + t->size);
             if (fread(t+1, 1, t->size, file) != t->size)
                 qFatal("Unexepected EOF when reading universal template data.");
-            callback(t, context);
+            if (parallel) futures.addFuture(QtConcurrent::run(callAndFree, callback, t, context));
+            else          callAndFree(callback, t, context);
+        } else {
+            free(t);
         }
-
-        free(t);
     }
+    futures.waitForFinished();
 }
@@ -81,7 +81,7 @@ BR_EXPORT void br_iterate_utemplates(br_const_utemplate begin, br_const_utemplat
  * \brief Iterate over br_universal_template in a file.
  * \see br_iterate_utemplates
  */
-BR_EXPORT void br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_callback_context context);
+BR_EXPORT void br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_callback_context context, bool parallel);
 #ifdef __cplusplus
 }