Changeset 3cb97b for src

Timestamp:

Jul 10, 2012, 1:15:50 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

7ed4e8

Parents:

41f82c

git-author:

Frederik Heber <heber@…> (07/06/12 19:03:51)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:50)

Message:

Extracted getting thread group into own function.

File:

• src/bin/mpqc/mpqc.cc (modified) (3 diffs)

src/bin/mpqc/mpqc.cc

@@ -573 +573 @@
  *
  * \param grp message group
- * \param parsedkev keyvalue container
+ * \param parsedkev keyvalue container on return
  * \param options options structure
  * \param input input file name
@@ -642 +642 @@
 }
 
+/** Get the thread group.
+ *
+ * \param keyval keyvalue container
+ * \param thread thread group on return
+ * \param argc argument count
+ * \param argv argument array
+ */
+void getThreadGroup(
+    Ref<KeyVal> &keyval,
+    Ref<ThreadGrp> &thread,
+    int argc,
+    char **argv)
+{
+  //first try the commandline and environment
+  thread = ThreadGrp::initial_threadgrp(argc, argv);
+
+  // if we still don't have a group, try reading the thread group
+  // from the input
+  if (thread.null()) {
+    thread << keyval->describedclassvalue("thread");
+  }
+
+  if (thread.nonnull())
+    ThreadGrp::set_default_threadgrp(thread);
+  else
+    thread = ThreadGrp::get_default_threadgrp();
+}
+
 int
 try_main(int argc, char *argv[])
@@ -721 +749 @@
   makeAnnouncement(tim);
 
-  // get the thread group.  first try the commandline and environment
-  Ref<ThreadGrp> thread = ThreadGrp::initial_threadgrp(argc, argv);
+  // get the thread group.
+  Ref<ThreadGrp> thread;
+  getThreadGroup(keyval, thread, argc, argv);
   
-  // if we still don't have a group, try reading the thread group
-  // from the input
-  if (thread.null()) {
-    thread << keyval->describedclassvalue("thread");
-  }
-
-  if (thread.nonnull())
-    ThreadGrp::set_default_threadgrp(thread);
-  else
-    thread = ThreadGrp::get_default_threadgrp();
-
   // get the memory group.  first try the commandline and environment
   Ref<MemoryGrp> memory = MemoryGrp::initial_memorygrp(argc, argv);