Fixed #647: Documentation for specifying the number of high priority …

…threads --hpx:high-priority-threads
STEllAR-GROUP · Jul 18, 2013 · 1006607 · 1006607
1 parent 93db590
commit 1006607
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/docs/manual/commandline.qbk b/docs/manual/commandline.qbk
@@ -79,8 +79,8 @@ described in the table below:
                                  --hpx:queuing=hierarchy only (default: 2)]]
     [[`--hpx:high-priority-threads arg`] [the number of operating system threads
                                  maintaining a high priority queue (default:
-                                 number of OS threads), valid for
-                                 --hpx:queuing=priority_local only]]
+                                 number of OS threads), valid for --hpx:queuing=priority_local
+                                 and --hpx:queuing=priority_abp only]]
     [[`--hpx:numa-sensitive`]   [makes the priority_local scheduler NUMA sensitive, valid for
                                  `--hpx:queuing=local` and priority_local only]]
 

diff --git a/docs/manual/scheduling_policies.qbk b/docs/manual/scheduling_policies.qbk
@@ -111,10 +111,6 @@ is available.
     then an additional number of high-priority-threads queues plus an additional 
     low priority queue.
 
-    Documentation claims �hpx:high-priority-threads option only available for 
-    local priority but is accepted on command line for both periodic priority 
-    and abd priority (same for error messages)
-
     Is numa-sensitive only for local priority??? I know it says that in the 
     documentation and error messages but seems to be available for abp 
     priority and periodic priority

diff --git a/docs/whats_new.qbk b/docs/whats_new.qbk
@@ -65,6 +65,7 @@ Here is a list of the tickets we closed for this release.
 * [issue 774] - Using local dataflow without explicit namespace
 * [issue 773] - Local dataflow with unwrap: functor operators need to be const
 * [issue 772] - Allow (remote) actions to return a future
+* [issue 771] - Setting HPX_LIMIT gives huge boost MPL errors
 * [issue 770] - Add launch policy to (local) dataflow
 * [issue 769] - Make compile time configuration information available
 * [issue 768] - Const correctness problem in local dataflow
@@ -169,6 +170,8 @@ Here is a list of the tickets we closed for this release.
 * [issue 664] - Adapt new meanings of 'const' and 'mutable'
 * [issue 661] - Implement BTL Parcel port
 * [issue 655] - Make HPX work with the "decltype" result_of
+* [issue 647] - documentation for specifying the number of high priority threads
+                `--hpx:high-priority-threads`
 * [issue 643] - Error parsing host file
 * [issue 642] - HWLoc issue with TAU
 * [issue 639] - Logging potentially suspends a running thread

diff --git a/src/hpx_init.cpp b/src/hpx_init.cpp
@@ -429,7 +429,8 @@ namespace hpx
             if (vm.count("hpx:high-priority-threads")) {
                 throw std::logic_error("Invalid command line option "
                     "--hpx:high-priority-threads, valid for "
-                    "--hpx:queuing=priority_local only");
+                    "--hpx:queuing=priority_local and --hpx:queuing=priority_abp "
+                    "only");
             }
         }
 
@@ -439,7 +440,8 @@ namespace hpx
             if (vm.count("hpx:numa-sensitive")) {
                 throw std::logic_error("Invalid command line option "
                     "--hpx:numa-sensitive, valid for "
-                    "--hpx:queuing=local, priority_local, or priority_abp only");
+                    "--hpx:queuing=local, --hpx:queuing=priority_local, or "
+                    "--hpx:queuing=priority_abp only");
             }
         }
 

diff --git a/src/util/parse_command_line.cpp b/src/util/parse_command_line.cpp
@@ -441,7 +441,7 @@ namespace hpx { namespace util
                 ("hpx:high-priority-threads", value<std::size_t>(),
                   "the number of operating system threads maintaining a high "
                   "priority queue (default: number of OS threads), valid for "
-                  "--hpx:queuing=priority_local only")
+                  "--hpx:queuing=priority_local and --hpx:queuing=priority_abp only")
                 ("hpx:numa-sensitive",
                   "makes the priority_local scheduler NUMA sensitive, valid for "
                   "--hpx:queuing=local and priority_local only")