Changeset 20822

Timestamp:

09/17/07 10:39:32 (1 year ago)

Author:

patrick

Message:

Changed the parameter type for vpr::Thread::setRunOn() back to const int. This
is done to silence a compiler warning and to account for the fact that
non-Windows platforms appear to prefer an int rather than an unsigned int when
doing CPU affinity operations. The CPU value is still clamped to be greater
than or equal to 0, but it is now done using a pre-condition with an exception
rather than by value type.

Files:

• juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.h (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.cpp (modified) (2 diffs)
• juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.h (modified) (2 diffs)
• juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.cpp (modified) (2 diffs)
• juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.h (modified) (2 diffs)

juggler/trunk/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.h

@@ -245 +245 @@
-   void setPrio(const VPRThreadPriority prio);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   {
-      /* Do nothing. */ ;
-   }
-
+   /**
+    * Gets the CPU affinity for this thread (the CPU on which this thread
+    * exclusively runs). This implementation does nothing.
+    *
+    * @pre The thread must have been set to be a system-scope thread, and
+    *      a previous affinity must have been set using setRunOn(). The thread
+    *      from which this method was invoked must be the same as the thread
+    *      spawned by this object.
+    * @post The CPU affinity for this thread is returned to the caller.
+    *
+    * @return The CPU affinity for this thread (posisbly set by a previous
+    *         call to setRunOn()). This implementation always returns an
+    *         empty vector.
+    *
+    * @throw vpr::IllegalArgumentException
+    *           Thrown if the thread spawned through the use of this object is
+    *           not the thread from which this method was invoked.
+    * @throw vpr::IllegalArgumentException
+    *           Thrown if this is not a system-scope (i.e., global) thread.
+    * @throw vpr::Exception
+    *           Thrown if the CPU affinity for the running thread could not
+    *           be queried.
+    *
+    * @note Currently, this method does nothing. It always returns an empty
+    *       vector.
+    *
+    * @since 2.1.6
+    */
-   std::vector<unsigned int> getRunOn() const
-   {

juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.cpp

@@ -383 +383 @@
-}
-
-unsigned 
+
-{
-   if ( ThreadPosix::self() == this )
-   {
+      if ( cpu < 0 )
+      {
+         std::ostringstream msg_stream;
+         msg_stream << "Illegal CPU identifier " << cpu << " is less than 0";
+         throw vpr::IllegalArgumentException(msg_stream.str(), VPR_LOCATION);
+      }
+
-#if defined(VPR_OS_IRIX)
-      if ( mScope == VPR_GLOBAL_THREAD )
@@ -403 +410 @@
-         cpu_set_t cpu_mask;
-         CPU_ZERO(&cpu_mask);
-static_cast<int>(cpu)
+cpu
-         const int result = sched_setaffinity(0, sizeof(cpu_mask), &cpu_mask);
-

juggler/trunk/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.h

@@ -314 +314 @@
-    *
-    * @param cpu The CPU on which this thread will run exclusively. This value
-less than the number of
-
+greater than 0 (zero) and
+less than the number of 
-    *
-    * @throw vpr::IllegalArgumentException
-    *           Thrown if the thread spawned through the use of this object is
-    *           not the thread from which this method was invoked.
+    * @throw vpr::IllegalArgumentException
+    *           Thrown if \p cpu is less than 0.
-    * @throw vpr::IllegalArgumentException
-    *           Thrown if this is not a system-scope (i.e., global) thread.
@@ -328 +330 @@
-    * @note Currently, this is only available on IRIX 6.5 and Linux.
-    */
-unsigned 
+
-
-   /**

juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.cpp

@@ -306 +306 @@
-}
-
-unsigned 
+
-{
-   // Even though we have easy access to mThreadHandle, we perform this test
@@ -312 +312 @@
-   if ( ThreadWin32::self() == this )
-   {
+      if ( cpu < 0 )
+      {
+         std::ostringstream msg_stream;
+         msg_stream << "Illegal CPU identifier " << cpu << " is less than 0";
+         throw vpr::IllegalArgumentException(msg_stream.str(), VPR_LOCATION);
+      }
+
-      // The value of cpu is zero-based, but the CPU identifier values from
-      // Windows are one-based.

juggler/trunk/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.h

@@ -271 +271 @@
-    *
-    * @param cpu The CPU on which this thread will run exclusively. This value
-less than the number of
-
+greater than 0 (zero) and
+less than the number of 
-    *
-    * @throw vpr::IllegalArgumentException
-    *           Thrown if the thread spawned through the use of this object is
-    *           not the thread from which this method was invoked.
+    * @throw vpr::IllegalArgumentException
+    *           Thrown if \p cpu is less than 0.
-    * @throw vpr::Exception
-    *           Thrown if the CPU affinity for the running thread could not
-    *           be changed.
+    *
+    * @since 2.1.6
-    */
-   void setRunOn(const unsigned int cpu);
@@ -302 +306 @@
-    *           Thrown if the CPU affinity for the running thread could not
-    *           be queried.
+    *
+    * @since 2.1.6
-    */
-   std::vector<unsigned int> getRunOn() const;