Changeset 868

Timestamp:

01/29/08 12:48:55

Author:

robert

Message:

Added default ability, in vpbmaster, to use all local cores when no machine pool is otherwise defined.

Files:

• trunk/include/vpb/MachinePool (modified) (2 diffs)
• trunk/include/vpb/System (modified) (1 diff)
• trunk/src/vpb/MachinePool.cpp (modified) (1 diff)
• trunk/src/vpb/System.cpp (modified) (2 diffs)
• trunk/src/vpb/TaskManager.cpp (modified) (1 diff)

trunk/include/vpb/MachinePool

@@ -184 +184 @@
-        Machine* getMachine(const std::string& hostname);
-        
+        unsigned int getNumMachines() const { return _machines.size(); }
+        
-        void startThreads();
-
@@ -207 +209 @@
-
-        bool write(const std::string& filename) const;
+        
+        bool setUpOnLocalHost();
-
-        /** Send a signal to the all running tasks. */

trunk/include/vpb/System

@@ -34 +34 @@
-extern VPB_EXPORT std::string& getTaskDirectory();
-extern VPB_EXPORT std::string& getMachineFileName();
+extern VPB_EXPORT std::string& getCacheFileName();
-
-inline bool getAttributeValue(const std::string& field, const std::string& name, std::string& value)

trunk/src/vpb/MachinePool.cpp

@@ -678 +678 @@
-}
-
+bool MachinePool::setUpOnLocalHost()
+{
+    log(osg::NOTICE,"Setting up MachinePool to use all %i cores on this machine.",OpenThreads::GetNumberOfProcessors());
+    addMachine(vpb::getLocalHostName(),vpb::getCacheFileName(),std::string(),std::string(),OpenThreads::GetNumberOfProcessors());
+}
+
-void MachinePool::removeAllOperations()
-{

trunk/src/vpb/System.cpp

@@ -48 +48 @@
-std::string& vpb::getTaskDirectory() { return System::instance()->getTaskDirectory(); }
-std::string& vpb::getMachineFileName() { return System::instance()->getMachineFileName(); }
+std::string& vpb::getCacheFileName() { return System::instance()->getCacheFileName(); }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -170 +171 @@
-MachinePool* System::getMachinePool()
-{
- && !_machineFileName.empty()
+
-    {
-        _machinePool = new MachinePool;
-
+
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/vpb/TaskManager.cpp

@@ -126 +126 @@
-    }
-    
-
-    while (arguments.read("--modified"))
-    {